From d3db9dd2a17a7829e9e577caa5281ef4250c5f62 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Wed, 4 Aug 2010 12:52:44 +0100 Subject: DEV-52379 FIXED (Supplementary) Viewer is not successfully caching object geometry Encapsulated building of the cache filename into a help function to prevent code duplication. Reviewed by Tofu. --- indra/newview/llviewerregion.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/newview/llviewerregion.h') diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index a9e7ef771c..e15609065c 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -99,9 +99,8 @@ public: ~LLViewerRegion(); // Call this after you have the region name and handle. - void loadCache(); - - void saveCache(); + void loadObjectCache(); + void saveObjectCache(); void sendMessage(); // Send the current message to this region's simulator void sendReliableMessage(); // Send the current message to this region's simulator @@ -330,6 +329,9 @@ public: LLDynamicArray mMapAvatarIDs; private: + // determine the cache filename for the region from the region handle + const std::string LLViewerRegion::getObjectCacheFilename(U64 mHandle) const; + // The surfaces and other layers LLSurface* mLandp; @@ -404,7 +406,7 @@ private: // Cache ID is unique per-region, across renames, moving locations, // etc. LLUUID mCacheID; - + typedef std::map CapabilityMap; CapabilityMap mCapabilities; -- cgit v1.2.3 From fd4cbed787e4a5e5a06898cdb46fa040163db136 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Wed, 4 Aug 2010 13:18:16 +0100 Subject: DEV-52379 FIXED (Supplementary to my supplementary) Fix Linux build breakage ... oopsie. --- indra/newview/llviewerregion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewerregion.h') diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index e15609065c..8254cf1cad 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -330,7 +330,7 @@ public: private: // determine the cache filename for the region from the region handle - const std::string LLViewerRegion::getObjectCacheFilename(U64 mHandle) const; + const std::string getObjectCacheFilename(U64 mHandle) const; // The surfaces and other layers LLSurface* mLandp; -- cgit v1.2.3