diff options
author | Aimee Linden <aimee@lindenlab.com> | 2010-08-04 13:19:31 +0100 |
---|---|---|
committer | Aimee Linden <aimee@lindenlab.com> | 2010-08-04 13:19:31 +0100 |
commit | 80b37e50fac6ba84b90a918d2106449db44a5ed8 (patch) | |
tree | 1559d2d529f06b204868c6716d185ba2902e0cdf | |
parent | e77ac4ca647f950a9c9f3ae79d6b7a37ab1b49e3 (diff) | |
parent | fd4cbed787e4a5e5a06898cdb46fa040163db136 (diff) |
Merge
-rw-r--r-- | indra/newview/llviewerregion.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |