diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-16 16:48:58 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-16 16:48:58 -0800 |
| commit | d8e1af97361a81dd571ccb64b859ae1e5157339e (patch) | |
| tree | 1d5cb5300542bd6442867e419fe982c4e2a4e64d /indra | |
| parent | 32fd8fa0874abc39bbe0f16f8eb5723bd83afb41 (diff) | |
Increasing texture cache version to force cache clear of possibly corrupted texture caches from previous 2.0 versions.
Enabling Admin menu in God Mode independent of Advanced menu.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lltexturecache.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index c33c652935..845e71378a 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -917,7 +917,7 @@ BOOL LLTextureCache::isInLocal(const LLUUID& id) //static const S32 MAX_REASONABLE_FILE_SIZE = 512*1024*1024; // 512 MB -F32 LLTextureCache::sHeaderCacheVersion = 1.3f; +F32 LLTextureCache::sHeaderCacheVersion = 1.4f; U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_ENTRY_SIZE; S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit const char* entries_filename = "texture.entries"; diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 68a9aaef75..6a6aa1061d 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5189,7 +5189,7 @@ void show_debug_menus() gMenuBarView->setItemEnabled("Develop", qamode); // Server ('Admin') menu hidden when not in godmode. - const bool show_server_menu = debug && (gAgent.getGodLevel() > GOD_NOT || gAgent.getAdminOverride()); + const bool show_server_menu = (gAgent.getGodLevel() > GOD_NOT || (debug && gAgent.getAdminOverride())); gMenuBarView->setItemVisible("Admin", show_server_menu); gMenuBarView->setItemEnabled("Admin", show_server_menu); } |