summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llviewerregion.cpp96
1 files changed, 33 insertions, 63 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index a86efa215b..2267db770c 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2,25 +2,31 @@
* @file llviewerregion.cpp
* @brief Implementation of the LLViewerRegion class.
*
- * $LicenseInfo:firstyear=2000&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ *
+ * Copyright (c) 2000-2009, Linden Research, Inc.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
*
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
@@ -73,8 +79,6 @@
// format changes. JC
const U32 INDRA_OBJECT_CACHE_VERSION = 14;
-// Format string used to construct filename for the object cache
-static const char OBJECT_CACHE_FILENAME[] = "objects_%d_%d.slc";
extern BOOL gNoRender;
@@ -170,7 +174,7 @@ public:
mRegion->showReleaseNotes();
}
}
-
+
if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
{
LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED );
@@ -212,7 +216,6 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
mColoName("unknown"),
mProductSKU("unknown"),
mProductName("unknown"),
- mHttpUrl(""),
mCacheLoaded(FALSE),
mCacheEntriesCount(0),
mCacheID(),
@@ -319,25 +322,13 @@ LLViewerRegion::~LLViewerRegion()
delete mEventPoll;
LLHTTPSender::clearSender(mHost);
- saveObjectCache();
+ saveCache();
std::for_each(mObjectPartition.begin(), mObjectPartition.end(), DeletePointer());
}
-const std::string LLViewerRegion::getObjectCacheFilename(U64 mHandle) const
-{
- std::string filename;
- U32 region_x, region_y;
-
- grid_from_region_handle(mHandle, &region_x, &region_y);
- filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,
- llformat(OBJECT_CACHE_FILENAME, region_x, region_y));
-
- return filename;
-}
-
-void LLViewerRegion::loadObjectCache()
+void LLViewerRegion::loadCache()
{
if (mCacheLoaded)
{
@@ -349,8 +340,9 @@ void LLViewerRegion::loadObjectCache()
LLVOCacheEntry *entry;
- std::string filename = getObjectCacheFilename(mHandle);
- LL_DEBUGS("ObjectCache") << filename << LL_ENDL;
+ std::string filename;
+ filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"") + gDirUtilp->getDirDelimiter() +
+ llformat("objects_%d_%d.slc",U32(mHandle>>32)/REGION_WIDTH_UNITS, U32(mHandle)/REGION_WIDTH_UNITS );
LLFILE* fp = LLFile::fopen(filename, "rb"); /* Flawfinder: ignore */
if (!fp)
@@ -421,7 +413,7 @@ void LLViewerRegion::loadObjectCache()
}
-void LLViewerRegion::saveObjectCache()
+void LLViewerRegion::saveCache()
{
if (!mCacheLoaded)
{
@@ -434,8 +426,9 @@ void LLViewerRegion::saveObjectCache()
return;
}
- std::string filename = getObjectCacheFilename(mHandle);
- LL_DEBUGS("ObjectCache") << filename << LL_ENDL;
+ std::string filename;
+ filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"") + gDirUtilp->getDirDelimiter() +
+ llformat("sobjects_%d_%d.slc", U32(mHandle>>32)/REGION_WIDTH_UNITS, U32(mHandle)/REGION_WIDTH_UNITS );
LLFILE* fp = LLFile::fopen(filename, "wb"); /* Flawfinder: ignore */
if (!fp)
@@ -634,26 +627,6 @@ std::string LLViewerRegion::accessToString(U8 sim_access)
}
// static
-std::string LLViewerRegion::getAccessIcon(U8 sim_access)
-{
- switch(sim_access)
- {
- case SIM_ACCESS_MATURE:
- return "Parcel_M_Dark";
-
- case SIM_ACCESS_ADULT:
- return "Parcel_R_Light";
-
- case SIM_ACCESS_PG:
- return "Parcel_PG_Light";
-
- case SIM_ACCESS_MIN:
- default:
- return "";
- }
-}
-
-// static
std::string LLViewerRegion::accessToShortString(U8 sim_access)
{
switch(sim_access) /* Flawfinder: ignore */
@@ -1460,7 +1433,7 @@ void LLViewerRegion::unpackRegionHandshake()
// Now that we have the name, we can load the cache file
// off disk.
- loadObjectCache();
+ loadCache();
// After loading cache, signal that simulator can start
// sending data.
@@ -1517,6 +1490,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
capabilityNames.append("ProvisionVoiceAccountRequest");
capabilityNames.append("RemoteParcelRequest");
capabilityNames.append("RequestTextureDownload");
+ capabilityNames.append("SimulatorFeatures");
capabilityNames.append("SearchStatRequest");
capabilityNames.append("SearchStatTracking");
capabilityNames.append("SendPostcard");
@@ -1562,10 +1536,6 @@ void LLViewerRegion::setCapability(const std::string& name, const std::string& u
else
{
mCapabilities[name] = url;
- if(name == "GetTexture")
- {
- mHttpUrl = url ;
- }
}
}