9 files changed, 32 insertions, 24 deletions

diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index 1d1be56..0db9f8e 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -1170,13 +1170,11 @@ std::ostream& operator<<(std::ostream& s, LLCircuitData& circuit)
         return s;
 }
 
-const LLString LLCircuitData::getInfoString() const
+void LLCircuitData::getInfo(LLSD& info) const
 {
-        std::ostringstream info;
-        info << "Circuit: " << mHost << std::endl
-                 << (mbAlive ? "Alive" : "Not Alive") << std::endl
-                 << "Age: " << mExistenceTimer.getElapsedTimeF32() << std::endl;
-        return LLString(info.str());
+        info["Host"] = mHost.getIPandPort();
+        info["Alive"] = mbAlive;
+        info["Age"] = mExistenceTimer.getElapsedTimeF32();
 }
 
 void LLCircuitData::dumpResendCountAndReset()
@@ -1200,17 +1198,16 @@ std::ostream& operator<<(std::ostream& s, LLCircuit &circuit)
         return s;
 }
 
-const LLString LLCircuit::getInfoString() const
+void LLCircuit::getInfo(LLSD& info) const
 {
-        std::ostringstream info;
-        info << "Circuit Info:" << std::endl;
         LLCircuit::circuit_data_map::const_iterator end = mCircuitData.end();
         LLCircuit::circuit_data_map::const_iterator it;
+        LLSD circuit_info;
         for(it = mCircuitData.begin(); it != end; ++it)
         {
-                info << (*it).second->getInfoString() << std::endl;
+                (*it).second->getInfo(circuit_info);
+                info["Circuits"].append(circuit_info);
         }
-        return LLString(info.str());
 }
 
 void LLCircuit::getCircuitRange(
diff --git a/linden/indra/llmessage/llcircuit.h b/linden/indra/llmessage/llcircuit.h
index 128b1bc..1a6611f 100644
--- a/linden/indra/llmessage/llcircuit.h
+++ b/linden/indra/llmessage/llcircuit.h
@@ -75,6 +75,7 @@ const S32 LL_MAX_ACKED_PACKETS_PER_FRAME = 200;
 //
 class LLMessageSystem;
 class LLEncodedDatagramService;
+class LLSD;
 
 //
 // Classes
@@ -158,7 +159,7 @@ public:
         //
         void                                    checkPeriodTime();              // Reset per-period counters if necessary.
         friend std::ostream&    operator<<(std::ostream& s, LLCircuitData &circuit);
-        const LLString getInfoString() const;
+        void getInfo(LLSD& info) const;
 
         friend class LLCircuit;
         friend class LLMessageSystem;
@@ -304,7 +305,7 @@ public:
         void sendAcks();
 
         friend std::ostream& operator<<(std::ostream& s, LLCircuit &circuit);
-        const LLString getInfoString() const;
+        void getInfo(LLSD& info) const;
 
         void                    dumpResends();
 
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index 01976b1..9b5e6cd 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -367,6 +367,11 @@ LLCurl::getByteRange(const std::string& url, S32 offset, S32 length, ResponderPt
         mainMulti()->getByteRange(url, offset, length, responder);
 }
         
+void LLCurl::initClass()
+{
+    curl_global_init(CURL_GLOBAL_ALL);
+}
+
 void
 LLCurl::process()
 {
diff --git a/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index d21cdc4..53287c2 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/indra/llmessage/llcurl.h
@@ -130,8 +130,9 @@ public:
         static void get(const std::string& url, ResponderPtr);
         static void getByteRange(const std::string& url, S32 offset, S32 length, ResponderPtr responder);
         
+    static void initClass(); // *NOTE:Mani - not thread safe!
         static void process();
-        static void cleanup();
+        static void cleanup(); // *NOTE:Mani - not thread safe!
 };
 
 namespace boost
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h
index 72272c0..5f3fad8 100644
--- a/linden/indra/llmessage/llregionflags.h
+++ b/linden/indra/llmessage/llregionflags.h
@@ -84,8 +84,8 @@ const U32 REGION_FLAGS_ESTATE_SKIP_SCRIPTS		= (1 << 21);
 const U32 REGION_FLAGS_RESTRICT_PUSHOBJECT              = (1 << 22);
 
 const U32 REGION_FLAGS_DENY_ANONYMOUS                   = (1 << 23);
-const U32 REGION_FLAGS_DENY_IDENTIFIED                  = (1 << 24);
-const U32 REGION_FLAGS_DENY_TRANSACTED                  = (1 << 25);
+// const U32 REGION_FLAGS_DENY_IDENTIFIED                       = (1 << 24);
+// const U32 REGION_FLAGS_DENY_TRANSACTED                       = (1 << 25);
 
 const U32 REGION_FLAGS_ALLOW_PARCEL_CHANGES             = (1 << 26);
 
@@ -94,6 +94,7 @@ const U32 REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER = (1 << 27);
 const U32 REGION_FLAGS_ALLOW_VOICE = (1 << 28);
 
 const U32 REGION_FLAGS_BLOCK_PARCEL_SEARCH = (1 << 29);
+const U32 REGION_FLAGS_DENY_AGEUNVERIFIED               = (1 << 30);
 
 
 const U32 REGION_FLAGS_DEFAULT = REGION_FLAGS_ALLOW_LANDMARK |
@@ -110,8 +111,7 @@ const U32 REGION_FLAGS_ESTATE_MASK = REGION_FLAGS_EXTERNALLY_VISIBLE
                                                                          | REGION_FLAGS_PUBLIC_ALLOWED  
                                                                          | REGION_FLAGS_SUN_FIXED
                                                                          | REGION_FLAGS_DENY_ANONYMOUS
-                                                                         | REGION_FLAGS_DENY_IDENTIFIED
-                                                                         | REGION_FLAGS_DENY_TRANSACTED;
+                                                                         | REGION_FLAGS_DENY_AGEUNVERIFIED;
 
 inline BOOL is_prelude( U32 flags )
 {
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index e2cd19b..d446730 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -1562,12 +1562,9 @@ U32 LLMessageSystem::getOurCircuitCode()
         return mOurCircuitCode;
 }
 
-LLString LLMessageSystem::getCircuitInfoString()
+void LLMessageSystem::getCircuitInfo(LLSD& info) const
 {
-        LLString info_string;
-
-        info_string += mCircuitInfo.getInfoString();
-        return info_string;
+        mCircuitInfo.getInfo(info);
 }
 
 // returns whether the given host is on a trusted circuit
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index 4454b40..3381ece 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -529,7 +529,7 @@ public:
         bool isMatchingDigestForWindow(const char* digest, const S32 window) const;
 
         void    showCircuitInfo();
-        LLString getCircuitInfoString();
+        void getCircuitInfo(LLSD& info) const;
 
         U32 getOurCircuitCode();
         
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index 0185c0f..0b614d8 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -1369,6 +1369,9 @@ char * _PREHASH_AvatarNotesReply;
 char * _PREHASH_CacheID;
 char * _PREHASH_OwnerMask;
 char * _PREHASH_TransferInventoryAck;
+char * _PREHASH_RegionDenyAgeUnverified;
+char * _PREHASH_AgeVerificationBlock;
+
 
 void init_prehash_data()
 {
@@ -2702,4 +2705,6 @@ void init_prehash_data()
         _PREHASH_CacheID = gMessageStringTable.getString("CacheID");
         _PREHASH_OwnerMask = gMessageStringTable.getString("OwnerMask");
         _PREHASH_TransferInventoryAck = gMessageStringTable.getString("TransferInventoryAck");
+        _PREHASH_RegionDenyAgeUnverified = gMessageStringTable.getString("RegionDenyAgeUnverified");
+        _PREHASH_AgeVerificationBlock = gMessageStringTable.getString("AgeVerificationBlock");
 }
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index 2cea924..4210665 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -1369,6 +1369,8 @@ extern char * _PREHASH_AvatarNotesReply;
 extern char * _PREHASH_CacheID;
 extern char * _PREHASH_OwnerMask;
 extern char * _PREHASH_TransferInventoryAck;
+extern char * _PREHASH_RegionDenyAgeUnverified;
+extern char * _PREHASH_AgeVerificationBlock;
 
 
 void init_prehash_data();