From db1a63e99eb76527e86b071c84f8473417a02a6b Mon Sep 17 00:00:00 2001 From: Thickbrick Sleaford Date: Sun, 9 Jan 2011 01:13:38 +0200 Subject: FIX VWR-24420 Keep alpha channel in PNG images with background color. Remove code that composites RGBA PNG images that specify a background color down to RGB. --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 3b14ce5125..7f467696de 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -732,6 +732,7 @@ Thickbrick Sleaford VWR-9287 VWR-13483 VWR-13947 + VWR-24420 Thraxis Epsilon SVC-371 VWR-383 -- cgit v1.3 From 3703f0bb0d7cd20c801d88cb77632c239010d26b Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 12 Jan 2011 08:24:38 -0500 Subject: STORM-844 "More" should be "Less" when Media Control is open --- doc/contributions.txt | 7 ++++--- indra/newview/skins/default/xui/en/panel_nearby_media.xml | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 9266ae3c5b..0d7bed2f78 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -366,15 +366,16 @@ JB Kraft Joghert LeSabre VWR-64 Jonathan Yap - STORM-596 STORM-523 + STORM-596 STORM-616 STORM-679 - STORM-737 STORM-726 + STORM-737 + STORM-785 STORM-812 + STORM-844 VWR-17801 - STORM-785 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index 8c13ced8f3..aac3608e13 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -69,7 +69,7 @@ width="66" height="22" label="More >>" - label_selected="Less <<"> + label_selected="More >>"> @@ -81,8 +81,8 @@ right="-8" width="66" height="22" - label="More >>" - label_selected="Less <<"> + label="<< Less" + label_selected="<< Less"> -- cgit v1.3 From e27ae655c6859f947d92c789f189b52940dae877 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 12 Jan 2011 10:37:15 -0500 Subject: STORM-844 Minor adjustment to contributions.txt --- doc/contributions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 0d7bed2f78..f4831a1947 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -366,16 +366,16 @@ JB Kraft Joghert LeSabre VWR-64 Jonathan Yap - STORM-523 STORM-596 + STORM-523 STORM-616 STORM-679 - STORM-726 STORM-737 - STORM-785 + STORM-726 STORM-812 - STORM-844 VWR-17801 + STORM-785 + STORM-844 Kage Pixel VWR-11 Ken March -- cgit v1.3 From 6a3d06deca73683514d4668f78adf684d760708c Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sun, 16 Jan 2011 12:10:44 -0500 Subject: STORM-844 Better way of doing "More" should be "Less" when Media Control is open thanks to Twisted Laws --- doc/contributions.txt | 1 + indra/newview/llpanelnearbymedia.cpp | 5 ++--- .../newview/skins/default/xui/en/panel_nearby_media.xml | 16 ++-------------- 3 files changed, 5 insertions(+), 17 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index f4831a1947..42e030ac66 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -755,6 +755,7 @@ Twisted Laws SNOW-352 STORM-466 STORM-467 + STORM-844 Vadim Bigbear VWR-2681 Vector Hastings diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index fcc67d6840..14e39f2c48 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -958,7 +958,7 @@ void LLPanelNearByMedia::onAdvancedButtonClick() void LLPanelNearByMedia::onMoreLess() { - bool is_more = getChild("more_btn")->getVisible(); + bool is_more = getChild("more_btn")->getToggleState(); mNearbyMediaPanel->setVisible(is_more); // enable resizing when expanded @@ -969,8 +969,7 @@ void LLPanelNearByMedia::onMoreLess() setShape(new_rect); - getChild("more_btn")->setVisible(!is_more); - getChild("less_btn")->setVisible(is_more); + getChild("more_btn")->setVisible(true); } void LLPanelNearByMedia::updateControls() diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index aac3608e13..9bd60b935f 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -68,24 +68,12 @@ right="-8" width="66" height="22" + is_toggle="true" label="More >>" - label_selected="More >>"> + label_selected="<< Less"> - Date: Mon, 17 Jan 2011 10:09:52 -0500 Subject: VWR-24217: allow Contents folder from object to be dragged to inventory --- doc/contributions.txt | 1 + indra/newview/llpanelobjectinventory.cpp | 20 +++++--------------- 2 files changed, 6 insertions(+), 15 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index f21354b406..839e92e086 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -393,6 +393,7 @@ Kitty Barnett STORM-288 STORM-799 STORM-800 + VWR-24217 Kunnis Basiat VWR-82 VWR-102 diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 211b9cf4b1..0b6267c9e6 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -766,22 +766,12 @@ BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id) const LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID()); if(object) { - const LLInventoryItem *inv = dynamic_cast(object->getInventoryObject(mUUID)); - if (inv) + const LLInventoryObject* cat = object->getInventoryObject(mUUID); + if ( (cat) && (move_inv_category_world_to_agent(mUUID, LLUUID::null, FALSE)) ) { - const LLPermissions& perm = inv->getPermissions(); - bool can_copy = gAgent.allowOperation(PERM_COPY, perm, - GP_OBJECT_MANIPULATE); - if((can_copy && perm.allowTransferTo(gAgent.getID())) - || object->permYouOwner()) -// || gAgent.isGodlike()) - - { - *type = LLViewerAssetType::lookupDragAndDropType(inv->getType()); - - *id = inv->getUUID(); - return TRUE; - } + *type = LLViewerAssetType::lookupDragAndDropType(cat->getType()); + *id = mUUID; + return TRUE; } } } -- cgit v1.3 From 3571e83b6413e0c1050540a6cddeeaa7c6ca91c1 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 19 Jan 2011 06:02:08 -0500 Subject: STORM-869 Minor irregulaties in settings.xml -- remove duplicate entries, formatting cleanup --- doc/contributions.txt | 1 + indra/newview/app_settings/settings.xml | 81 +-------------------------------- 2 files changed, 2 insertions(+), 80 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 4c33834a46..c82d2c2a9d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -359,6 +359,7 @@ Jonathan Yap STORM-679 STORM-596 STORM-726 + STORM-869 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 06992d2b52..ec094eaeb8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -917,39 +917,6 @@ Value 1 - BulkChangeIncludeAnimations - - Comment - Bulk permission changes affect animations - Persist - 1 - Type - Boolean - Value - 1 - - BulkChangeIncludeAnimations - - Comment - Bulk permission changes affect animations - Persist - 1 - Type - Boolean - Value - 1 - - BulkChangeIncludeAnimations - - Comment - Bulk permission changes affect animations - Persist - 1 - Type - Boolean - Value - 1 - BulkChangeIncludeBodyParts Comment @@ -1162,18 +1129,7 @@ CacheLocationTopFolder Comment - Controls the top folder location of the local disk cache - Persist - 1 - Type - String - Value - - - CacheLocationTopFolder - - Comment - Controls the location of the local disk cache + Controls the top folder location of the the local disk cache Persist 1 Type @@ -3085,17 +3041,6 @@ Value http://viewer-settings.secondlife.com - FPSLogFrequency - - Comment - Seconds between display of FPS in log (0 for never) - Persist - 1 - Type - F32 - Value - 60.0 - FPSLogFrequency Comment @@ -6027,17 +5972,6 @@ 0 OutBandwidth - - Comment - Expand render stats display - Persist - 1 - Type - Boolean - Value - 1 - - OutBandwidth Comment Outgoing bandwidth throttle (bps) @@ -11375,8 +11309,6 @@ Type LLSD Value - - VFSOldSize @@ -11532,17 +11464,6 @@ Value - VivoxDebugSIPURIHostName - - Comment - Hostname portion of vivox SIP URIs (empty string for the default). - Persist - 1 - Type - String - Value - - VivoxDebugVoiceAccountServerURI Comment -- cgit v1.3 From 80d7432ce6f0f16f31bb103965b64b39575728a2 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 20 Jan 2011 14:26:57 -0500 Subject: VWR-13040 - clean up LLObjectSelection iterator --- doc/contributions.txt | 1 + indra/newview/llselectmgr.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 361560a0ed..d533486936 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -72,6 +72,7 @@ Aleric Inglewood VWR-10837 VWR-12691 VWR-12984 + VWR-13040 VWR-13996 VWR-14426 VWR-24247 diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 7478ed5f9a..65a9a493f6 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -235,7 +235,7 @@ public: { bool operator()(LLSelectNode* node); }; - typedef boost::filter_iterator valid_root_iterator; + typedef boost::filter_iterator valid_root_iterator; valid_root_iterator valid_root_begin() { return valid_root_iterator(mList.begin(), mList.end()); } valid_root_iterator valid_root_end() { return valid_root_iterator(mList.end(), mList.end()); } -- cgit v1.3 From 42604a1080d2080be748bca80ff84fec24024c63 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 20 Jan 2011 14:35:04 -0500 Subject: VWR-24315: update cached control values when resetting debug setting to default --- doc/contributions.txt | 1 + indra/newview/llfloatersettingsdebug.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index d533486936..0c83be89c2 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -80,6 +80,7 @@ Aleric Inglewood VWR-24252 VWR-24254 VWR-24261 + VWR-24315 SNOW-84 SNOW-477 SNOW-744 diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index 71882fbb83..07f5220ab7 100644 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -178,7 +178,7 @@ void LLFloaterSettingsDebug::onClickDefault() if (controlp) { - controlp->resetToDefault(); + controlp->resetToDefault(true); updateControl(controlp); } } -- cgit v1.3 From a873ae55a36c4470d7e03e3544545ac164edee29 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 20 Jan 2011 15:57:07 -0500 Subject: VWR-24317: remove warning due to unassigned variable --- doc/contributions.txt | 1 + indra/llui/llnotifications.cpp | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 0c83be89c2..3b2e2239d2 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -81,6 +81,7 @@ Aleric Inglewood VWR-24254 VWR-24261 VWR-24315 + VWR-24317 SNOW-84 SNOW-477 SNOW-744 diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index cd0f0e36b0..cc9edfcdea 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -1367,7 +1367,6 @@ LLNotifications::TemplateNames LLNotifications::getTemplateNames() const typedef std::map StringMap; void replaceSubstitutionStrings(LLXMLNodePtr node, StringMap& replacements) { - //llwarns << "replaceSubstitutionStrings" << llendl; // walk the list of attributes looking for replacements for (LLXMLAttribList::iterator it=node->mAttributes.begin(); it != node->mAttributes.end(); ++it) @@ -1381,13 +1380,12 @@ void replaceSubstitutionStrings(LLXMLNodePtr node, StringMap& replacements) if (found != replacements.end()) { replacement = found->second; - //llwarns << "replaceSubstituionStrings: value: " << value << " repl: " << replacement << llendl; - + lldebugs << "replaceSubstitutionStrings: value: \"" << value << "\" repl: \"" << replacement << "\"." << llendl; it->second->setValue(replacement); } else { - llwarns << "replaceSubstituionStrings FAILURE: value: " << value << " repl: " << replacement << llendl; + llwarns << "replaceSubstitutionStrings FAILURE: could not find replacement \"" << value << "\"." << llendl; } } } -- cgit v1.3 From c47ab36b20e102a918257e5fa5452f13bc55a393 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 20 Jan 2011 16:01:27 -0500 Subject: VWR-24320: remove dump of call stack on clean exit --- doc/contributions.txt | 1 + indra/newview/llappviewer.cpp | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 3b2e2239d2..1ec878846d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -82,6 +82,7 @@ Aleric Inglewood VWR-24261 VWR-24315 VWR-24317 + VWR-24320 SNOW-84 SNOW-477 SNOW-744 diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e2af22a678..6a9dfaf21b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1398,16 +1398,6 @@ bool LLAppViewer::cleanup() } mPlugins.clear(); - //---------------------------------------------- - //this test code will be removed after the test - //test manual call stack tracer - if(gSavedSettings.getBOOL("QAMode")) - { - LLError::LLCallStacks::print() ; - } - //end of the test code - //---------------------------------------------- - //flag all elements as needing to be destroyed immediately // to ensure shutdown order LLMortician::setZealous(TRUE); -- cgit v1.3 From 97a9211d87fac90994846e5bf91a78a708ec5a9c Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Fri, 21 Jan 2011 15:48:12 -0500 Subject: VWR-24354: correct manifest dependencies to prevent parallel install problem --- doc/contributions.txt | 1 + indra/newview/CMakeLists.txt | 34 ++++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 70ae5a2ba5..b601f93806 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -83,6 +83,7 @@ Aleric Inglewood VWR-24315 VWR-24317 VWR-24320 + VWR-24354 SNOW-84 SNOW-477 SNOW-744 diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 5d2342e925..af6beacdfa 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1718,6 +1718,17 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH if (LINUX) set(product SecondLife-${ARCH}-${viewer_VERSION}) + # These are the generated targets that are copied to package/ + set(COPY_INPUT_DEPENDENCIES + ${VIEWER_BINARY_NAME} + linux-crash-logger + linux-updater + SLPlugin + media_plugin_webkit + media_plugin_gstreamer010 + llcommon + ) + add_custom_command( OUTPUT ${product}.tar.bz2 COMMAND ${PYTHON_EXECUTABLE} @@ -1735,18 +1746,11 @@ if (LINUX) --login_channel=${VIEWER_LOGIN_CHANNEL} --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched - DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + DEPENDS + ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + ${COPY_INPUT_DEPENDENCIES} ) - add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit) - - if (PACKAGE) - add_custom_target(package ALL DEPENDS ${product}.tar.bz2) - add_dependencies(package linux-crash-logger-target) - add_dependencies(package linux-updater-target) - check_message_template(package) - endif (PACKAGE) - add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched COMMAND ${PYTHON_EXECUTABLE} @@ -1766,9 +1770,15 @@ if (LINUX) ${COPY_INPUT_DEPENDENCIES} COMMENT "Performing viewer_manifest copy" ) - + add_custom_target(copy_l_viewer_manifest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched) - add_dependencies(copy_l_viewer_manifest "${VIEWER_BINARY_NAME}" linux-crash-logger-target linux-updater-target) + + if (PACKAGE) + add_custom_target(package ALL DEPENDS ${product}.tar.bz2) + # Make sure we don't run two instances of viewer_manifest.py at the same time. + add_dependencies(package copy_l_viewer_manifest) + check_message_template(package) + endif (PACKAGE) endif (LINUX) if (DARWIN) -- cgit v1.3 From ee6a40beb102819fcd2e95106fe7892d2d25193f Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Fri, 21 Jan 2011 16:02:38 -0500 Subject: VWR-24519: make debugging easier by not spawning spare process --- doc/contributions.txt | 1 + indra/newview/llviewermedia.cpp | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index b601f93806..66533d8da9 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -84,6 +84,7 @@ Aleric Inglewood VWR-24317 VWR-24320 VWR-24354 + VWR-24519 SNOW-84 SNOW-477 SNOW-744 diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index d3b6dcd86f..ed18d67b62 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1436,9 +1436,12 @@ void LLViewerMedia::proxyWindowClosed(const std::string &uuid) // static void LLViewerMedia::createSpareBrowserMediaSource() { - if(!sSpareBrowserMediaSource) + // If we don't have a spare browser media source, create one. + // However, if PluginAttachDebuggerToPlugins is set then don't spawn a spare + // SLPlugin process in order to not be confused by an unrelated gdb terminal + // popping up at the moment we start a media plugin. + if (!sSpareBrowserMediaSource && !gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins")) { - // If we don't have a spare browser media source, create one. // The null owner will keep the browser plugin from fully initializing // (specifically, it keeps LLPluginClassMedia from negotiating a size change, // which keeps MediaPluginWebkit::initBrowserWindow from doing anything until we have some necessary data, like the background color) @@ -1694,7 +1697,8 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ LLPluginClassMedia* media_source = NULL; // HACK: we always try to keep a spare running webkit plugin around to improve launch times. - if(plugin_basename == "media_plugin_webkit") + // If a spare was already created before PluginAttachDebuggerToPlugins was set, don't use it. + if(plugin_basename == "media_plugin_webkit" && !gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins")) { media_source = LLViewerMedia::getSpareBrowserMediaSource(); if(media_source) -- cgit v1.3 From 7a453b7c9351a743b222bbb2b94809cf7c6b3ce8 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 21 Jan 2011 16:20:29 -0500 Subject: add missing entry in contributions.txt for VWR-24347 --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 66533d8da9..5255acc041 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -384,6 +384,7 @@ Jonathan Yap STORM-785 STORM-812 VWR-17801 + VWR-24347 STORM-844 Kage Pixel VWR-11 -- cgit v1.3 From 295536ae98cb88bfa551ac73ae2e19a8c2ddfc88 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Mon, 24 Jan 2011 09:35:41 -0500 Subject: VWR-24321: fix validation of textures that start with 00 --- doc/contributions.txt | 1 + indra/newview/lltexturecache.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 5255acc041..4e91bbdd36 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -83,6 +83,7 @@ Aleric Inglewood VWR-24315 VWR-24317 VWR-24320 + VWR-24321 VWR-24354 VWR-24519 SNOW-84 diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index 92080d1fd7..6ddbdbf783 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -1592,7 +1592,7 @@ void LLTextureCache::purgeTextures(bool validate) if (validate) { validate_idx = gSavedSettings.getU32("CacheValidateCounter"); - U32 next_idx = (++validate_idx) % 256; + U32 next_idx = (validate_idx + 1) % 256; gSavedSettings.setU32("CacheValidateCounter", next_idx); LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Validating: " << validate_idx << LL_ENDL; } -- cgit v1.3