1 files changed, 38 insertions, 30 deletions

diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 88d8a40..51b1ebe 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
+ * 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
@@ -34,7 +35,6 @@
 #include "llhttpclient.h"
 #include "llregionflags.h"
 #include "llregionhandle.h"
-#include "llsdmessagesystem.h"
 #include "llsurface.h"
 #include "message.h"
 //#include "vmath.h"
@@ -43,6 +43,7 @@
 
 #include "llagent.h"
 #include "llcallingcard.h"
+#include "llcaphttpsender.h"
 #include "lldir.h"
 #include "lleventpoll.h"
 #include "llfloatergodtools.h"
@@ -57,6 +58,12 @@
 #include "llvocache.h"
 #include "llvoclouds.h"
 #include "llworld.h"
+#include "viewer.h"
+
+// Viewer object cache version, change if object update
+// format changes. JC
+const U32 INDRA_OBJECT_CACHE_VERSION = 12;
+
 
 extern BOOL gNoRender;
 
@@ -161,6 +168,7 @@ LLViewerRegion::~LLViewerRegion()
         delete mParcelOverlay;
         delete mLandp;
         delete mEventPoll;
+        LLHTTPSender::clearSender(mHost);
         
         saveCache();
 }
@@ -441,7 +449,6 @@ LLVector3 LLViewerRegion::getCenterAgent() const
         return gAgent.getPosAgentFromGlobal(mCenterGlobal);
 }
 
-
 void LLViewerRegion::setRegionNameAndZone(const char* name_and_zone)
 {
         LLString name_zone(name_and_zone);
@@ -724,21 +731,6 @@ F32 LLViewerRegion::getCompositionXY(const S32 x, const S32 y) const
         return getComposition()->getValueScaled((F32)x, (F32)y);
 }
 
-
-// ---------------- Friends ----------------
-
-std::ostream& operator<<(std::ostream &s, const LLViewerRegion &region)
-{
-        s << "{ ";
-        s << region.mHost;
-        s << " mOriginGlobal = " << region.getOriginGlobal()<< "\n";
-        s << "}";
-        return s;
-}
-
-
-// ---------------- Protected Member Functions ----------------
-
 void LLViewerRegion::calculateCenterGlobal() 
 {
         mCenterGlobal = mOriginGlobal;
@@ -754,7 +746,24 @@ void LLViewerRegion::calculateCenterGlobal()
         }
 }
 
+void LLViewerRegion::calculateCameraDistance()
+{
+        mCameraDistanceSquared = (F32)(gAgent.getCameraPositionGlobal() - getCenterGlobal()).magVecSquared();
+}
 
+// ---------------- Friends ----------------
+
+std::ostream& operator<<(std::ostream &s, const LLViewerRegion &region)
+{
+        s << "{ ";
+        s << region.mHost;
+        s << " mOriginGlobal = " << region.getOriginGlobal()<< "\n";
+        s << "}";
+        return s;
+}
+
+
+// ---------------- Protected Member Functions ----------------
 
 void LLViewerRegion::updateNetStats()
 {
@@ -1293,35 +1302,34 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("SendUserReport");
         capabilityNames.append("SendUserReportWithScreenshot");
         capabilityNames.append("RequestTextureDownload");
+        capabilityNames.append("UntrustedSimulatorMessage");
+        
         LLHTTPClient::post(url, capabilityNames, BaseCapabilitiesComplete::build(this));
 }
 
 static
 LLEventPoll* createViewerEventPoll(const std::string& url)
 {
-        static LLHTTPNode eventRoot;
-        static bool eventRootServicesAdded = false;
-        if (!eventRootServicesAdded)
-        {
-                LLSDMessageSystem::useServices();
-                LLHTTPRegistrar::buildAllServices(eventRoot);
-                eventRootServicesAdded = true;
-        }
-
-        return new LLEventPoll(url, eventRoot);
+        return new LLEventPoll(url);
 }
 
 
 void LLViewerRegion::setCapability(const std::string& name, const std::string& url)
 {
-        mCapabilities[name] = url;
-        
-        if (name == "EventQueueGet")
+        if(name == "EventQueueGet")
         {
                 delete mEventPoll;
                 mEventPoll = NULL;
                 mEventPoll = createViewerEventPoll(url);
         }
+        else if(name == "UntrustedSimulatorMessage")
+        {
+                LLHTTPSender::setSender(mHost, new LLCapHTTPSender(url));
+        }
+        else
+        {
+                mCapabilities[name] = url;
+        }
 }
 
 std::string LLViewerRegion::getCapability(const std::string& name) const