summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-08-28 17:28:19 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-08-28 17:28:19 -0600
commit126a977bf824f2b9fe130186b592f3be747a09b6 (patch)
treeb9a8abaf5c50822094e53dddd8b55f47588b47a1 /indra/newview/llappviewer.cpp
parentb1297dce44ccf4b4875ec9ce0d9d78d563d877ee (diff)
parentedd1478cc0ba240d428fc4c35f9c97af7d2ce346 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rwxr-xr-xindra/newview/llappviewer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0f155b8ad7..7f37cee8b8 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4030,7 +4030,7 @@ U32 LLAppViewer::getObjectCacheVersion()
{
// Viewer object cache version, change if object update
// format changes. JC
- const U32 INDRA_OBJECT_CACHE_VERSION = 15;
+ const U32 INDRA_OBJECT_CACHE_VERSION = 14;
return INDRA_OBJECT_CACHE_VERSION;
}