Second Life viewer sources 1.17.0.12

13 files changed, 125 insertions, 55 deletions

diff --git a/linden/indra/llmessage/llbuffer.h b/linden/indra/llmessage/llbuffer.h
index badbc9f..63f7bea 100644
--- a/linden/indra/llmessage/llbuffer.h
+++ b/linden/indra/llmessage/llbuffer.h
@@ -39,6 +39,7 @@
  */
 
 #include <list>
+#include <vector>
 
 /** 
  * @class LLChannelDescriptors
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 3df4b82..2a21b5a 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -643,6 +643,12 @@ void LLCacheName::dumpStats()
                         << llendl;
 }
 
+//static 
+LLString LLCacheName::getDefaultName()
+{
+        return LLString(CN_WAITING);
+}
+
 void LLCacheName::Impl::processPendingAsks()
 {
         sendRequest(_PREHASH_UUIDNameRequest, mAskNameQueue);
diff --git a/linden/indra/llmessage/llcachename.h b/linden/indra/llmessage/llcachename.h
index 7d606e6..d1a5cfe 100644
--- a/linden/indra/llmessage/llcachename.h
+++ b/linden/indra/llmessage/llcachename.h
@@ -101,6 +101,8 @@ public:
         void dump();            // Dumps the contents of the cache
         void dumpStats();       // Dumps the sizes of the cache and associated queues.
 
+        static LLString getDefaultName();
+
 private:
         class Impl;
         Impl& impl;
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index 9d883a7..5eaaab0 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -342,6 +342,12 @@ namespace
                 }
                 return sMainMulti;
         }
+
+        void freeMulti()
+        {
+                delete sMainMulti;
+                sMainMulti = NULL;
+        }
 }
 
 void
@@ -362,3 +368,8 @@ LLCurl::process()
         mainMulti()->process();
 }
 
+void LLCurl::cleanup()
+{
+        freeMulti();
+        curl_global_cleanup();
+}
diff --git a/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index e188c38..2d7d5d8 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/indra/llmessage/llcurl.h
@@ -128,6 +128,7 @@ public:
         static void getByteRange(const std::string& url, S32 offset, S32 length, ResponderPtr responder);
         
         static void process();
+        static void cleanup();
 };
 
 namespace boost
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 8cb8344..a1f8e29 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -70,6 +70,29 @@ void LLHTTPClient::Responder::result(const LLSD& content)
 {
 }
 
+// virtual 
+void LLHTTPClient::Responder::completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels,
+                                                                const LLIOPipe::buffer_ptr_t& buffer)
+{
+        LLBufferStream istr(channels, buffer.get());
+        LLSD content;
+
+        if (200 <= status && status < 300)
+        {
+                LLSDSerialize::fromXML(content, istr);
+/*
+                const S32 parseError = -1;
+                if(LLSDSerialize::fromXML(content, istr) == parseError)
+                {
+                        mStatus = 498;
+                        mReason = "Client Parse Error";
+                }
+*/
+        }
+        
+        completed(status, reason, content);
+}
+
 // virtual
 void LLHTTPClient::Responder::completed(U32 status, const std::string& reason, const LLSD& content)
 {
@@ -108,25 +131,9 @@ namespace
                 virtual void complete(const LLChannelDescriptors& channels,
                                                                 const buffer_ptr_t& buffer)
                 {
-                        LLBufferStream istr(channels, buffer.get());
-                        LLSD content;
-
-                        if (200 <= mStatus && mStatus < 300)
-                        {
-                                LLSDSerialize::fromXML(content, istr);
-/*
-                                const S32 parseError = -1;
-                                if(LLSDSerialize::fromXML(content, istr) == parseError)
-                                {
-                                        mStatus = 498;
-                                        mReason = "Client Parse Error";
-                                }
-*/
-                        }
-
                         if (mResponder.get())
                         {
-                                mResponder->completed(mStatus, mReason, content);
+                                mResponder->completedRaw(mStatus, mReason, channels, buffer);
                         }
                 }
 
@@ -243,15 +250,18 @@ namespace
         LLPumpIO* theClientPump = NULL;
 }
 
