Merge branch 'master' into rewrite

2012-02-06 21:41:11 -05:00
parent 50ebdd7f2c 41e8546be6
commit 302e1d592a
51 changed files with 114 additions and 46 deletions
--- a/overviewer_core/data/web_assets/compass_lower-left.png
+++ b/overviewer_core/data/web_assets/compass_lower-left.png
--- a/overviewer_core/data/web_assets/compass_lower-right.png
+++ b/overviewer_core/data/web_assets/compass_lower-right.png
--- a/overviewer_core/data/web_assets/compass_upper-left.png
+++ b/overviewer_core/data/web_assets/compass_upper-left.png
--- a/overviewer_core/data/web_assets/compass_upper-right.png
+++ b/overviewer_core/data/web_assets/compass_upper-right.png
--- a/overviewer_core/data/web_assets/control-bg-active.png
+++ b/overviewer_core/data/web_assets/control-bg-active.png
--- a/overviewer_core/data/web_assets/control-bg.png
+++ b/overviewer_core/data/web_assets/control-bg.png
--- a/overviewer_core/data/web_assets/overviewer.js
+++ b/overviewer_core/data/web_assets/overviewer.js
@@ -1431,10 +1431,8 @@ var overviewer = {
                    }
                }
                url = url + '.' + pathExt;
-                if(overviewerConfig.map.cacheMinutes > 0) {
-                    var d = new Date();
-                    url += '?c=' + Math.floor(d.getTime() /
-                        (1000 * 60 * overviewerConfig.map.cacheMinutes));
+                if(typeof overviewerConfig.map.cacheTag !== 'undefined') {
+                    url += '?c=' + overviewerConfig.map.cacheTag;
                }
                return(urlBase + url);
            }
--- a/overviewer_core/data/web_assets/signpost-shadow.png
+++ b/overviewer_core/data/web_assets/signpost-shadow.png
--- a/overviewer_core/data/web_assets/signpost.png
+++ b/overviewer_core/data/web_assets/signpost.png
--- a/overviewer_core/data/web_assets/signpost_icon.png
+++ b/overviewer_core/data/web_assets/signpost_icon.png