Second Life viewer sources 1.18.4.0-RC

1 files changed, 90 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 6378b01..0a8d9a8 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -2,6 +2,8 @@
  * @file llviewerregion.cpp
  * @brief Implementation of the LLViewerRegion class.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * 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$
  */
 
 #include "llviewerprecompiledheaders.h"
@@ -51,6 +54,7 @@
 #include "llfloaterregioninfo.h"
 #include "llhttpnode.h"
 #include "llnetmap.h"
+#include "llsdutil.h"
 #include "llstartup.h"
 #include "llviewerobjectlist.h"
 #include "llviewerparceloverlay.h"
@@ -447,6 +451,7 @@ std::string LLViewerRegion::regionFlagsToString(U32 flags)
         return result;
 }
 
+// *TODO:Translate
 char* SIM_ACCESS_STR[] = { "Free Trial",
                                                    "PG",
                                                    "Mature",
@@ -825,6 +830,88 @@ BOOL LLViewerRegion::isOwnedGroup(const LLVector3& pos)
         }
 }
 
+// the new TCP coarse location handler node
+class CoarseLocationUpdate : public LLHTTPNode
+{
+public:
+        virtual void post(
+                ResponsePtr responder,
+                const LLSD& context,
+                const LLSD& input) const
+        {
+                LLHost host(input["sender"].asString());
+                LLViewerRegion* region = gWorldp->getRegion(host);
+                if( !region )
+                {
+                        return;
+                }
+
+                S32 target_index = input["body"]["Index"][0]["Prey"].asInteger();
+                S32 you_index    = input["body"]["Index"][0]["You" ].asInteger();
+
+                LLDynamicArray<U32>* avatar_locs = &region->mMapAvatars;
+                LLDynamicArray<LLUUID>* avatar_ids = &region->mMapAvatarIDs;
+                avatar_locs->reset();
+                avatar_ids->reset();
+
+                //llinfos << "coarse locations agent[0] " << input["body"]["AgentData"][0]["AgentID"].asUUID() << llendl;
+                //llinfos << "my agent id = " << gAgent.getID() << llendl;
+                //llinfos << ll_pretty_print_sd(input) << llendl;
+
+                LLSD 
+                        locs   = input["body"]["Location"],
+                        agents = input["body"]["AgentData"];
+                LLSD::array_iterator 
+                        locs_it = locs.beginArray(), 
+                        agents_it = agents.beginArray();
+                BOOL has_agent_data = input["body"].has("AgentData");
+
+                for(int i=0; 
+                        locs_it != locs.endArray(); 
+                        i++, locs_it++, agents_it++)
+                {
+                        U8 
+                                x = locs_it->get("X").asInteger(),
+                                y = locs_it->get("Y").asInteger(),
+                                z = locs_it->get("Z").asInteger();
+                        // treat the target specially for the map, and don't add you or the target
+                        if(i == target_index)
+                        {
+                                LLVector3d global_pos(region->getOriginGlobal());
+                                global_pos.mdV[VX] += (F64)x;
+                                global_pos.mdV[VY] += (F64)y;
+                                global_pos.mdV[VZ] += (F64)z * 4.0;
+                                LLAvatarTracker::instance().setTrackedCoarseLocation(global_pos);
+                        }
+                        else if( i != you_index)
+                        {
+                                U32 loc = x << 16 | y << 8 | z; loc = loc;
+                                U32 pos = 0x0;
+                                pos |= x;
+                                pos <<= 8;
+                                pos |= y;
+                                pos <<= 8;
+                                pos |= z;
+                                avatar_locs->put(pos);
+                                //llinfos << "next pos: " << x << "," << y << "," << z << ": " << pos << llendl;
+                                if(has_agent_data) // for backwards compatibility with old message format
+                                {
+                                        LLUUID agent_id(agents_it->get("AgentID").asUUID());
+                                        //llinfos << "next agent: " << agent_id.asString() << llendl;
+                                        avatar_ids->put(agent_id);
+                                }
+                        }
+                }
+        }
+};
+
+// build the coarse location HTTP node under the "/message" URL
+LLHTTPRegistration<CoarseLocationUpdate>
+   gHTTPRegistrationCoarseLocationUpdate(
+           "/message/CoarseLocationUpdate");
+
+
+// the deprecated coarse location handler
 void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg)
 {
         //llinfos << "CoarseLocationUpdate" << llendl;
@@ -1274,9 +1361,11 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("UntrustedSimulatorMessage");
         capabilityNames.append("ParcelVoiceInfoRequest");
         capabilityNames.append("ChatSessionRequest");
+        capabilityNames.append("ViewerStats");
         capabilityNames.append("ProvisionVoiceAccountRequest");
         capabilityNames.append("ServerReleaseNotes");
         capabilityNames.append("CopyInventoryFromNotecard");
+        capabilityNames.append("DispatchRegionInfo");
 
         llinfos << "posting to seed " << url << llendl;
 
@@ -1325,3 +1414,4 @@ void LLViewerRegion::logActiveCapabilities() const
         llinfos << "Dumped " << count << " entries." << llendl;
 }
 
+