-static void request(const std::string& url, LLURLRequest::ERequestAction method,
-        Injector* body_injector, LLHTTPClient::ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS)
+static void request(
+        const std::string& url,
+        LLURLRequest::ERequestAction method,
+        Injector* body_injector,
+        LLHTTPClient::ResponderPtr responder,
+        const F32 timeout=HTTP_REQUEST_EXPIRY_SECS)
 {
         if (!LLHTTPClient::hasPump())
         {
                 responder->completed(U32_MAX, "No pump", LLSD());
                 return;
         }
-
         LLPumpIO::chain_t chain;
 
         LLURLRequest *req = new LLURLRequest(method, url);
@@ -262,7 +272,8 @@ static void request(const std::string& url, LLURLRequest::ERequestAction method,
         }
         req->setCallback(new LLHTTPClientURLAdaptor(responder));
 
-        if (method == LLURLRequest::HTTP_POST  &&  gMessageSystem) {
+        if (method == LLURLRequest::HTTP_POST  &&  gMessageSystem)
+        {
                 req->addHeader(llformat("X-SecondLife-UDP-Listen-Port: %d",
                                                                 gMessageSystem->mPort).c_str());
         }
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index c2dfb5d..88f8cbb 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -38,6 +38,8 @@
 #include <boost/intrusive_ptr.hpp>
 
 #include "llassettype.h"
+#include "llbuffer.h"
+#include "lliopipe.h"
 
 extern const F32 HTTP_REQUEST_EXPIRY_SECS;
 
@@ -58,7 +60,11 @@ public:
                 virtual void error(U32 status, const std::string& reason);      // called with bad status codes
                 
                 virtual void result(const LLSD& content);
-                        
+                
+                // Override point for clients that may want to use this class when the response is some other format besides LLSD
+                virtual void completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels,
+                                                                const LLIOPipe::buffer_ptr_t& buffer);
+
                 virtual void completed(U32 status, const std::string& reason, const LLSD& content);
                         /**< The default implemetnation calls
                                 either:
diff --git a/linden/indra/llmessage/llhttpnode.h b/linden/indra/llmessage/llhttpnode.h
index ae64a63..db82296 100644
--- a/linden/indra/llmessage/llhttpnode.h
+++ b/linden/indra/llmessage/llhttpnode.h
@@ -88,9 +88,10 @@ public:
 
                 class Response : public LLRefCount
                 {
-                public:
+                protected:
                         virtual ~Response();
 
+                public:
                         virtual void result(const LLSD&) = 0;
                         virtual void status(S32 code, const std::string& message) = 0;
 
@@ -225,7 +226,6 @@ class LLSimpleResponse : public LLHTTPNode::Response
 {
 public:
         static LLPointer<LLSimpleResponse> create();
-        ~LLSimpleResponse();
         
         void result(const LLSD& result);
         void status(S32 code, const std::string& message);
@@ -235,6 +235,9 @@ public:
         S32 mCode;
         std::string mMessage;
 
+protected:
+        ~LLSimpleResponse();
+
 private:
         LLSimpleResponse() {;} // Must be accessed through LLPointer.
 };
diff --git a/linden/indra/llmessage/llinstantmessage.cpp b/linden/indra/llmessage/llinstantmessage.cpp
index 0ba7629..0a3a1e6 100644
--- a/linden/indra/llmessage/llinstantmessage.cpp
+++ b/linden/indra/llmessage/llinstantmessage.cpp
@@ -328,18 +328,46 @@ LLSD im_info_to_llsd(LLPointer<LLIMInfo> im_info)
         param_message["parent_estate_id"] = (S32)im_info->mParentEstateID;
         param_message["region_id"] = im_info->mRegionID;
         param_message["position"] = ll_sd_from_vector3(im_info->mPosition);
-        if (im_info->mData) param_message["data"] = im_info->mData;
+        param_message["data"] = im_info->mData;
+        param_message["source"]= im_info->mSource;
+        param_message["ttl"] = im_info->mTTL;
+
         LLSD param_agent;
         param_agent["agent_id"] = im_info->mFromID;
 
         LLSD params;
-        params.append(param_version);
-        params.append(param_message);
-        params.append(param_agent);
+        params["version_params"] = param_version;
+        params["message_params"] = param_message;
+        params["agent_params"] = param_agent;
 
         return params;
 }
 
+LLPointer<LLIMInfo> llsd_to_im_info(const LLSD& im_info_sd)
+{
+        LLSD param_message = im_info_sd["message_params"];
+        LLSD param_agent = im_info_sd["agent_params"];
+
+        LLPointer<LLIMInfo> im_info = new LLIMInfo(
+                param_message["from_id"].asUUID(),
+                param_message["from_group"].asBoolean(),
+                param_message["to_id"].asUUID(),
+                (EInstantMessage) param_message["type"].asInteger(),
+                param_message["from_name"].asString(),
+                param_message["message"].asString(),
+                param_message["id"].asUUID(),
+                (U32) param_message["parent_estate_id"].asInteger(),
+                im_info->mRegionID = param_message["region_id"].asUUID(),
+                ll_vector3_from_sd(param_message["position"]),
+                param_message["data"],
+                (U8) param_message["offline"].asInteger(),
+                (U32) param_message["timestamp"].asInteger(),
+                (EIMSource)param_message["source"].asInteger(),
+                param_message["ttl"].asInteger());
+
+        return im_info;
+}
+
 LLPointer<LLIMInfo> LLIMInfo::clone()
 {
         return new LLIMInfo(
diff --git a/linden/indra/llmessage/llinstantmessage.h b/linden/indra/llmessage/llinstantmessage.h
index 0b2de19..45db037 100644
--- a/linden/indra/llmessage/llinstantmessage.h
+++ b/linden/indra/llmessage/llinstantmessage.h
@@ -94,13 +94,10 @@ enum EInstantMessage
         // communicate with each other.
         //
 
-        // Add users to a session.
-        IM_SESSION_ADD = 13,
+        // Invite users to a session.
+        IM_SESSION_INVITE = 13,
 
-        // IM sent automatically on call for help, 
-        // sets up a way for each Helper reached to teleport to the
-        // helpee
-        IM_SESSION_911_SEND = 14,
+        IM_SESSION_P2P_INVITE = 14,
 
         // start a session with your gruop
         IM_SESSION_GROUP_START = 15,
@@ -112,7 +109,7 @@ enum EInstantMessage
         IM_SESSION_SEND = 17,
 
         // leave a session
-        IM_SESSION_DROP = 18,
+        IM_SESSION_LEAVE = 18,
 
         // an instant message from an object - for differentiation on the
         // viewer, since you can't IM an object yet.
@@ -141,14 +138,6 @@ enum EInstantMessage
         // bucket.
         IM_GOTO_URL = 28,
 
-        // IM for help from the GAURDIAN_ANGELS
-        // Binary bucket contains the name of the session.
-        IM_SESSION_911_START = 29,
-
-        // IM for requesting to teleport to the creator
-        // of a livehelp session (assuming they are verified first)
-        IM_TELEPORT_911 = 30,
-
         // a message generated by a script which we don't want to
         // be sent through e-mail.  Similar to IM_FROM_TASK, but
         // it is shown as an alert on the viewer.
@@ -288,6 +277,7 @@ public:
         S32 mTTL;
 };
 
+LLPointer<LLIMInfo> llsd_to_im_info(const LLSD& im_info_sd);
 LLSD im_info_to_llsd(LLPointer<LLIMInfo> im_info);
 
 void pack_instant_message(
diff --git a/linden/indra/llmessage/llmessageconfig.cpp b/linden/indra/llmessage/llmessageconfig.cpp
index a0566ea..687896b 100644
--- a/linden/indra/llmessage/llmessageconfig.cpp
+++ b/linden/indra/llmessage/llmessageconfig.cpp
@@ -112,9 +112,10 @@ void LLMessageConfigFile::loadServerDefaults(const LLSD& data)
 
 void LLMessageConfigFile::loadMessages(const LLSD& data)
 {
-        mMessages = data["messages"];
+        LLPointer<LLSDXMLFormatter> formatter = new LLSDXMLFormatter;
         std::ostringstream out;
-        LLSDXMLFormatter *formatter = new LLSDXMLFormatter;
+
+        mMessages = data["messages"];
         formatter->format(mMessages, out);
         lldebugs << "loading ... " << out.str()
                         << " LLMessageConfigFile::loadMessages loaded "
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h
index fb9bf5b..8702277 100644
--- a/linden/indra/llmessage/llregionflags.h
+++ b/linden/indra/llmessage/llregionflags.h
@@ -56,7 +56,7 @@ const U32 REGION_FLAGS_BLOCK_LAND_RESELL		= (1 << 7);
 
 // All content wiped once per night
 const U32 REGION_FLAGS_SANDBOX                                  = (1 << 8);
-
+const U32 REGION_FLAGS_NULL_LAYER                               = (1 << 9);
 const U32 REGION_FLAGS_SKIP_AGENT_ACTION                = (1 << 10);
 const U32 REGION_FLAGS_SKIP_UPDATE_INTEREST_LIST= (1 << 11);
 const U32 REGION_FLAGS_SKIP_COLLISIONS                  = (1 << 12); // Pin all non agent rigid bodies
@@ -88,11 +88,14 @@ const U32 REGION_FLAGS_ALLOW_PARCEL_CHANGES		= (1 << 26);
 
 const U32 REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER = (1 << 27);
 
-const U32 REGION_FLAGS_NULL_LAYER                               = (1 << 9);
+const U32 REGION_FLAGS_ALLOW_VOICE = (1 << 28);
+
 
 const U32 REGION_FLAGS_DEFAULT = REGION_FLAGS_ALLOW_LANDMARK |
                                                                  REGION_FLAGS_ALLOW_SET_HOME |
-                                                                 REGION_FLAGS_ALLOW_PARCEL_CHANGES;
+                                 REGION_FLAGS_ALLOW_PARCEL_CHANGES |
+                                 REGION_FLAGS_ALLOW_VOICE;
+
 
 const U32 REGION_FLAGS_PRELUDE_SET = REGION_FLAGS_RESET_HOME_ON_TELEPORT;
 const U32 REGION_FLAGS_PRELUDE_UNSET = REGION_FLAGS_ALLOW_LANDMARK 
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index 29f232c..ab41cca 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -1344,12 +1344,17 @@ LLMessageSystem::~LLMessageSystem()
                 end_net();
         }
         
-        delete mMessageReader;
+        delete mTemplateMessageReader;
+        mTemplateMessageReader = NULL;
         mMessageReader = NULL;
 
-        delete mMessageBuilder;
+        delete mTemplateMessageBuilder;
+        mTemplateMessageBuilder = NULL;
         mMessageBuilder = NULL;
 
+        delete mLLSDMessageReader;
+        mLLSDMessageReader = NULL;
+
         delete mPollInfop;
         mPollInfop = NULL;
 
@@ -2942,17 +2947,19 @@ static LLHTTPNode& messageRootNode()
 }
 
 //static
-void LLMessageSystem::dispatch(const std::string& msg_name,
-                                                                const LLSD& message)
+void LLMessageSystem::dispatch(
+        const std::string& msg_name,
+        const LLSD& message)
 {
         LLPointer<LLSimpleResponse>     responsep =     LLSimpleResponse::create();
         dispatch(msg_name, message, responsep);
 }
 
 //static
-void LLMessageSystem::dispatch(const std::string& msg_name,
-                                                                const LLSD& message,
-                                                           LLHTTPNode::ResponsePtr responsep)
+void LLMessageSystem::dispatch(
+        const std::string& msg_name,
+        const LLSD& message,
+        LLHTTPNode::ResponsePtr responsep)
 {
         if (msg_name.empty())
         {