129 files changed, 10301 insertions, 4421 deletions

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index cd708fd..e5e3eb0 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -85,6 +85,8 @@ Aleric Inglewood
         IMP-662
         IMP-663
         IMP-664
+        IMP-667
+        IMP-670
 Alissa Sabre
         VWR-81
         VWR-83
diff --git a/linden/etc/message.xml b/linden/etc/message.xml
index f9baf0b..c53e846 100644
--- a/linden/etc/message.xml
+++ b/linden/etc/message.xml
@@ -378,7 +378,15 @@
                                         <boolean>true</boolean>
                                 </map>
 
-                                <key>ParcelVoiceInfo</key>
+        <key>WindLightSettingsUpdate</key>
+        <map>
+          <key>flavor</key>
+          <string>llsd</string>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
+
+        <key>ParcelVoiceInfo</key>
                                 <map>
                                         <key>flavor</key>
                                         <string>llsd</string>
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 7fe1040..35f4e3a 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -8,6 +8,14 @@ if (NOT STANDALONE)
      use_prebuilt_binary(32bitcompatibilitylibs)
    endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   use_prebuilt_binary(fontconfig)
+else (NOT STANDALONE)
+  # Download there even when using standalone.
+  set(STANDALONE OFF)
+  use_prebuilt_binary(vivox)
+  if(LINUX AND ${ARCH} STREQUAL "x86_64")
+    use_prebuilt_binary(32bitcompatibilitylibs)
+  endif(LINUX AND ${ARCH} STREQUAL "x86_64")
+  set(STANDALONE ON)
 endif(NOT STANDALONE)
 
 if (WINDOWS)
diff --git a/linden/indra/llcharacter/llkeyframewalkmotion.cpp b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
index b5817e5..4aa9d2a 100644
--- a/linden/indra/llcharacter/llkeyframewalkmotion.cpp
+++ b/linden/indra/llcharacter/llkeyframewalkmotion.cpp
@@ -50,6 +50,7 @@ const F32 MIN_WALK_SPEED = 0.1f;	// minimum speed at which we use velocity for d
 const F32 MAX_TIME_DELTA = 2.f;         //max two seconds a frame for calculating interpolation
 const F32 SPEED_ADJUST_MAX = 2.5f; // maximum adjustment of walk animation playback speed
 const F32 SPEED_ADJUST_MAX_SEC = 3.f;   // maximum adjustment to walk animation playback speed for a second
+const F32 SPEED_FINAL_SCALING = 0.5f;  // final scaling for walk animation
 const F32 DRIFT_COMP_MAX_TOTAL = 0.07f;//0.55f; // maximum drift compensation overall, in any direction 
 const F32 DRIFT_COMP_MAX_SPEED = 4.f; // speed at which drift compensation total maxes out
 const F32 MAX_ROLL = 0.6f;
@@ -314,6 +315,7 @@ BOOL LLWalkAdjustMotion::onUpdate(F32 time, U8* joint_mask)
         }
 
         mAnimSpeed = (mAvgSpeed + mSpeedAdjust) * mRelativeDir;
+        mAnimSpeed = mAnimSpeed * SPEED_FINAL_SCALING;
 //      char debug_text[64];
 //      sprintf(debug_text, "Foot slip vel: %.2f", footSlipVelocity);
 //      mCharacter->addDebugText(debug_text);
diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp
index fa6efaf..fb3e1ef 100644
--- a/linden/indra/llcommon/lltimer.cpp
+++ b/linden/indra/llcommon/lltimer.cpp
@@ -527,6 +527,34 @@ struct tm* utc_to_pacific_time(time_t utc_time, BOOL pacific_daylight_time)
 }
 
 
+struct tm* utc_to_offset_time(time_t utc_time, S32 offset, BOOL DST)
+{
+        if (DST)
+        {
+                //Subtract one then
+                offset--;
+        }
+
+        // We subtract off the PST/PDT offset _before_ getting
+        // "UTC" time, because this will handle wrapping around
+        // for 5 AM UTC -> 10 PM PDT of the previous day.
+        utc_time -= offset * MIN_PER_HOUR * SEC_PER_MIN;
+ 
+        // Internal buffer to PST/PDT (see above)
+        struct tm* internal_time = gmtime(&utc_time);
+
+        /*
+        // Don't do this, this won't correctly tell you if daylight savings is active in CA or not.
+        if (pacific_daylight_time)
+        {
+                internal_time->tm_isdst = 1;
+        }
+        */
+
+        return internal_time;
+}
+
+
 void microsecondsToTimecodeString(U64 current_time, std::string& tcstring)
 {
         U64 hours;
diff --git a/linden/indra/llcommon/lltimer.h b/linden/indra/llcommon/lltimer.h
index e2cf1c7..a653233 100644
--- a/linden/indra/llcommon/lltimer.h
+++ b/linden/indra/llcommon/lltimer.h
@@ -166,6 +166,7 @@ BOOL is_daylight_savings();
 // utc_time = time_corrected();
 // struct tm* internal_time = utc_to_pacific_time(utc_time, gDaylight);
 struct tm* utc_to_pacific_time(time_t utc_time, BOOL pacific_daylight_time);
+struct tm* utc_to_offset_time(time_t utc_time, S32 offset, BOOL DST);
 
 void microsecondsToTimecodeString(U64 current_time, std::string& tcstring);
 void secondsToTimecodeString(F32 current_time, std::string& tcstring);
diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index 725425c..0ff5093 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -1231,6 +1231,17 @@ void LLCircuit::getCircuitRange(
         first = mCircuitData.upper_bound(key);
 }
 
+// <edit>
+std::vector<LLCircuitData*> LLCircuit::getCircuitDataList()
+{
+        std::vector<LLCircuitData*> list;
+        circuit_data_map::iterator end = mCircuitData.end();
+        for(circuit_data_map::iterator iter = mCircuitData.begin(); iter != end; ++iter)
+                list.push_back((*iter).second);
+        return list;
+}
+// </edit>
+
 TPACKETID LLCircuitData::nextPacketOutID()
 {
         mPacketsOut++;
diff --git a/linden/indra/llmessage/llcircuit.h b/linden/indra/llmessage/llcircuit.h
index e373cb1..379453e 100644
--- a/linden/indra/llmessage/llcircuit.h
+++ b/linden/indra/llmessage/llcircuit.h
@@ -336,6 +336,9 @@ public:
         // HACK - this should become protected eventually, but stupid !@$@# message system/circuit classes are jumbling things up.
         circuit_data_map mUnackedCircuitMap; // Map of circuits with unacked data
         circuit_data_map mSendAckMap; // Map of circuits which need to send acks
+
+        std::vector<LLCircuitData*> getCircuitDataList();
+
 protected:
         circuit_data_map mCircuitData;
 
diff --git a/linden/indra/llmessage/llmessagelog.cpp b/linden/indra/llmessage/llmessagelog.cpp
new file mode 100644
index 0000000..965b8c0
--- /dev/null
+++ b/linden/indra/llmessage/llmessagelog.cpp
@@ -0,0 +1,54 @@
+// <edit>
+#include "llmessagelog.h"
+
+LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, U8* data, S32 data_size)
+:       mType(type),
+        mFromHost(from_host),
+        mToHost(to_host),
+        mDataSize(data_size)
+{
+        if(data)
+        {
+                mData.resize(data_size);
+                memcpy(&(mData[0]), data, data_size);
+        }
+}
+LLMessageLogEntry::LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, std::vector<U8> data, S32 data_size)
+:       mType(type),
+        mFromHost(from_host),
+        mToHost(to_host),
+        mDataSize(data_size),
+        mData(data)
+{
+}
+LLMessageLogEntry::~LLMessageLogEntry()
+{
+}
+U32 LLMessageLog::sMaxSize = 4096; // testzone fixme todo boom
+std::deque<LLMessageLogEntry> LLMessageLog::sDeque;
+void (*(LLMessageLog::sCallback))(LLMessageLogEntry);
+void LLMessageLog::setMaxSize(U32 size)
+{
+        sMaxSize = size;
+        while(sDeque.size() > sMaxSize)
+                sDeque.pop_front();
+}
+void LLMessageLog::setCallback(void (*callback)(LLMessageLogEntry))
+{
+        sCallback = callback;
+}
+void LLMessageLog::log(LLHost from_host, LLHost to_host, U8* data, S32 data_size)
+{
+        LLMessageLogEntry entry = LLMessageLogEntry(LLMessageLogEntry::TEMPLATE, from_host, to_host, data, data_size);
+        if(!entry.mDataSize || !entry.mData.size()) return;
+        if(sCallback) sCallback(entry);
+        if(!sMaxSize) return;
+        sDeque.push_back(entry);
+        if(sDeque.size() > sMaxSize)
+                sDeque.pop_front();
+}
+std::deque<LLMessageLogEntry> LLMessageLog::getDeque()
+{
+        return sDeque;
+}
+// </edit>
diff --git a/linden/indra/llmessage/llmessagelog.h b/linden/indra/llmessage/llmessagelog.h
new file mode 100644
index 0000000..5046d80
--- /dev/null
+++ b/linden/indra/llmessage/llmessagelog.h
@@ -0,0 +1,41 @@
+// <edit>
+#ifndef LL_LLMESSAGELOG_H
+#define LL_LLMESSAGELOG_H
+#include "stdtypes.h"
+#include "llhost.h"
+#include <queue>
+#include <string.h>
+
+class LLMessageSystem;
+class LLMessageLogEntry
+{
+public:
+        enum EType
+        {
+                TEMPLATE,
+                HTTP_REQUEST,
+                HTTP_RESPONSE
+        };
+        LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, U8* data, S32 data_size);
+        LLMessageLogEntry(EType type, LLHost from_host, LLHost to_host, std::vector<U8> data, S32 data_size);
+        ~LLMessageLogEntry();
+        EType mType;
+        LLHost mFromHost;
+        LLHost mToHost;
+        S32 mDataSize;
+        std::vector<U8> mData;
+};
+class LLMessageLog
+{
+public:
+        static void setMaxSize(U32 size);
+        static void setCallback(void (*callback)(LLMessageLogEntry));
+        static void log(LLHost from_host, LLHost to_host, U8* data, S32 data_size);
+        static std::deque<LLMessageLogEntry> getDeque();
+private:
+        static U32 sMaxSize;
+        static void (*sCallback)(LLMessageLogEntry);
+        static std::deque<LLMessageLogEntry> sDeque;
+};
+#endif
+// </edit>
diff --git a/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index 35d5aac..7dcb606 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/indra/llmessage/llpacketring.cpp
@@ -40,6 +40,8 @@
 #include "timing.h"
 #include "llrand.h"
 #include "u64.h"
+#include "llmessagelog.h"
+#include "message.h"
 
 ///////////////////////////////////////////////////////////
 LLPacketRing::LLPacketRing () :
@@ -246,6 +248,9 @@ S32 LLPacketRing::receivePacket (S32 socket, char *datap)
 
 BOOL LLPacketRing::sendPacket(int h_socket, char * send_buffer, S32 buf_size, LLHost host)
 {
+        //<edit>
+        LLMessageLog::log(LLHost(16777343, gMessageSystem->getListenPort()), host, (U8*)send_buffer, buf_size);
+        //</edit>
         BOOL status = TRUE;
         if (!mUseOutThrottle)
         {
diff --git a/linden/indra/llmessage/lltemplatemessagereader.cpp b/linden/indra/llmessage/lltemplatemessagereader.cpp
index d8904a9..9f68fe9 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.cpp
+++ b/linden/indra/llmessage/lltemplatemessagereader.cpp
@@ -449,7 +449,10 @@ S32 LLTemplateMessageReader::getMessageSize() const
 // Returns template for the message contained in buffer
 BOOL LLTemplateMessageReader::decodeTemplate(  
                 const U8* buffer, S32 buffer_size,  // inputs
-                LLMessageTemplate** msg_template ) // outputs
+                // <edit>
+                //LLMessageTemplate** msg_template ) // outputs
+                LLMessageTemplate** msg_template, BOOL custom)
+                // </edit>
 {
         const U8* header = buffer + LL_PACKET_ID_SIZE;
 
@@ -491,6 +494,9 @@ BOOL LLTemplateMessageReader::decodeTemplate(
         }
         else // bogus packet received (too short)
         {
+                // <edit>
+                if(!custom)
+                // </edit>
                 llwarns << "Packet with unusable length received (too short): "
                                 << buffer_size << llendl;
                 return(FALSE);
@@ -503,9 +509,16 @@ BOOL LLTemplateMessageReader::decodeTemplate(
         }
         else
         {
+                // <edit>
+                if(!custom)
+                {
+                // </edit>
                 llwarns << "Message #" << std::hex << num << std::dec
                         << " received but not registered!" << llendl;
                 gMessageSystem->callExceptionFunc(MX_UNREGISTERED_MESSAGE);
+                // <edit>
+                }
+                // </edit>
                 return(FALSE);
         }
 
@@ -532,7 +545,8 @@ void LLTemplateMessageReader::logRanOffEndOfPacket( const LLHost& host, const S3
 }
 
 // decode a given message
-BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender )
+BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender, BOOL custom)
+// </edit>
 {
         llassert( mReceiveSize >= 0 );
         llassert( mCurrentRMessageTemplate);
@@ -594,6 +608,9 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
                 }
                 else
                 {
+                        // <edit>
+                        if(!custom)
+                        // </edit>
                         llerrs << "Unknown block type" << llendl;
                         return FALSE;
                 }
@@ -640,6 +657,9 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
 
                                         if ((decode_pos + data_size) > mReceiveSize)
                                         {
+                                                // <edit>
+                                                if(!custom)
+                                                // </edit>
                                                 logRanOffEndOfPacket(sender, decode_pos, data_size);
 
                                                 // default to 0 length variable blocks
@@ -676,6 +696,9 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
                                         // so, copy data pointer and set data size to fixed size
                                         if ((decode_pos + mvci.getSize()) > mReceiveSize)
                                         {
+                                                // <edit>
+                                                if(!custom)
+                                                // </edit>
                                                 logRanOffEndOfPacket(sender, decode_pos, mvci.getSize());
 
                                                 // default to 0s.
@@ -703,7 +726,10 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
                 lldebugs << "Empty message '" << mCurrentRMessageTemplate->mName << "' (no blocks)" << llendl;
                 return FALSE;
         }
-
+        
+        // <edit>
+        if(!custom)
+        // </edit>
         {
                 static LLTimer decode_timer;
 
@@ -756,14 +782,26 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
         return TRUE;
 }
 
+// <edit>
+LLMessageTemplate* LLTemplateMessageReader::getTemplate()
+{
+        return mCurrentRMessageTemplate;
+}
+// </edit>
+
 BOOL LLTemplateMessageReader::validateMessage(const U8* buffer, 
                                                                                           S32 buffer_size, 
                                                                                           const LLHost& sender,
-                                                                                          bool trusted)
+                                                                                          bool trusted,
+                                                                                          BOOL custom)
 {
         mReceiveSize = buffer_size;
-        BOOL valid = decodeTemplate(buffer, buffer_size, &mCurrentRMessageTemplate );
-        if(valid)
+        // <edit>
+        //BOOL valid = decodeTemplate(buffer, buffer_size, &mCurrentRMessageTemplate );
+        BOOL valid = decodeTemplate(buffer, buffer_size, &mCurrentRMessageTemplate, custom );
+        //if(result)
+        if(valid && !custom)
+        // </edit>
         {
                 mCurrentRMessageTemplate->mReceiveCount++;
                 //lldebugs << "MessageRecvd:"
diff --git a/linden/indra/llmessage/lltemplatemessagereader.h b/linden/indra/llmessage/lltemplatemessagereader.h
index ab06ab4..0eef93a 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.h
+++ b/linden/indra/llmessage/lltemplatemessagereader.h
@@ -102,28 +102,32 @@ public:
         virtual const char* getMessageName() const;
         virtual S32 getMessageSize() const;
 
+        // <edit>
+        LLMessageTemplate* getTemplate();
+        // </edit>
+
         virtual void copyToBuilder(LLMessageBuilder&) const;
 
         BOOL validateMessage(const U8* buffer, S32 buffer_size, 
-                                                 const LLHost& sender, bool trusted = false);
+                                                 const LLHost& sender, bool trusted = false, BOOL custom = FALSE);
         BOOL readMessage(const U8* buffer, const LLHost& sender);
 
         bool isTrusted() const;
         bool isBanned(bool trusted_source) const;
         bool isUdpBanned() const;
+
+        BOOL decodeData(const U8* buffer, const LLHost& sender, BOOL custom = FALSE);
+
+        BOOL decodeTemplate(const U8* buffer, S32 buffer_size,  // inputs
+                                                LLMessageTemplate** msg_template, BOOL custom = FALSE); // outputs
         
 private:
 
         void getData(const char *blockname, const char *varname, void *datap, 
                                  S32 size = 0, S32 blocknum = 0, S32 max_size = S32_MAX);
 
-        BOOL decodeTemplate(const U8* buffer, S32 buffer_size,  // inputs
-                                                LLMessageTemplate** msg_template ); // outputs
-
         void logRanOffEndOfPacket( const LLHost& host, const S32 where, const S32 wanted );
 
-        BOOL decodeData(const U8* buffer, const LLHost& sender );
-
         S32     mReceiveSize;
         LLMessageTemplate* mCurrentRMessageTemplate;
         LLMsgData* mCurrentRMessageData;
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index 78af35b..7e8aff1 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -86,6 +86,7 @@
 #include "v3math.h"
 #include "v4math.h"
 #include "lltransfertargetvfile.h"
+#include "llmessagelog.h"
 
 // Constants
 //const char* MESSAGE_LOG_FILENAME = "message.log";
@@ -524,10 +525,10 @@ LLCircuitData* LLMessageSystem::findCircuit(const LLHost& host,
 }
 
 // Returns TRUE if a valid, on-circuit message has been received.
-BOOL LLMessageSystem::checkMessages( S64 frame_count )
+BOOL LLMessageSystem::checkMessages( S64 frame_count, bool faked_message, U8 fake_buffer[MAX_BUFFER_SIZE], LLHost fake_host, S32 fake_size )
 {
         // Pump 
-        BOOL    valid_packet = FALSE;
+        BOOL valid_packet = FALSE;
         mMessageReader = mTemplateMessageReader;
 
         LLTransferTargetVFile::updateQueue();
@@ -557,6 +558,13 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                 mTrueReceiveSize = mPacketRing.receivePacket(mSocket, (char *)mTrueReceiveBuffer);
                 // If you want to dump all received packets into SecondLife.log, uncomment this
                 //dumpPacketToLog();
+                // <edit>
+                if(mTrueReceiveSize && receive_size > (S32) LL_MINIMUM_VALID_PACKET_SIZE)
+                {
+                        LLMessageLog::log(mLastSender, LLHost(16777343, mPort), buffer, mTrueReceiveSize);
+                }
+                // </edit>
+
                 
                 receive_size = mTrueReceiveSize;
                 mLastSender = mPacketRing.getLastSender();
@@ -1549,6 +1557,12 @@ U32 LLMessageSystem::getOurCircuitCode()
         return mOurCircuitCode;
 }
 
+// <edit>
+LLCircuit* LLMessageSystem::getCircuit()
+{
+        return &mCircuitInfo;
+}
+
 void LLMessageSystem::getCircuitInfo(LLSD& info) const
 {
         mCircuitInfo.getInfo(info);
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index b25b27e..e6391d9 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -230,11 +230,14 @@ class LLMessageSystem : public LLMessageSenderInterface
         typedef std::map<const char *, LLMessageTemplate*> message_template_name_map_t;
         typedef std::map<U32, LLMessageTemplate*> message_template_number_map_t;
 
-private:
+// <edit>
+//private:
+// </edit>
         message_template_name_map_t             mMessageTemplates;
         message_template_number_map_t           mMessageNumbers;
-
-public:
+// <edit>
+//public:
+// </edit>
         S32                                     mSystemVersionMajor;
         S32                                     mSystemVersionMinor;
         S32                                     mSystemVersionPatch;
@@ -341,7 +344,7 @@ public:
         bool addCircuitCode(U32 code, const LLUUID& session_id);
 
         BOOL    poll(F32 seconds); // Number of seconds that we want to block waiting for data, returns if data was received
-        BOOL    checkMessages( S64 frame_count = 0 );
+        BOOL    checkMessages( S64 frame_count = 0, bool faked_message = false, U8 fake_buffer[MAX_BUFFER_SIZE] = NULL, LLHost fake_host = LLHost(), S32 fake_size = 0 );
         void    processAcks();
 
         BOOL    isMessageFast(const char *msg);
@@ -569,6 +572,10 @@ public:
         void    showCircuitInfo();
         void getCircuitInfo(LLSD& info) const;
 
+        // <edit>
+        LLCircuit* getCircuit();
+        // </edit>
+
         U32 getOurCircuitCode();
         
         void    enableCircuit(const LLHost &host, BOOL trusted);
@@ -733,6 +740,8 @@ public:
         // This will cause all trust queries to return true until the next message
         // is read: use with caution!
         void receivedMessageFromTrustedSender();
+
+        LLTemplateMessageBuilder* mTemplateMessageBuilder;
         
 private:
 
@@ -807,7 +816,6 @@ private:
         TPACKETID mCurrentRecvPacketID;       // packet ID of current receive packet (for reporting)
 
         LLMessageBuilder* mMessageBuilder;
-        LLTemplateMessageBuilder* mTemplateMessageBuilder;
         LLSDMessageBuilder* mLLSDMessageBuilder;
         LLMessageReader* mMessageReader;
         LLTemplateMessageReader* mTemplateMessageReader;
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 3c2293f..9635f99 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -103,6 +103,10 @@ struct SortScrollListItem
 LLScrollListIcon::LLScrollListIcon(LLUIImagePtr icon, S32 width)
         : LLScrollListCell(width),
           mIcon(icon),
+          // <edit>
+          mCallback(NULL),
+          mUserData(NULL),
+          // </edit>
           mColor(LLColor4::white)
 {
 }
@@ -145,6 +149,19 @@ void LLScrollListIcon::setValue(const LLSD& value)
         }
 }
 
+// <edit>
+void LLScrollListIcon::setClickCallback(BOOL (*callback)(void*), void* user_data)
+{
+        mCallback = callback;
+        mUserData = user_data;
+}
+
+BOOL LLScrollListIcon::handleClick()
+{
+        if(mCallback) return mCallback(mUserData);
+        return FALSE;
+}
+// </edit>
 
 void LLScrollListIcon::setColor(const LLColor4& color)
 {
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 516e4f1..e875d7a 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -163,10 +163,18 @@ public:
         virtual void    setColor(const LLColor4&);
         virtual BOOL    isText()const { return FALSE; }
         virtual void    setValue(const LLSD& value);
+        // <edit>
+        void setClickCallback(BOOL (*callback)(void*), void* user_data);
+        virtual BOOL handleClick();
+        // </edit>
 
 private:
         LLUIImagePtr mIcon;
         LLColor4 mColor;
+        // <edit>
+        BOOL (*mCallback)(void*);
+        void* mUserData;
+        // </edit>
 };
 
 /*
@@ -493,6 +501,9 @@ public:
 
         virtual S32             getScrollPos() const;
         virtual void    setScrollPos( S32 pos );
+        // <edit>
+        S32 getPageLines() { return mPageLines; }
+        // </edit>
         S32 getSearchColumn();
         void                    setSearchColumn(S32 column) { mSearchColumn = column; }
         S32                             getColumnIndexFromOffset(S32 x);
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1a6ad30..c3c6566 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -493,6 +493,11 @@ set(viewer_SOURCE_FILES
     rlvfloaterbehaviour.cpp
     viewertime.cpp
     viewerversion.cpp
+    windlightsettingsupdate.cpp
+    wlfloatermanager.cpp
+    wlfloaterwindlightsend.cpp
+    wlretrievesettings.cpp
+    wlsettingsmanager.cpp
     )
 
 set(VIEWER_BINARY_NAME "imprudence-bin" CACHE STRING
@@ -950,6 +955,10 @@ set(viewer_HEADER_FILES
     VorbisFramework.h
     viewertime.h
     viewerversion.h
+    wlfloatermanager.h
+    wlfloaterwindlightsend.h
+    wlretrievesettings.h
+    wlsettingsmanager.h
     )
 
 source_group("CMake Rules" FILES ViewerInstall.cmake)
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 7b37bb6..576a553 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2903,39 +2903,6 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  <key>BulkChangeIncludeAnimations</key>
-  <map>
-    <key>Comment</key>
-    <string>Bulk permission changes affect animations</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
-  <key>BulkChangeIncludeAnimations</key>
-  <map>
-    <key>Comment</key>
-    <string>Bulk permission changes affect animations</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
-  <key>BulkChangeIncludeAnimations</key>
-  <map>
-    <key>Comment</key>
-    <string>Bulk permission changes affect animations</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>BulkChangeIncludeBodyParts</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/hippoLimits.cpp b/linden/indra/newview/hippoLimits.cpp
index 92e2ed3..a5d6ee6 100644
--- a/linden/indra/newview/hippoLimits.cpp
+++ b/linden/indra/newview/hippoLimits.cpp
@@ -43,11 +43,30 @@ void HippoLimits::setLimits()
 void HippoLimits::setOpenSimLimits()
 {
         mMaxAgentGroups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups();
-        if (mMaxAgentGroups < 0) mMaxAgentGroups = 50;
+
+        if (mMaxAgentGroups < 0)
+                mMaxAgentGroups = 50;
+
         mMaxPrimScale = 256.0f;
         mMinPrimScale = 0.001f;
+        mMinPrimXPos = 0;
+        mMinPrimYPos = 0;
+        mMinPrimZPos = 0;
+        mMaxPrimXPos = F32_MAX;
+        mMaxPrimYPos = F32_MAX;
+        mMaxPrimZPos = F32_MAX;
         mMaxHeight = 10000.0f;
         mMaxLinkedPrims = -1;
+        mMaxPhysLinkedPrims = -1;
+        mAllowParcelWindLight = TRUE;
+        mAllowMinimap = TRUE;
+        mMaxInventoryItemsTransfer = -1;
+        mRenderName = 2;
+        mAllowPhysicalPrims = TRUE;
+        skyUseClassicClouds = TRUE;
+        mEnableTeenMode = FALSE;
+        mEnforceMaxBuild = FALSE;
+        mRenderWater = TRUE;
 
         if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
                 llinfos << "Using rendering compatible OpenSim limits" << llendl;
@@ -72,11 +91,27 @@ void HippoLimits::setSecondLifeLimits()
         mMinHoleSize = 0.05f;  
         mMaxHollow = 0.95f;
         mMaxLinkedPrims = 255;
+        mMaxPhysLinkedPrims = 32;
+        mMinPrimXPos = 0;
+        mMinPrimYPos = 0;
+        mMinPrimZPos = 0;
+        mMaxPrimXPos = 256;
+        mMaxPrimYPos = 256;
+        mMaxPrimZPos = 4096;
+        mAllowParcelWindLight = FALSE;
+        mAllowMinimap = TRUE;
+        mMaxInventoryItemsTransfer = 42;
+        mRenderName = 2;
+        mAllowPhysicalPrims = TRUE;
+        skyUseClassicClouds = TRUE;
+        mEnableTeenMode = FALSE;
+        mEnforceMaxBuild = FALSE;
+        mRenderWater = TRUE;
 }
 
 F32 HippoLimits::getMaxPrimScale() const
 {
-        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints"))
+        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild)
         {
                 return FLT_MAX;
         }
@@ -85,3 +120,105 @@ F32 HippoLimits::getMaxPrimScale() const
                 return mMaxPrimScale;
         }
 }
+
+F32 HippoLimits::getMinPrimScale() const
+{
+        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild)
+        {
+                return 0;
+        }
+        else
+        {
+                return mMinPrimScale;
+        }
+}
+
+F32 HippoLimits::getMaxPrimXPos() const
+{
+        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild)
+        {
+                return FLT_MAX;
+        }
+        else
+        {
+                return mMaxPrimXPos;
+        }
+}
+
+F32 HippoLimits::getMaxPrimYPos() const
+{
+        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild)
+        {
+                return FLT_MAX;
+        }
+        else
+        {
+                return mMaxPrimYPos;
+        }
+}
+
+F32 HippoLimits::getMaxPrimZPos() const
+{
+        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild)
+        {
+                return FLT_MAX;
+        }
+        else
+        {
+                return mMaxPrimZPos;
+        }
+}
+
+F32 HippoLimits::getMinPrimXPos() const
+{
+        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild)
+        {
+                return FLT_MIN;
+        }
+        else
+        {
+                return mMinPrimXPos;
+        }
+}
+
+F32 HippoLimits::getMinPrimYPos() const
+{
+        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild)
+        {
+                return FLT_MIN;
+        }
+        else
+        {
+                return mMinPrimYPos;
+        }
+}
+
+F32 HippoLimits::getMinPrimZPos() const
+{
+        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild)
+        {
+                return FLT_MIN;
+        }
+        else
+        {
+                return mMinPrimZPos;
+        }
+}
+
+F32 HippoLimits::getMaxDragDistance() const
+{
+        if (mMaxDragDistance == 0)
+        {
+                return FLT_MAX;
+        }
+        else
+        {
+                F32 max_drag_distance = gSavedSettings.getBOOL("LimitDragDistance") ? gSavedSettings.getF32("MaxDragDistance") : FLT_MAX;
+
+                if(max_drag_distance > mMaxDragDistance) //Chose the more restrictive

+                {

+                        max_drag_distance = mMaxDragDistance;

+                }
+                return max_drag_distance;
+        }
+}
\ No newline at end of file
diff --git a/linden/indra/newview/hippoLimits.h b/linden/indra/newview/hippoLimits.h
index a5fe351..7792a2c 100644
--- a/linden/indra/newview/hippoLimits.h
+++ b/linden/indra/newview/hippoLimits.h
@@ -11,12 +11,24 @@ public:
         const F32&      getMaxHeight()      const { return mMaxHeight;      }
         const F32&      getMinHoleSize()    const { return mMinHoleSize;    }
         const F32&      getMaxHollow()      const { return mMaxHollow;      }
-        const F32&      getMinPrimScale()   const { return mMinPrimScale;   }
         const S32&      getMaxLinkedPrims() const { return mMaxLinkedPrims; }
+        const S32&      getMaxPhysLinkedPrims() const { return mMaxPhysLinkedPrims; }
+        const F32&      getMaxInventoryItemsTransfer() const { return mMaxInventoryItemsTransfer; }
+        
 
         // Returns the max prim size we can use on a grid
+        F32             getMinPrimScale() const;
         F32             getMaxPrimScale() const;
 
+        F32  getMaxDragDistance() const;
+
+        F32             getMinPrimXPos() const;
+        F32             getMinPrimYPos() const;
+        F32             getMinPrimZPos() const;
+        F32             getMaxPrimXPos() const;
+        F32             getMaxPrimYPos() const;
+        F32             getMaxPrimZPos() const;
+
         void    setLimits();
 
         S32             mMaxAgentGroups;
@@ -27,6 +39,26 @@ public:
         F32             mMaxPrimScale;
         F32             mMinPrimScale;
         S32             mMaxLinkedPrims;
+        S32             mMaxPhysLinkedPrims;
+        F32             mMaxPrimXPos;
+        F32             mMaxPrimYPos;
+        F32             mMaxPrimZPos;
+        F32             mMinPrimXPos;
+        F32             mMinPrimYPos;
+        F32             mMinPrimZPos;
+
+        S32     mRenderName;
+
+        F32             mMaxInventoryItemsTransfer;
+        F32     mMaxDragDistance;
+
+        BOOL    skyUseClassicClouds;
+        BOOL    mAllowParcelWindLight;
+        BOOL    mAllowMinimap;
+        BOOL    mAllowPhysicalPrims;
+        BOOL    mEnableTeenMode;
+        BOOL    mEnforceMaxBuild;
+        BOOL    mRenderWater;
 
 private:
         void    setOpenSimLimits();
diff --git a/linden/indra/newview/kowopenregionsettings.cpp b/linden/indra/newview/kowopenregionsettings.cpp
index f568473..3cceb0c 100644
--- a/linden/indra/newview/kowopenregionsettings.cpp
+++ b/linden/indra/newview/kowopenregionsettings.cpp
@@ -30,6 +30,12 @@
 #include "hippoLimits.h"
 #include "llfloatertools.h"
 #include "llviewercontrol.h"
+#include "llagent.h"
+#include "llsurface.h"
+#include "llviewerregion.h"
+#include "llviewerobject.h"
+#include "llfloaterregioninfo.h"
+#include "llfloaterworldmap.h"
 
 //DEBUG includes
 //#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string
@@ -62,19 +68,20 @@ class OpenRegionInfoUpdate : public LLHTTPNode
 
                 if ( body.has("AllowMinimap") )
                 {
-                        //IMPLEMENT ME
+                        gHippoLimits->mAllowMinimap = body["AllowMinimap"].asInteger() == 1;
                 }
                 if ( body.has("AllowPhysicalPrims") )
                 {
-                        //IMPLEMENT ME
+                        gHippoLimits->mAllowPhysicalPrims = body["AllowPhysicalPrims"].asInteger() == 1;
+                        limitschanged = TRUE;
                 }
                 if ( body.has("DrawDistance") )
                 {
-                        //IMPLEMENT ME
+                        gAgent.mDrawDistance = body["DrawDistance"].asReal();
                 }
                 if ( body.has("ForceDrawDistance") )
                 {
-                        //IMPLEMENT ME
+                        gAgent.mLockedDrawDistance = body["ForceDrawDistance"].asInteger() == 1;
                 }
                 if ( body.has("LSLFunctions") )
                 {
@@ -82,19 +89,23 @@ class OpenRegionInfoUpdate : public LLHTTPNode
                 }
                 if ( body.has("MaxDragDistance") )
                 {
-                        //IMPLEMENT ME
+                        gHippoLimits->mMaxDragDistance = body["MaxDragDistance"].asReal();
                 }
                 if ( body.has("MinHoleSize") )
                 {
+                        //Note: does NOT update correctly
                         gHippoLimits->mMinHoleSize = body["MinHoleSize"].asReal();
+                        limitschanged = TRUE;
                 }
                 if ( body.has("MaxHollowSize") )
                 {
+                        //Note: does NOT update correctly
                         gHippoLimits->mMaxHollow = body["MaxHollowSize"].asReal();
+                        limitschanged = TRUE;
                 }
                 if ( body.has("MaxInventoryItemsTransfer") )
                 {
-                        //IMPLEMENT ME
+                        gHippoLimits->mMaxInventoryItemsTransfer = body["MaxInventoryItemsTransfer"].asReal();
                 }
                 if ( body.has("MaxLinkCount") )
                 {
@@ -102,22 +113,28 @@ class OpenRegionInfoUpdate : public LLHTTPNode
                 }
                 if ( body.has("MaxLinkCountPhys") )
                 {
-                        //IMPLEMENT ME
+                        gHippoLimits->mMaxPhysLinkedPrims = body["MaxLinkCountPhys"].asInteger();
                 }
-                if ( body.has("MaxPhysPrimScale") )
+                if ( body.has("MaxPos") )
                 {
-                        //IMPLEMENT ME
+                        gHippoLimits->mMaxPrimXPos = body["MaxPosX"].asReal();
+                        gHippoLimits->mMaxPrimYPos = body["MaxPosY"].asReal();
+                        gHippoLimits->mMaxPrimZPos = body["MaxPosZ"].asReal();
+                        limitschanged = TRUE;
                 }
-                if ( body.has("MaxPos") )
+                if ( body.has("MinPos") )
                 {
-                        //IMPLEMENT ME
+                        gHippoLimits->mMinPrimXPos = body["MinPosX"].asReal();
+                        gHippoLimits->mMinPrimYPos = body["MinPosY"].asReal();
+                        gHippoLimits->mMinPrimZPos = body["MinPosZ"].asReal();
+                        limitschanged = TRUE;
                 }
                 if ( body.has("MaxPrimScale") )
                 {
                         gHippoLimits->mMaxPrimScale = body["MaxPrimScale"].asReal();
                         limitschanged = TRUE;
                 }
-                if ( body.has("MinPos") )
+                if ( body.has("MaxPhysPrimScale") )
                 {
                         //IMPLEMENT ME
                 }
@@ -128,32 +145,69 @@ class OpenRegionInfoUpdate : public LLHTTPNode
                 }
                 if ( body.has("OffsetOfUTC") )
                 {
-                        //IMPLEMENT ME
+                        gSavedSettings.setS32("TimeOffset", body["OffsetOfUTC"].asReal());
+                        gSavedSettings.setBOOL("UseTimeOffset", true);
+                }
+                if ( body.has("OffsetOfUTCDST") )
+                {
+                        gSavedSettings.setBOOL("TimeOffsetDST", body["OffsetOfUTCDST"].asInteger() == 1 ? TRUE : FALSE);
                 }
                 if ( body.has("RenderWater") )
                 {
-                        gSavedSettings.setBOOL("RenderWater", body["RenderWater"].asBoolean());
+                        gHippoLimits->mRenderWater = body["RenderWater"].asInteger() == 1 ? TRUE : FALSE;
+                        gAgent.getRegion()->rebuildWater();
                 }
                 if ( body.has("SayDistance") )
                 {
-                        //IMPLEMENT ME
+                        gSavedSettings.setU32("ChatDistance", body["SayDistance"].asReal());
                 }
                 if ( body.has("ShoutDistance") )
                 {
                         //IMPLEMENT ME
                 }
+                if ( body.has("WhisperDistance") )
+                {
+                        //IMPLEMENT ME
+                }
                 if ( body.has("ToggleTeenMode") )
                 {
-                        gSavedSettings.setBOOL("ToggleTeenMode", body["ToggleTeenMode"].asBoolean());
-
+                        gHippoLimits->mEnableTeenMode = body["ToggleTeenMode"].asInteger() == 1 ? TRUE : FALSE;
                 }
-                if ( body.has("WhisperDistance") )
+                if ( body.has("SetTeenMode") )
                 {
-                        //IMPLEMENT ME
+                        gAgent.setTeen( body["SetTeenMode"].asInteger() == 1 ? TRUE : FALSE );
+                        LLFloaterWorldMap::reloadIcons(NULL);
+                        llinfos << "PG status set to " << (S32)gAgent.isTeen() << llendl;
+                }
+                if ( body.has("ShowTags") )
+                {
+                        gHippoLimits->mRenderName = body["ShowTags"].asReal();
+                }
+                if ( body.has("EnforceMaxBuild") )
+                {
+                        gHippoLimits->mEnforceMaxBuild = body["EnforceMaxBuild"].asInteger() == 1 ? TRUE : FALSE;
+                        limitschanged = TRUE;
+                }
+                if ( body.has("MaxGroups") )
+                {
+                        gHippoLimits->mMaxAgentGroups = body["MaxGroups"].asReal();
+                }
+                if ( body.has("AllowParcelWindLight") )
+                {
+                        gHippoLimits->mAllowParcelWindLight = body["AllowParcelWindLight"].asInteger() == 1;
                 }
 
                 if (limitschanged)
                         gFloaterTools->updateToolsSizeLimits();
+
+                //Update the floater if its around
+                LLPanelRegionOpenSettingsInfo* floater;
+                floater = LLFloaterRegionInfo::getPanelOpenSettings();
+
+                if(floater != NULL)
+                {
+                        floater->refreshFromRegion(gAgent.getRegion());
+                }
         }
 };
 
diff --git a/linden/indra/newview/linux_tools/getvoice.sh b/linden/indra/newview/linux_tools/getvoice.sh
deleted file mode 100755
index 13b632f..0000000
--- a/linden/indra/newview/linux_tools/getvoice.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-SCRIPTSRC=`readlink -f "$0" || echo "$0"`
-RUN_PATH=`dirname "${SCRIPTSRC}" || echo .`
-
-#if mozilla-runtime-linux-x86_64 is present we are using 64bit Imprudence on 64bit Linux
-if [ -d "${RUN_PATH}/app_settings/mozilla-runtime-linux-x86_64/" ]; then
-        LIB_INSTALLDIR="lib32/" # It's 32bit voice on 64bit Linux and 64bit viewer. Not using lib/ for avoiding ambiguity.
-else
-        LIB_INSTALLDIR="lib/" # It's 32bit voice on 32 or 64bit Linux and 32bit viewer.
-fi
-
-mkdir -p $LIB_INSTALLDIR
-wget http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2
-tar -C ./bin --strip-components 4 -xjf vivox-*.tar.bz2 --wildcards '*SLVoice'
-tar -C ./$LIB_INSTALLDIR --strip-components 4 -xjf vivox-*.tar.bz2 --wildcards '*.so*'
-rm vivox-*.tar.bz2
-
-#now we have Vivox' OpenAL, but we want Imprudence (32bit for voice) OpenAL which is way better:
-wget http://imprudenceviewer.org/download/libs/openal-linux32-20100426.tar.bz2
-tar -C ./$LIB_INSTALLDIR --strip-components 3 -xjf openal-*.tar.bz2 --wildcards '*openal.so*'
-rm openal-*.tar.bz2
-
-# For 64bit viewer on 64bit Linux we also need a 32bit libidn.so.11 and libuuid.so.1
-if [ -d ${RUN_PATH}/lib32/ ]; then
-        wget http://imprudenceviewer.org/download/libs/libidn20100312.tar.bz2
-        tar -C $LIB_INSTALLDIR --strip-components 1 -xjf  libidn*.tar.bz2 --wildcards '*.so*'
-        rm libidn*.tar.bz2
-
-        wget http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libuuid-linux-20090417.tar.bz2
-        tar -C ./$LIB_INSTALLDIR --strip-components 3 -xjf libuuid-*.tar.bz2 --wildcards '*.so*'
-        rm libuuid-*.tar.bz2
-fi
- 
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index eb5cf9b..de1fc84 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -36,7 +36,6 @@
 #include "stdenums.h"
 
 #include "llagent.h" 
-
 #include "llcamera.h"
 #include "llcoordframe.h"
 #include "indra_constants.h"
@@ -109,6 +108,7 @@
 #include "lltoolmgr.h"
 #include "lltoolpie.h"
 #include "lltoolview.h"
+#include "lltrans.h"
 #include "llui.h"                       // for make_ui_sound
 #include "llurldispatcher.h"
 #include "llviewercamera.h"
@@ -405,7 +405,17 @@ LLAgent::LLAgent() :
         mWearablesLoaded(FALSE),
         mTextureCacheQueryID(0),
         mAppearanceSerialNum(0),
-        mbTeleportKeepsLookAt(false)
+        mbTeleportKeepsLookAt(false),
+
+        mLureShow(FALSE),
+        mLureName(""),
+        mLurePosGlobal(),
+        mLureGlobalX(0),
+        mLureGlobalY(0),
+        mLureX(0),
+        mLureY(0),
+        mLureZ(0),
+        mLureMaturityString("")
 {
         U32 i;
         for (i = 0; i < TOTAL_CONTROLS; i++)
@@ -430,6 +440,7 @@ LLAgent::LLAgent() :
 void LLAgent::init()
 {
         mDrawDistance = gSavedSettings.getF32("RenderFarClip");
+        mLockedDrawDistance = FALSE;
 
         // *Note: this is where LLViewerCamera::getInstance() used to be constructed.
 
@@ -6015,6 +6026,14 @@ void LLAgent::setHomePosRegion( const U64& region_handle, const LLVector3& pos_r
         mHomePosRegion = pos_region;
 }
 
+void LLAgent::takeHomeScreenshot()
+{
+        std::string snap_filename = gDirUtilp->getLindenUserDir();
+        snap_filename += gDirUtilp->getDirDelimiter();
+        snap_filename += SCREEN_HOME_FILENAME;
+        gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, FALSE);
+}
+
 BOOL LLAgent::getHomePosGlobal( LLVector3d* pos_global )
 {
         if(!mHaveHomePosition)
@@ -8080,5 +8099,65 @@ LLVector3 LLAgent::getLastCoords()
         return mLastCoordinates;
 }
 
+void LLAgent::showLureDestination(const std::string fromname, const S32 global_x, const S32 global_y, const S32 x, const S32 y, const S32 z, const std::string maturity)
+{
+        const LLVector3d posglobal = LLVector3d(F64(global_x), F64(global_y), F64(0));
+        LLSimInfo* siminfo;
+        siminfo = LLWorldMap::getInstance()->simInfoFromPosGlobal(posglobal);
+        std::string sim_name;
+        LLWorldMap::getInstance()->simNameFromPosGlobal( posglobal, sim_name );
+
+        if (siminfo)
+        {
+                llinfos << fromname << "'s teleport lure is to " << sim_name.c_str() << " (" << maturity << ")" << llendl;
+                LLStringUtil::format_map_t args;
+                args["[NAME]"] = fromname;
+                args["[DESTINATION]"] = LLURLDispatcher::buildSLURL(sim_name.c_str(), S32(x), S32(y), S32(z));
+                std::string msg = LLTrans::getString("TeleportLureMaturity", args);
+                if (maturity != "")
+                {
+                        msg.append(llformat(" (%s)", maturity.c_str()));
+                }
+                LLChat chat(msg);
+                LLFloaterChat::addChat(chat);
+        }
+        else
+        {
+                mLureShow = TRUE;
+                mLureName = fromname;
+                mLurePosGlobal = posglobal;
+                mLureGlobalX = U16(global_x / 256);
+                mLureGlobalY = U16(global_y / 256);
+                mLureX = x;
+                mLureY = y;
+                mLureZ = z;
+                mLureMaturityString = maturity;
+                LLWorldMap::getInstance()->sendMapBlockRequest(mLureGlobalX, mLureGlobalY, mLureGlobalX, mLureGlobalY, true);
+        }
+}
+
+void LLAgent::onFoundLureDestination()
+{
+        mLureShow = FALSE;
+        LLSimInfo* siminfo;
+        siminfo = LLWorldMap::getInstance()->simInfoFromPosGlobal(mLurePosGlobal);
+        std::string sim_name;
+        LLWorldMap::getInstance()->simNameFromPosGlobal( mLurePosGlobal, sim_name );
+
+        if (siminfo && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)))
+        {
+                llinfos << mLureName << " is offering a TP to " << sim_name.c_str() << " (" << mLureMaturityString << ")" << llendl;
+                LLStringUtil::format_map_t args;
+                args["[NAME]"] = mLureName;
+                args["[DESTINATION]"] = LLURLDispatcher::buildSLURL(sim_name.c_str(), S32(mLureX), S32(mLureY), S32(mLureZ));
+                std::string msg = LLTrans::getString("TeleportOfferMaturity", args);
+                if (mLureMaturityString != "")
+                {
+                        msg.append(llformat(" (%s)", mLureMaturityString.c_str()));
+                }
+                LLChat chat(msg);
+                LLFloaterChat::addChat(chat);
+        }
+}
 
 // EOF
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 141c72c..fe50bf5 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -584,6 +584,7 @@ public:
         EPointAtType    getPointAtType();
 
         void                    setHomePosRegion( const U64& region_handle, const LLVector3& pos_region );
+        void                    takeHomeScreenshot();
         BOOL                    getHomePosGlobal( LLVector3d* pos_global );
         void                    setCameraAnimating( BOOL b )    { mCameraAnimating = b; }
         BOOL                    getCameraAnimating( )                   { return mCameraAnimating; }
@@ -742,6 +743,7 @@ public:
         LLUUID                  mSecureSessionID;                       // secure token for this login session
 
         F32                             mDrawDistance;
+        BOOL            mLockedDrawDistance;
 
         U64                             mGroupPowers;
         BOOL                    mHideGroupTitle;
@@ -782,6 +784,19 @@ public:
         LLFrameTimer mDoubleTapRunTimer;
         EDoubleTapRunMode mDoubleTapRunMode;
 
+        BOOL mLureShow;
+        std::string mLureName;
+        LLVector3d mLurePosGlobal;
+        U16 mLureGlobalX;
+        U16 mLureGlobalY;
+        S32 mLureX;
+        S32 mLureY;
+        S32 mLureZ;
+        std::string mLureMaturityString;
+
+        void showLureDestination(const std::string fromname, const S32 global_x, const S32 global_y, const S32 x, const S32 y, const S32 z, const std::string maturity);
+        void onFoundLureDestination();
+
 private:
         bool mbTeleportKeepsLookAt;
         bool mbAlwaysRun; // should the avatar run by default rather than walk
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 4485cdf..c53ced6 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -360,7 +360,7 @@ void request_initial_instant_messages()
         static BOOL requested = FALSE;
         if (!requested
                 && gMessageSystem
-                && LLMuteList::getInstance()->isLoaded()
+                //&& LLMuteList::getInstance()->isLoaded() //We don't always want to have a mute list module
                 && gAgent.getAvatarObject())
         {
                 // Auto-accepted inventory items may require the avatar object
diff --git a/linden/indra/newview/llassetuploadresponders.h b/linden/indra/newview/llassetuploadresponders.h
index c08f299..9102f6b 100644
--- a/linden/indra/newview/llassetuploadresponders.h
+++ b/linden/indra/newview/llassetuploadresponders.h
@@ -74,6 +74,7 @@ public:
 class LLBakedUploadData;
 class LLSendTexLayerResponder : public LLAssetUploadResponder
 {
+        LOG_CLASS(LLSendTexLayerResponder);
 public:
         LLSendTexLayerResponder(const LLSD& post_data,
                                                         const LLUUID& vfile_id,
diff --git a/linden/indra/newview/llcloud.cpp b/linden/indra/newview/llcloud.cpp
index 0099817..3e9b86a 100644
--- a/linden/indra/newview/llcloud.cpp
+++ b/linden/indra/newview/llcloud.cpp
@@ -38,6 +38,7 @@
 #include "v4math.h"
 #include "llquaternion.h"
 #include "v4color.h"
+#include "llviewercontrol.h"
 
 #include "llwind.h"
 #include "llcloud.h"
@@ -56,15 +57,6 @@
 
 extern LLPipeline gPipeline;
 
-const F32 CLOUD_UPDATE_RATE = 1.0f;  // Global time dilation for clouds
-const F32 CLOUD_GROW_RATE = 0.05f;
-const F32 CLOUD_DECAY_RATE = -0.05f;
-const F32 CLOUD_VELOCITY_SCALE = 0.01f;
-const F32 CLOUD_DENSITY = 25.f;
-const S32 CLOUD_COUNT_MAX = 20;
-const F32 CLOUD_HEIGHT_RANGE = 48.f;
-const F32 CLOUD_HEIGHT_MEAN = 192.f;
-
 enum
 {
         LL_PUFF_GROWING = 0,
@@ -80,7 +72,7 @@ S32 LLCloudPuff::sPuffCount = 0;
 
 LLCloudPuff::LLCloudPuff() :
         mAlpha(0.01f),
-        mRate(CLOUD_GROW_RATE*CLOUD_UPDATE_RATE),
+        mRate((gSavedSettings.getF32("CloudGrowRate")/100)*gSavedSettings.getF32("CloudUpdateRate")),
         mLifeState(LL_PUFF_GROWING)
 {
 }
@@ -121,7 +113,7 @@ void LLCloudGroup::updatePuffs(const F32 dt)
                 mVOCloudsp->setPositionRegion(mCenterRegion);
                 mVOCloudsp->setScale(LLVector3(256.f/CLOUD_GROUPS_PER_EDGE + CLOUD_PUFF_WIDTH,
                                                                                  256.f/CLOUD_GROUPS_PER_EDGE + CLOUD_PUFF_WIDTH,
-                                                                                 CLOUD_HEIGHT_RANGE + CLOUD_PUFF_HEIGHT)*0.5f);
+                                                                                 gSavedSettings.getF32("ClassicCloudRange") + CLOUD_PUFF_HEIGHT)*0.5f);
                 gPipeline.createObject(mVOCloudsp);
         }
 
@@ -132,7 +124,7 @@ void LLCloudGroup::updatePuffs(const F32 dt)
         {
                 LLCloudPuff &puff = mCloudPuffs[i];
                 velocity = mCloudLayerp->getRegion()->mWind.getCloudVelocity(mCloudLayerp->getRegion()->getPosRegionFromGlobal(puff.mPositionGlobal));
-                velocity *= CLOUD_VELOCITY_SCALE*CLOUD_UPDATE_RATE;
+                velocity *= (gSavedSettings.getF32("CloudVelocityScale")/100)*gSavedSettings.getF32("CloudUpdateRate");
                 vel_d.setVec(velocity);
                 mCloudPuffs[i].mPositionGlobal += vel_d;
                 mCloudPuffs[i].mAlpha += mCloudPuffs[i].mRate * dt;
@@ -163,7 +155,7 @@ void LLCloudGroup::updatePuffOwnership()
                 {
                         //llinfos << "Killing puff not in group" << llendl;
                         mCloudPuffs[i].setLifeState(LL_PUFF_DYING);
-                        mCloudPuffs[i].mRate = CLOUD_DECAY_RATE*CLOUD_UPDATE_RATE;
+                        mCloudPuffs[i].mRate = (gSavedSettings.getF32("CloudDecayRate")/100)*gSavedSettings.getF32("CloudUpdateRate");
                         i++;
                         continue;
                 }
@@ -185,9 +177,9 @@ void LLCloudGroup::updatePuffCount()
                 return;
         }
         S32 i;
-        S32 target_puff_count = llround(CLOUD_DENSITY * mDensity);
+        S32 target_puff_count = llround((S32)gSavedSettings.getF32("CloudDensity") * mDensity);
         target_puff_count = llmax(0, target_puff_count);
-        target_puff_count = llmin(CLOUD_COUNT_MAX, target_puff_count);
+        target_puff_count = llmin((S32)gSavedSettings.getF32("CloudCountMax"), target_puff_count);
         S32 current_puff_count = (S32) mCloudPuffs.size();
         // Create a new cloud if we need one
         if (current_puff_count < target_puff_count)
@@ -199,7 +191,7 @@ void LLCloudGroup::updatePuffCount()
                         puff_pos_global = mVOCloudsp->getPositionGlobal();
                         F32 x = ll_frand(256.f/CLOUD_GROUPS_PER_EDGE) - 128.f/CLOUD_GROUPS_PER_EDGE;
                         F32 y = ll_frand(256.f/CLOUD_GROUPS_PER_EDGE) - 128.f/CLOUD_GROUPS_PER_EDGE;
-                        F32 z = ll_frand(CLOUD_HEIGHT_RANGE) - 0.5f*CLOUD_HEIGHT_RANGE;
+                        F32 z = ll_frand(gSavedSettings.getF32("ClassicCloudRange")) - 0.5f*gSavedSettings.getF32("ClassicCloudRange");
                         puff_pos_global += LLVector3d(x, y, z);
                         mCloudPuffs[i].mPositionGlobal = puff_pos_global;
                         mCloudPuffs[i].mAlpha = 0.01f;
@@ -227,7 +219,7 @@ void LLCloudGroup::updatePuffCount()
                 {
                         //llinfos << "Killing extra live cloud" << llendl;
                         mCloudPuffs[i].setLifeState(LL_PUFF_DYING);
-                        mCloudPuffs[i].mRate = CLOUD_DECAY_RATE*CLOUD_UPDATE_RATE;
+                        mCloudPuffs[i].mRate = (gSavedSettings.getF32("CloudDecayRate")/100)*gSavedSettings.getF32("CloudUpdateRate");
                         new_dying_count--;
                 }
                 i++;
@@ -294,7 +286,7 @@ LLCloudLayer::LLCloudLayer()
                         x = (0.5f + j)*(256.f/CLOUD_GROUPS_PER_EDGE);
 
                         mCloudGroups[i][j].setCloudLayerp(this);
-                        mCloudGroups[i][j].setCenterRegion(LLVector3(x, y, CLOUD_HEIGHT_MEAN));
+                        mCloudGroups[i][j].setCenterRegion(LLVector3(x, y, gSavedSettings.getF32("ClassicCloudHeight")));
                 }
         }
 }
@@ -344,12 +336,10 @@ void LLCloudLayer::destroy()
         mWindp = NULL;
 }
 
-
 void LLCloudLayer::reset()
 {
 }
 
-
 void LLCloudLayer::setWindPointer(LLWind *windp)
 {
         if (mWindp)
diff --git a/linden/indra/newview/llfloaterenvsettings.cpp b/linden/indra/newview/llfloaterenvsettings.cpp
index 557a5e1..801ff49 100644
--- a/linden/indra/newview/llfloaterenvsettings.cpp
+++ b/linden/indra/newview/llfloaterenvsettings.cpp
@@ -47,6 +47,7 @@
 #include "llwaterparammanager.h"
 #include "llmath.h"
 #include "llviewerwindow.h"
+#include "wlfloatermanager.h"
 
 #include "pipeline.h"
 
@@ -87,7 +88,7 @@ void LLFloaterEnvSettings::initCallbacks(void)
         // WL Top
         childSetAction("EnvAdvancedSkyButton", onOpenAdvancedSky, NULL);
         childSetAction("EnvAdvancedWaterButton", onOpenAdvancedWater, NULL);
-        childSetAction("EnvSubmitWindlight", onSubmitWindlight, NULL);
+        childSetAction("EnvWLManager", onOpenWLManager, NULL);
         childSetAction("EnvUseEstateTimeButton", onUseEstateTime, NULL);
         childSetAction("EnvSettingsHelpButton", onClickHelp, this);
 }
@@ -285,6 +286,11 @@ void LLFloaterEnvSettings::onOpenAdvancedWater(void* userData)
         LLFloaterWater::show();
 }
 
+void LLFloaterEnvSettings::onOpenWLManager(void* userData)
+{
+        WLFloaterManager::show();
+}
+
 void LLFloaterEnvSettings::onSubmitWindlight(void* userData)
 {
         Meta7WindlightPacket * wl = new Meta7WindlightPacket();
diff --git a/linden/indra/newview/llfloaterenvsettings.h b/linden/indra/newview/llfloaterenvsettings.h
index 49bf4fd..8b44621 100644
--- a/linden/indra/newview/llfloaterenvsettings.h
+++ b/linden/indra/newview/llfloaterenvsettings.h
@@ -78,6 +78,9 @@ public:
         /// open the advanced water settings menu
         static void onOpenAdvancedWater(void* userData);
 
+        /// open the windlight manager floater
+        static void onOpenWLManager(void* userData);
+
         /// submit windlight settings to the estate
         static void onSubmitWindlight(void* userData);
 
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index c15678d..34b8dde 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -44,6 +44,7 @@
 #include "lluictrlfactory.h"
 #include "llfirstuse.h"
 #include "panelradar.h"
+#include "hippoLimits.h"
 
 
 // [RLVa:KB]
@@ -149,7 +150,7 @@ void LLFloaterMap::draw()
                         drawChild(mPanelRadar);
                 }
         }
-        else
+        else if (gHippoLimits->mAllowMinimap) //Check for if minimap is blocked
         {
                 setMouseOpaque(TRUE);
                 getDragHandle()->setMouseOpaque(TRUE);
@@ -215,7 +216,6 @@ void LLFloaterMap::setRadarButtonState( bool showing_radar )
         }
 }
 
-
 void LLFloaterMap::adjustLayout( bool expand )
 {
         S32 radar_height = mPanelRadar->getRect().getHeight();
diff --git a/linden/indra/newview/llfloatermessagebuilder.cpp b/linden/indra/newview/llfloatermessagebuilder.cpp
new file mode 100644
index 0000000..90c0f9e
--- /dev/null
+++ b/linden/indra/newview/llfloatermessagebuilder.cpp
@@ -0,0 +1,978 @@
+// <edit>
+#include "llviewerprecompiledheaders.h"
+#include "llfloatermessagebuilder.h"
+#include "lluictrlfactory.h"
+#include "llmessagetemplate.h"
+#include "llagent.h"
+#include "llchat.h"
+#include "llfloaterchat.h"
+#include "llviewerregion.h" // getHandle
+#include "llcombobox.h"
+#include "llselectmgr.h" // fill in stuff about selected object
+#include "llparcel.h"
+#include "llviewerparcelmgr.h" // same for parcel
+#include "llscrolllistctrl.h"
+#include "llworld.h"
+#include "lltemplatemessagebuilder.h"
+
+////////////////////////////////
+// LLNetListItem
+////////////////////////////////
+LLNetListItem::LLNetListItem(LLUUID id)
+:       mID(id),
+        mAutoName(TRUE),
+        mName("No name"),
+        mPreviousRegionName(""),
+        mCircuitData(NULL)
+{
+}
+
+////////////////////////////////
+// LLFloaterMessageBuilder
+////////////////////////////////
+std::list<LLNetListItem*> LLFloaterMessageBuilder::sNetListItems;
+
+LLFloaterMessageBuilder::LLFloaterMessageBuilder(std::string initial_text)
+:       LLFloater(),
+        LLEventTimer(1.0f),
+        mNetInfoMode(NI_NET),
+        mInitialText(initial_text)
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_message_builder.xml");
+}
+LLFloaterMessageBuilder::~LLFloaterMessageBuilder()
+{
+}
+void LLFloaterMessageBuilder::show(std::string initial_text)
+{
+        (new LLFloaterMessageBuilder(initial_text))->open();
+}
+BOOL LLFloaterMessageBuilder::tick()
+{
+        refreshNetList();
+        return FALSE;
+}
+LLNetListItem* LLFloaterMessageBuilder::findNetListItem(LLHost host)
+{
+        std::list<LLNetListItem*>::iterator end = sNetListItems.end();
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != end; ++iter)
+                if((*iter)->mCircuitData && (*iter)->mCircuitData->getHost() == host)
+                        return (*iter);
+        return NULL;
+}
+LLNetListItem* LLFloaterMessageBuilder::findNetListItem(LLUUID id)
+{
+        std::list<LLNetListItem*>::iterator end = sNetListItems.end();
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != end; ++iter)
+                if((*iter)->mID == id)
+                        return (*iter);
+        return NULL;
+}
+void LLFloaterMessageBuilder::refreshNetList()
+{
+        LLScrollListCtrl* scrollp = getChild<LLScrollListCtrl>("net_list");
+        // Update circuit data of net list items
+        std::vector<LLCircuitData*> circuits = gMessageSystem->getCircuit()->getCircuitDataList();
+        std::vector<LLCircuitData*>::iterator circuits_end = circuits.end();
+        for(std::vector<LLCircuitData*>::iterator iter = circuits.begin(); iter != circuits_end; ++iter)
+        {
+                LLNetListItem* itemp = findNetListItem((*iter)->getHost());
+                if(!itemp)
+                {
+                        LLUUID id; id.generate();
+                        itemp = new LLNetListItem(id);
+                        sNetListItems.push_back(itemp);
+                }
+                itemp->mCircuitData = (*iter);
+        }
+        // Clear circuit data of items whose circuits are gone
+        std::list<LLNetListItem*>::iterator items_end = sNetListItems.end();
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != items_end; ++iter)
+        {
+                if(std::find(circuits.begin(), circuits.end(), (*iter)->mCircuitData) == circuits.end())
+                        (*iter)->mCircuitData = NULL;
+        }
+        // Remove net list items that are totally useless now
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != sNetListItems.end();)
+        {
+                if((*iter)->mCircuitData == NULL)
+                        iter = sNetListItems.erase(iter);
+                else ++iter;
+        }
+        // Update names of net list items
+        items_end = sNetListItems.end();
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != items_end; ++iter)
+        {
+                LLNetListItem* itemp = (*iter);
+                if(itemp->mAutoName)
+                {
+                        if(itemp->mCircuitData)
+                        {
+                                LLViewerRegion* regionp = LLWorld::getInstance()->getRegion(itemp->mCircuitData->getHost());
+                                if(regionp)
+                                {
+                                        std::string name = regionp->getName();
+                                        if(name == "") name = llformat("%s (awaiting region name)", itemp->mCircuitData->getHost().getString().c_str());
+                                        itemp->mName = name;
+                                        itemp->mPreviousRegionName = name;
+                                }
+                                else
+                                {
+                                        itemp->mName = itemp->mCircuitData->getHost().getString();
+                                        if(itemp->mPreviousRegionName != "")
+                                                itemp->mName.append(llformat(" (was %s)", itemp->mPreviousRegionName.c_str()));
+                                }
+                        }
+                        else
+                        {
+                                // an item just for an event queue, not handled yet
+                                itemp->mName = "Something else";
+                        }
+                }
+        }
+        // Rebuild scroll list from scratch
+        LLUUID selected_id = scrollp->getFirstSelected() ? scrollp->getFirstSelected()->getUUID() : LLUUID::null;
+        S32 scroll_pos = scrollp->getScrollPos();
+        scrollp->clearRows();
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != items_end; ++iter)
+        {
+                LLNetListItem* itemp = (*iter);
+                LLSD element;
+                element["id"] = itemp->mID;
+                LLSD& text_column = element["columns"][0];
+                text_column["column"] = "text";
+                text_column["value"] = itemp->mName + (itemp->mCircuitData->getHost() == gAgent.getRegionHost() ? " (main)" : "");
+
+                LLSD& state_column = element["columns"][ 1];
+                state_column["column"] = "state";
+                state_column["value"] = "";
+
+                LLScrollListItem* scroll_itemp = scrollp->addElement(element);
+                BOOL has_live_circuit = itemp->mCircuitData && itemp->mCircuitData->isAlive();
+
+                LLScrollListText* state = (LLScrollListText*)scroll_itemp->getColumn(1);
+
+                if(has_live_circuit)
+                        state->setText(std::string("Alive"));
+                else
+                        state->setText(std::string("Alive"));
+        }
+        if(selected_id.notNull()) scrollp->selectByID(selected_id);
+        if(scroll_pos < scrollp->getItemCount()) scrollp->setScrollPos(scroll_pos);
+}
+BOOL LLFloaterMessageBuilder::postBuild()
+{
+        childSetText("message_edit", mInitialText);
+        childSetAction("send_btn", onClickSend, this);
+        std::vector<std::string> names;
+        LLComboBox* combo;
+        LLMessageSystem::message_template_name_map_t::iterator temp_end = gMessageSystem->mMessageTemplates.end();
+        LLMessageSystem::message_template_name_map_t::iterator temp_iter;
+        std::vector<std::string>::iterator names_end;
+        std::vector<std::string>::iterator names_iter;
+        for(temp_iter = gMessageSystem->mMessageTemplates.begin(); temp_iter != temp_end; ++temp_iter)
+                if((*temp_iter).second->getTrust() == MT_NOTRUST)
+                        names.push_back((*temp_iter).second->mName);
+        std::sort(names.begin(), names.end());
+        combo = getChild<LLComboBox>("untrusted_message_combo");
+        names_end = names.end();
+        for(names_iter = names.begin(); names_iter != names_end; ++names_iter)
+                combo->add((*names_iter));
+        names.clear();
+        for(temp_iter = gMessageSystem->mMessageTemplates.begin(); temp_iter != temp_end; ++temp_iter)
+                if((*temp_iter).second->getTrust() == MT_TRUST)
+                        names.push_back((*temp_iter).second->mName);
+        std::sort(names.begin(), names.end());
+        combo = getChild<LLComboBox>("trusted_message_combo");
+        names_end = names.end();
+        for(names_iter = names.begin(); names_iter != names_end; ++names_iter)
+                combo->add((*names_iter));
+        childSetCommitCallback("untrusted_message_combo", onCommitPacketCombo, this);
+        childSetCommitCallback("trusted_message_combo", onCommitPacketCombo, this);
+        return TRUE;
+}
+inline std::vector<std::string> split(std::string input, std::string separator)
+{
+        S32 size = input.length();
+        char* buffer = new char[size + 1];
+        strncpy(buffer, input.c_str(), size);
+        buffer[size] = '\0';
+        std::vector<std::string> lines;
+        char* result = strtok(buffer, separator.c_str());
+        while(result)
+        {
+                lines.push_back(result);
+                result = strtok(NULL, separator.c_str());
+        }
+        delete[] buffer;
+        return lines;
+}
+std::string mvtstr(e_message_variable_type var_type)
+{
+        switch(var_type)
+        {
+        case MVT_U8:
+                return "U8";
+                break;
+        case MVT_U16:
+                return "U16";
+                break;
+        case MVT_U32:
+                return "U32";
+                break;
+        case MVT_U64:
+                return "U64";
+                break;
+        case MVT_S8:
+                return "S8";
+                break;
+        case MVT_S16:
+                return "S16";
+                break;
+        case MVT_S32:
+                return "S32";
+                break;
+        case MVT_S64:
+                return "S64";
+                break;
+        case MVT_F32:
+                return "F32";
+                break;
+        case MVT_F64:
+                return "F64";
+                break;
+        case MVT_LLVector3:
+                return "LLVector3";
+                break;
+        case MVT_LLVector3d:
+                return "LLVector3d";
+                break;
+        case MVT_LLVector4:
+                return "LLVector4";
+                break;
+        case MVT_LLQuaternion:
+                return "LLQuaternion";
+                break;
+        case MVT_LLUUID:
+                return "LLUUID";
+                break;
+        case MVT_BOOL:
+                return "BOOL";
+                break;
+        case MVT_IP_ADDR:
+                return "IPADDR";
+                break;
+        case MVT_IP_PORT:
+                return "IPPORT";
+                break;
+        case MVT_VARIABLE:
+                return "Variable";
+                break;
+        case MVT_FIXED:
+                return "Fixed";
+                break;
+        default:
+                return "Missingno.";
+                break;
+        }
+}
+// static
+BOOL LLFloaterMessageBuilder::addField(e_message_variable_type var_type, const char* var_name, std::string input, BOOL hex)
+{
+        LLStringUtil::trim(input);
+        if(input.length() < 1 && var_type != MVT_VARIABLE)
+                return FALSE;
+        U8 valueU8;
+        U16 valueU16;
+        U32 valueU32;
+        U64 valueU64;
+        S8 valueS8;
+        S16 valueS16;
+        S32 valueS32;
+        // S64 valueS64;
+        F32 valueF32;
+        F64 valueF64;
+        LLVector3 valueVector3;
+        LLVector3d valueVector3d;
+        LLVector4 valueVector4;
+        LLQuaternion valueQuaternion;
+        LLUUID valueLLUUID;
+        BOOL valueBOOL;
+        std::string input_lower = input;
+        LLStringUtil::toLower(input_lower);
+        if(input_lower == "$agentid")
+                input = gAgent.getID().asString();
+        else if(input_lower == "$sessionid")
+                input = gAgent.getSessionID().asString();
+        else if(input_lower == "$uuid")
+        {
+                LLUUID id;
+                id.generate();
+                input = id.asString();
+        }
+        else if(input_lower == "$circuitcode")
+        {
+                std::stringstream temp_stream;
+                temp_stream << gMessageSystem->mOurCircuitCode;
+                input = temp_stream.str();
+        }
+        else if(input_lower == "$regionhandle")
+        {
+                std::stringstream temp_stream;
+                temp_stream << (gAgent.getRegion() ? gAgent.getRegion()->getHandle() : 0);
+                input = temp_stream.str();
+        }
+        else if(input_lower == "$position" || input_lower == "$pos")
+        {
+                std::stringstream temp_stream;
+                valueVector3 = gAgent.getPositionAgent();
+                temp_stream << "<" << valueVector3[0] << ", " << valueVector3[1] << ", " << valueVector3[2] << ">";
+                input = temp_stream.str();
+        }
+        if(hex)
+        {
+                if(var_type != MVT_VARIABLE && var_type != MVT_FIXED)
+                        return FALSE;
+                int len = input_lower.length();
+                const char* cstr = input_lower.c_str();
+                std::string new_input("");
+                BOOL nibble = FALSE;
+                char byte = 0;
+                for(int i = 0; i < len; i++)
+                {
+                        char c = cstr[i];
+                        if(c >= 0x30 && c <= 0x39)
+                                c -= 0x30;
+                        else if(c >= 0x61 && c <= 0x66)
+                                c -= 0x57;
+                        else if(c != 0x20)
+                                return FALSE;
+                        else
+                                continue;
+                        if(!nibble)
+                                byte = c << 4;
+                        else
+                                new_input.push_back(byte | c);
+                        nibble = !nibble;
+                }
+                if(nibble)
+                        return FALSE;
+                input = new_input;
+        }
+        std::stringstream stream(input);
+        std::vector<std::string> tokens;
+        switch(var_type)
+        {
+        case MVT_U8:
+                if(input.substr(0, 1) == "-")
+                        return FALSE;
+                if((stream >> valueU32).fail())
+                        return FALSE;
+                valueU8 = (U8)valueU32;
+                gMessageSystem->addU8(var_name, valueU8);
+                return TRUE;
+                break;
+        case MVT_U16:
+                if(input.substr(0, 1) == "-")
+                        return FALSE;
+                if((stream >> valueU16).fail())
+                        return FALSE;
+                gMessageSystem->addU16(var_name, valueU16);
+                return TRUE;
+                break;
+        case MVT_U32:
+                if(input.substr(0, 1) == "-")
+                        return FALSE;
+                if((stream >> valueU32).fail())
+                        return FALSE;
+                gMessageSystem->addU32(var_name, valueU32);
+                return TRUE;
+                break;
+        case MVT_U64:
+                if(input.substr(0, 1) == "-")
+                        return FALSE;
+                if((stream >> valueU64).fail())
+                        return FALSE;
+                gMessageSystem->addU64(var_name, valueU64);
+                return TRUE;
+                break;
+        case MVT_S8:
+                if((stream >> valueS8).fail())
+                        return FALSE;
+                gMessageSystem->addS8(var_name, valueS8);
+                return TRUE;
+                break;
+        case MVT_S16:
+                if((stream >> valueS16).fail())
+                        return FALSE;
+                gMessageSystem->addS16(var_name, valueS16);
+                return TRUE;
+                break;
+        case MVT_S32:
+                if((stream >> valueS32).fail())
+                        return FALSE;
+                gMessageSystem->addS32(var_name, valueS32);
+                return TRUE;
+                break;
+        /*
+        case MVT_S64:
+                if((stream >> valueS64).fail())
+                        return FALSE;
+                gMessageSystem->addS64(var_name, valueS64);
+                return TRUE;
+                break;
+        */
+        case MVT_F32:
+                if((stream >> valueF32).fail())
+                        return FALSE;
+                gMessageSystem->addF32(var_name, valueF32);
+                return TRUE;
+                break;
+        case MVT_F64:
+                if((stream >> valueF64).fail())
+                        return FALSE;
+                gMessageSystem->addF64(var_name, valueF64);
+                return TRUE;
+                break;
+        case MVT_LLVector3:
+                LLStringUtil::trim(input);
+                if(input.substr(0, 1) != "<" || input.substr(input.length() - 1, 1) != ">")
+                        return FALSE;
+                tokens = split(input.substr(1, input.length() - 2), ",");
+                if(tokens.size() != 3)
+                        return FALSE;
+                for(int i = 0; i < 3; i++)
+                {
+                        stream.clear();
+                        stream.str(tokens[i]);
+                        if((stream >> valueF32).fail())
+                                return FALSE;
+                        valueVector3.mV[i] = valueF32;
+                }
+                gMessageSystem->addVector3(var_name, valueVector3);
+                return TRUE;
+                break;
+        case MVT_LLVector3d:
+                LLStringUtil::trim(input);
+                if(input.substr(0, 1) != "<" || input.substr(input.length() - 1, 1) != ">")
+                        return FALSE;
+                tokens = split(input.substr(1, input.length() - 2), ",");
+                if(tokens.size() != 3)
+                        return FALSE;
+                for(int i = 0; i < 3; i++)
+                {
+                        stream.clear();
+                        stream.str(tokens[i]);
+                        if((stream >> valueF64).fail())
+                                return FALSE;
+                        valueVector3d.mdV[i] = valueF64;
+                }
+                gMessageSystem->addVector3d(var_name, valueVector3d);
+                return TRUE;
+                break;
+        case MVT_LLVector4:
+                LLStringUtil::trim(input);
+                if(input.substr(0, 1) != "<" || input.substr(input.length() - 1, 1) != ">")
+                        return FALSE;
+                tokens = split(input.substr(1, input.length() - 2), ",");
+                if(tokens.size() != 4)
+                        return FALSE;
+                for(int i = 0; i < 4; i++)
+                {
+                        stream.clear();
+                        stream.str(tokens[i]);
+                        if((stream >> valueF32).fail())
+                                return FALSE;
+                        valueVector4.mV[i] = valueF32;
+                }
+                gMessageSystem->addVector4(var_name, valueVector4);
+                return TRUE;
+                break;
+        case MVT_LLQuaternion:
+                LLStringUtil::trim(input);
+                if(input.substr(0, 1) != "<" || input.substr(input.length() - 1, 1) != ">")
+                        return FALSE;
+                tokens = split(input.substr(1, input.length() - 2), ",");
+                if(tokens.size() != 3)
+                        return FALSE;
+                for(int i = 0; i < 3; i++)
+                {
+                        stream.clear();
+                        stream.str(tokens[i]);
+                        if((stream >> valueF32).fail())
+                                return FALSE;
+                        valueVector3.mV[i] = valueF32;
+                }
+                valueQuaternion.unpackFromVector3(valueVector3);
+                gMessageSystem->addQuat(var_name, valueQuaternion);
+                return TRUE;
+                break;
+        case MVT_LLUUID:
+                if((stream >> valueLLUUID).fail())
+                        return FALSE;
+                gMessageSystem->addUUID(var_name, valueLLUUID);
+                return TRUE;
+                break;
+        case MVT_BOOL:
+                if(input_lower == "true")
+                        valueBOOL = TRUE;
+                else if(input_lower == "false")
+                        valueBOOL = FALSE;
+                else if((stream >> valueBOOL).fail())
+                        return FALSE;
+                //gMessageSystem->addBOOL(var_name, valueBOOL);
+                gMessageSystem->addU8(var_name, (U8)valueBOOL);
+                return TRUE;
+                break;
+        case MVT_IP_ADDR:
+                if((stream >> valueU32).fail())
+                        return FALSE;
+                gMessageSystem->addIPAddr(var_name, valueU32);
+                return TRUE;
+                break;
+        case MVT_IP_PORT:
+                if((stream >> valueU16).fail())
+                        return FALSE;
+                gMessageSystem->addIPPort(var_name, valueU16);
+                return TRUE;
+                break;
+        case MVT_VARIABLE:
+                if(!hex)
+                {
+                        char* buffer = new char[input.size() + 1];
+                        strncpy(buffer, input.c_str(), input.size());
+                        buffer[input.size()] = '\0';
+                        gMessageSystem->addBinaryData(var_name, buffer, input.size() + 1);
+                        delete[] buffer;
+                }
+                else
+                        gMessageSystem->addBinaryData(var_name, input.c_str(), input.size());
+                return TRUE;
+                break;
+        case MVT_FIXED:
+                if(!hex)
+                {
+                        char* buffer = new char[input.size() + 1];
+                        strncpy(buffer, input.c_str(), input.size());
+                        buffer[input.size()] = '\0';
+                        gMessageSystem->addBinaryData(var_name, buffer, input.size());
+                        delete[] buffer;
+                }
+                else
+                        gMessageSystem->addBinaryData(var_name, input.c_str(), input.size());
+                return TRUE;
+                break;
+        default:
+                break;
+        }
+        return FALSE;
+}
+// static
+void LLFloaterMessageBuilder::onCommitPacketCombo(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterMessageBuilder* floaterp = (LLFloaterMessageBuilder*)user_data;
+        LLViewerObject* selected_objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+        LLParcel* agent_parcelp = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        std::string message = ctrl->getValue();
+        std::map<const char *, LLMessageTemplate*>::iterator template_iter;
+        template_iter = gMessageSystem->mMessageTemplates.find( LLMessageStringTable::getInstance()->getString(message.c_str()) );
+        if(template_iter == gMessageSystem->mMessageTemplates.end())
+        {
+                floaterp->childSetText("message_edit", std::string(""));
+                return;
+        }
+        std::string text(llformat((*template_iter).second->getTrust() == MT_NOTRUST ? "out %s\n" : "in %s\n", message.c_str()));
+        LLMessageTemplate* temp = (*template_iter).second;
+        LLMessageTemplate::message_block_map_t::iterator blocks_end = temp->mMemberBlocks.end();
+        for (LLMessageTemplate::message_block_map_t::iterator blocks_iter = temp->mMemberBlocks.begin();
+                 blocks_iter != blocks_end; ++blocks_iter)
+        {
+                LLMessageBlock* block = (*blocks_iter);
+                const char* block_name = block->mName;
+                std::string block_name_string = std::string(block_name);
+                S32 num_blocks = 1;
+                if(block->mType == MBT_MULTIPLE)
+                        num_blocks = block->mNumber;
+                else if(("ObjectLink" == message && "ObjectData" == block_name_string))
+                        num_blocks = 2;
+                for(S32 i = 0; i < num_blocks; i++)
+                {
+                        text.append(llformat("[%s]\n", block_name));
+                        LLMessageBlock::message_variable_map_t::iterator var_end = block->mMemberVariables.end();
+                        for (LLMessageBlock::message_variable_map_t::iterator var_iter = block->mMemberVariables.begin();
+                                 var_iter != var_end; ++var_iter)
+                        {
+                                LLMessageVariable* variable = (*var_iter);
+                                const char* var_name = variable->getName();
+                                std::string var_name_string = std::string(var_name);
+                                text.append(llformat("%s = ", var_name));
+                                std::string value("");
+                                S32 size = variable->getSize();
+                                switch(variable->getType())
+                                {
+                                case MVT_U8:
+                                case MVT_U16:
+                                case MVT_U32:
+                                case MVT_U64:
+                                case MVT_S8:
+                                case MVT_S16:
+                                case MVT_S32:
+                                case MVT_IP_ADDR:
+                                case MVT_IP_PORT:
+                                        if("RegionHandle" == var_name_string || "Handle" == var_name_string)
+                                                value = "$RegionHandle";
+                                        else if("CircuitCode" == var_name_string || "ViewerCircuitCode" == var_name_string
+                                                || ("Code" == var_name_string && "CircuitCode" == block_name_string) )
+                                        {
+                                                value = "$CircuitCode";
+                                        }
+                                        else if(selected_objectp && 
+                                                        (
+                                                                   "ObjectLocalID" == var_name_string
+                                                                || "TaskLocalID" == var_name_string
+                                                                || ("LocalID" == var_name_string && 
+                                                                                (
+                                                                                           "ObjectData" == block_name_string
+                                                                                        || "UpdateData" == block_name_string
+                                                                                        || "InventoryData" == block_name_string
+                                                                                )
+                                                                        )
+                                                        )
+                                                )
+                                        {
+                                                std::stringstream temp_stream;
+                                                temp_stream << selected_objectp->getLocalID();
+                                                value = temp_stream.str();
+                                        }
+                                        else if( agent_parcelp &&
+                                                "LocalID" == var_name_string &&
+                                                (
+                                                        "ParcelData" == block_name_string
+                                                        || message.find("Parcel") != message.npos
+                                                )
+                                        )
+                                        {
+                                                std::stringstream temp_stream;
+                                                temp_stream << agent_parcelp->getLocalID();
+                                                value = temp_stream.str();
+                                        }
+                                        else if("PCode" == var_name_string)
+                                                value = "9";
+                                        else if("PathCurve" == var_name_string)
+                                                value = "16";
+                                        else if("ProfileCurve" == var_name_string)
+                                                value = "1";
+                                        else if("PathScaleX" == var_name_string || "PathScaleY" == var_name_string)
+                                                value = "100";
+                                        else if("BypassRaycast" == var_name_string)
+                                                value = "1";
+                                        else
+                                                value = "0";
+                                        break;
+                                case MVT_F32:
+                                case MVT_F64:
+                                        value = "0.0";
+                                        break;
+                                case MVT_LLVector3:
+                                case MVT_LLVector3d:
+                                case MVT_LLQuaternion:
+                                        if("Position" == var_name_string || "RayStart" == var_name_string || "RayEnd" == var_name_string)
+                                                value = "$Position";
+                                        else if("Scale" == var_name_string)
+                                                value = "<0.5, 0.5, 0.5>";
+                                        else
+                                                value = "<0, 0, 0>";
+                                        break;
+                                case MVT_LLVector4:
+                                        value = "<0, 0, 0, 0>";
+                                        break;
+                                case MVT_LLUUID:
+                                        if("AgentID" == var_name_string)
+                                                value = "$AgentID";
+                                        else if("SessionID" == var_name_string)
+                                                value = "$SessionID";
+                                        else if("ObjectID" == var_name_string && selected_objectp)
+                                                value = selected_objectp->getID().asString();
+                                        else if("ParcelID" == var_name_string && agent_parcelp)
+                                                value = agent_parcelp->getID().asString();
+                                        else
+                                                value = "00000000-0000-0000-0000-000000000000";
+                                        break;
+                                case MVT_BOOL:
+                                        value = "false";
+                                        break;
+                                case MVT_VARIABLE:
+                                        value = "Hello, world!";
+                                        break;
+                                case MVT_FIXED:
+                                        for(S32 si = 0; si < size; si++)
+                                                //value.append(std::string("0123456789abcdef").substr(si & 0xf, 1));
+                                                value.append("a");
+                                        break;
+                                default:
+                                        value = "";
+                                        break;
+                                }
+                                text.append(llformat("%s\n", value.c_str()));
+                        }
+                }
+        }
+        text = text.substr(0, text.length() - 1);
+        floaterp->childSetText("message_edit", text);
+}
+// static
+void LLFloaterMessageBuilder::onClickSend(void* user_data)
+{
+        LLFloaterMessageBuilder* floaterp = (LLFloaterMessageBuilder*)user_data;
+        std::vector<std::string> lines = split(floaterp->childGetText("message_edit"), "\n");
+        if(!lines.size())
+        {
+                LLFloaterChat::addChat(LLChat("Not enough information :O"));
+                return;
+        }
+        std::vector<std::string> tokens = split(lines[0], " ");
+        if(!tokens.size())
+        {
+                LLFloaterChat::addChat(LLChat("Not enough information :O"));
+                return;
+        }
+        std::string dir_str = tokens[0];
+        LLStringUtil::toLower(dir_str);
+        // Direction
+        BOOL outgoing;
+        if(dir_str == "out")
+                outgoing = TRUE;
+        else if(dir_str == "in")
+                outgoing = FALSE;
+        else
+        {
+                LLFloaterChat::addChat(LLChat("Expected direction 'in' or 'out'"));
+                return;
+        }
+        // Message
+        std::string message = "Invalid";
+        if(tokens.size() > 1)
+        {
+                if(tokens.size() > 2)
+                {
+                        LLFloaterChat::addChat(LLChat("Unexpected extra stuff at the top"));
+                        return;
+                }
+                message = tokens[1];
+                LLStringUtil::trim(message);
+        }
+        // Body
+        std::vector<parts_block> parts;
+        if(lines.size() > 1)
+        {
+                std::vector<std::string>::iterator line_end = lines.end();
+                std::vector<std::string>::iterator line_iter = lines.begin();
+                ++line_iter;
+                std::string current_block("");
+                int current_block_index = -1;
+                for( ; line_iter != line_end; ++line_iter)
+                {
+                        std::string line = (*line_iter);
+                        LLStringUtil::trim(line);
+                        if(!line.length())
+                                continue;
+                        if(line.substr(0, 1) == "[" && line.substr(line.size() - 1, 1) == "]")
+                        {
+                                current_block = line.substr(1, line.length() - 2);
+                                LLStringUtil::trim(current_block);
+                                ++current_block_index;
+                                parts_block pb;
+                                pb.name = current_block;
+                                parts.push_back(pb);
+                        }
+                        else
+                        {
+                                if(current_block.empty())
+                                {
+                                        LLFloaterChat::addChat(LLChat("Unexpected field when no block yet"));
+                                        return;
+                                }
+                                int eqpos = line.find("=");
+                                if(eqpos == line.npos)
+                                {
+                                        LLFloaterChat::addChat(LLChat("Missing an equal sign"));
+                                        return;
+                                }
+                                std::string field = line.substr(0, eqpos);
+                                LLStringUtil::trim(field);
+                                if(!field.length())
+                                {
+                                        LLFloaterChat::addChat(LLChat("Missing name of field"));
+                                        return;
+                                }
+                                std::string value = line.substr(eqpos + 1);
+                                LLStringUtil::trim(value);
+                                parts_var pv;
+                                if(value.substr(0, 1) == "|")
+                                {
+                                        pv.hex = TRUE;
+                                        value = value.substr(1);
+                                        LLStringUtil::trim(value);
+                                }
+                                else
+                                        pv.hex = FALSE;
+                                pv.name = field;
+                                pv.value = value;
+                                parts[current_block_index].vars.push_back(pv);
+                        }
+                }
+        }
+        // Verification
+        std::map<const char *, LLMessageTemplate*>::iterator template_iter;
+        template_iter = gMessageSystem->mMessageTemplates.find( LLMessageStringTable::getInstance()->getString(message.c_str()) );
+        if(template_iter == gMessageSystem->mMessageTemplates.end())
+        {
+                LLFloaterChat::addChat(LLChat(llformat("Don't know how to build a '%s' message", message.c_str())));
+                return;
+        }
+        LLMessageTemplate* temp = (*template_iter).second;
+        std::vector<parts_block>::iterator parts_end = parts.end();
+        std::vector<parts_block>::iterator parts_iter = parts.begin();
+        LLMessageTemplate::message_block_map_t::iterator blocks_end = temp->mMemberBlocks.end();
+        for (LLMessageTemplate::message_block_map_t::iterator blocks_iter = temp->mMemberBlocks.begin();
+                 blocks_iter != blocks_end; )
+        {
+                LLMessageBlock* block = (*blocks_iter);
+                const char* block_name = block->mName;
+                if(parts_iter == parts_end)
+                {
+                        if(block->mType != MBT_VARIABLE)
+                                LLFloaterChat::addChat(LLChat(llformat("Expected '%s' block", block_name)));
+                        else
+                        {
+                                ++blocks_iter;
+                                continue;
+                        }
+                        return;
+                }
+                else if((*parts_iter).name != block_name)
+                {
+                        if(block->mType != MBT_VARIABLE)
+                                LLFloaterChat::addChat(LLChat(llformat("Expected '%s' block", block_name)));
+                        else
+                        {
+                                ++blocks_iter;
+                                continue;
+                        }
+                        return;
+                }
+                std::vector<parts_var>::iterator part_var_end = (*parts_iter).vars.end();
+                std::vector<parts_var>::iterator part_var_iter = (*parts_iter).vars.begin();
+                LLMessageBlock::message_variable_map_t::iterator var_end = block->mMemberVariables.end();
+                for (LLMessageBlock::message_variable_map_t::iterator var_iter = block->mMemberVariables.begin();
+                         var_iter != var_end; ++var_iter)
+                {
+                        LLMessageVariable* variable = (*var_iter);
+                        const char* var_name = variable->getName();
+                        if(part_var_iter == part_var_end)
+                        {
+                                LLFloaterChat::addChat(LLChat(llformat("Expected '%s' field under '%s' block", var_name, block_name)));
+                                return;
+                        }
+                        else if((*part_var_iter).name != var_name)
+                        {
+                                LLFloaterChat::addChat(LLChat(llformat("Expected '%s' field under '%s' block", var_name, block_name)));
+                                return;
+                        }
+                        (*part_var_iter).var_type = variable->getType();
+                        ++part_var_iter;
+                }
+                if(part_var_iter != part_var_end)
+                {
+                        LLFloaterChat::addChat(LLChat(llformat("Unexpected field(s) at end of '%s' block", block_name)));
+                        return;
+                }
+                ++parts_iter;
+                // test
+                if((block->mType != MBT_SINGLE) && (parts_iter != parts_end) && ((*parts_iter).name == block_name))
+                {
+                        // block will repeat
+                }
+                else ++blocks_iter;
+        }
+        if(parts_iter != parts_end)
+        {
+                LLFloaterChat::addChat(LLChat("Unexpected block(s) at end"));
+                return;
+        }
+        // Build and send
+        gMessageSystem->newMessage( message.c_str() );
+        for(parts_iter = parts.begin(); parts_iter != parts_end; ++parts_iter)
+        {
+                const char* block_name = (*parts_iter).name.c_str();
+                gMessageSystem->nextBlock(block_name);
+                std::vector<parts_var>::iterator part_var_end = (*parts_iter).vars.end();
+                for(std::vector<parts_var>::iterator part_var_iter = (*parts_iter).vars.begin();
+                        part_var_iter != part_var_end; ++part_var_iter)
+                {
+                        parts_var pv = (*part_var_iter);
+                        if(!addField(pv.var_type, pv.name.c_str(), pv.value, pv.hex))
+                        {
+                                LLFloaterChat::addChat(LLChat(llformat("Error adding the provided data for %s '%s' to '%s' block", mvtstr(pv.var_type).c_str(), pv.name.c_str(), block_name)));
+                                gMessageSystem->clearMessage();
+                                return;
+                        }
+                }
+        }
+
+        LLScrollListCtrl* scrollp = floaterp->getChild<LLScrollListCtrl>("net_list");
+        LLScrollListItem* selected_itemp = scrollp->getFirstSelected();
+
+        //if a specific circuit is selected, send it to that, otherwise send it to the current sim
+        if(selected_itemp)
+        {
+                LLNetListItem* itemp = findNetListItem(selected_itemp->getUUID());
+                LLScrollListText* textColumn = (LLScrollListText*)selected_itemp->getColumn(1);
+
+                //why would you send data through a dead circuit?
+                if(textColumn->getValue().asString() == "Dead")
+                {
+                        LLFloaterChat::addChat(LLChat("No sending messages through dead circuits!"));
+                        return;
+                }
+                if(outgoing)
+                {
+                        gMessageSystem->sendMessage(itemp->mCircuitData->getHost());
+                } else {
+                        U8 builtMessageBuffer[MAX_BUFFER_SIZE];
+
+                        S32 message_size = gMessageSystem->mTemplateMessageBuilder->buildMessage(builtMessageBuffer, MAX_BUFFER_SIZE, 0);
+                        gMessageSystem->clearMessage();
+                        gMessageSystem->checkMessages(0, true, builtMessageBuffer, itemp->mCircuitData->getHost(), message_size);
+
+                }
+        } else {
+                if(outgoing)
+                {
+                        gMessageSystem->sendMessage(gAgent.getRegionHost());
+                } else {
+                        U8 builtMessageBuffer[MAX_BUFFER_SIZE];
+
+                        S32 message_size = gMessageSystem->mTemplateMessageBuilder->buildMessage(builtMessageBuffer, MAX_BUFFER_SIZE, 0);
+                        gMessageSystem->clearMessage();
+                        gMessageSystem->checkMessages(0, true, builtMessageBuffer, gAgent.getRegionHost(), message_size);
+
+                }
+        }
+}
+
+BOOL LLFloaterMessageBuilder::handleKeyHere(KEY key, MASK mask)
+{
+        if(key == KEY_RETURN && (mask & MASK_CONTROL))
+        {
+                onClickSend(this);
+                return TRUE;
+        }
+        if(key == KEY_ESCAPE)
+        {
+                releaseFocus();
+                return TRUE;
+        }
+        return FALSE;
+}
+// </edit>
diff --git a/linden/indra/newview/llfloatermessagebuilder.h b/linden/indra/newview/llfloatermessagebuilder.h
new file mode 100644
index 0000000..5dc9b42
--- /dev/null
+++ b/linden/indra/newview/llfloatermessagebuilder.h
@@ -0,0 +1,55 @@
+// <edit>]
+#ifndef LL_LLFLOATERMESSAGEBUILDER_H
+#define LL_LLFLOATERMESSAGEBUILDER_H
+#include "llfloater.h"
+#include "lltemplatemessagereader.h"
+#include "llmessagelog.h"
+
+class LLNetListItem
+{
+public:
+        LLNetListItem(LLUUID id);
+        LLUUID mID;
+        BOOL mAutoName;
+        std::string mName;
+        std::string mPreviousRegionName;
+        LLCircuitData* mCircuitData;
+};
+
+class LLFloaterMessageBuilder : public LLFloater, public LLEventTimer
+{
+public:
+        LLFloaterMessageBuilder(std::string initial_text);
+        ~LLFloaterMessageBuilder();
+        static void show(std::string initial_text);
+        static std::list<LLNetListItem*> sNetListItems;
+        BOOL postBuild();
+        BOOL tick();
+        static BOOL addField(e_message_variable_type var_type, const char* var_name, std::string input, BOOL hex);
+        static void onClickSend(void* user_data);
+        static void onCommitPacketCombo(LLUICtrl* ctrl, void* user_data);
+        static LLFloaterMessageBuilder* sInstance;
+        BOOL handleKeyHere(KEY key, MASK mask);
+        std::string mInitialText;
+        struct parts_var
+        {
+                std::string name;
+                std::string value;
+                BOOL hex;
+                e_message_variable_type var_type;
+        };
+        struct parts_block
+        {
+                std::string name;
+                std::vector<parts_var> vars;
+        };
+        static LLNetListItem* findNetListItem(LLHost host);
+        static LLNetListItem* findNetListItem(LLUUID id);
+        void refreshNetList();
+        enum ENetInfoMode { NI_NET, NI_LOG };
+        ENetInfoMode mNetInfoMode;
+        static void onCommitMessageLog(LLUICtrl* ctrl, void* user_data);
+        static void onCommitFilter(LLUICtrl* ctrl, void* user_data);
+};
+#endif
+// </edit>
diff --git a/linden/indra/newview/llfloatermessagelog.cpp b/linden/indra/newview/llfloatermessagelog.cpp
new file mode 100644
index 0000000..161779b
--- /dev/null
+++ b/linden/indra/newview/llfloatermessagelog.cpp
@@ -0,0 +1,962 @@
+// <edit>
+#include "llviewerprecompiledheaders.h"
+#include "llfloatermessagelog.h"
+#include "lluictrlfactory.h"
+#include "llworld.h"
+#include "llviewerregion.h"
+#include "llscrolllistctrl.h"
+#include "lltexteditor.h"
+#include "llviewerwindow.h" // alertXml
+#include "llmessagetemplate.h"
+#include <boost/tokenizer.hpp>
+#include "llmenugl.h"
+#include "llfloatermessagebuilder.h"
+#include "llagent.h"
+////////////////////////////////
+// LLFloaterMessageLogItem
+////////////////////////////////
+#define MAX_PACKET_LEN (0x2000)
+LLTemplateMessageReader* LLFloaterMessageLogItem::sTemplateMessageReader = NULL;
+LLFloaterMessageLogItem::LLFloaterMessageLogItem(LLMessageLogEntry entry)
+:       LLMessageLogEntry(entry.mType, entry.mFromHost, entry.mToHost, entry.mData, entry.mDataSize)
+{
+        if(!sTemplateMessageReader)
+        {
+                sTemplateMessageReader = new LLTemplateMessageReader(gMessageSystem->mMessageNumbers);
+        }
+        mID.generate();
+        mSequenceID = 0;
+        if(mType == TEMPLATE)
+        {
+                BOOL decode_invalid = FALSE;
+                S32 decode_len = mDataSize;
+                std::vector<U8> DecodeBuffer(MAX_PACKET_LEN,0);
+                memcpy(&(DecodeBuffer[0]),&(mData[0]),decode_len);
+                U8* decodep = &(DecodeBuffer[0]);
+                mFlags = DecodeBuffer[0];
+                gMessageSystem->zeroCodeExpand(&decodep, &decode_len);
+                if(decode_len < 7)
+                        decode_invalid = TRUE;
+                else
+                {
+                        mSequenceID = ntohl(*((U32*)(&decodep[1])));
+                        sTemplateMessageReader->clearMessage();
+                        if(!sTemplateMessageReader->validateMessage(decodep, decode_len, mFromHost, TRUE))
+                                decode_invalid = TRUE;
+                        else
+                        {
+                                if(!sTemplateMessageReader->decodeData(decodep, mFromHost, TRUE))
+                                        decode_invalid = TRUE;
+                                else
+                                {
+                                        LLMessageTemplate* temp = sTemplateMessageReader->getTemplate();
+                                        mName = temp->mName;
+                                        mSummary = "";
+                                        
+                                        if(mFlags)
+                                        {
+                                                mSummary.append(" [ ");
+                                                if(mFlags & LL_ZERO_CODE_FLAG)
+                                                        mSummary.append(" Zer ");
+                                                if(mFlags & LL_RELIABLE_FLAG)
+                                                        mSummary.append(" Rel ");
+                                                if(mFlags & LL_RESENT_FLAG)
+                                                        mSummary.append(" Rsd ");
+                                                if(mFlags & LL_ACK_FLAG)
+                                                        mSummary.append(" Ack ");
+                                                mSummary.append(" ] ");
+                                        }
+                                        
+                                        LLMessageTemplate::message_block_map_t::iterator blocks_end = temp->mMemberBlocks.end();
+                                        for (LLMessageTemplate::message_block_map_t::iterator blocks_iter = temp->mMemberBlocks.begin();
+                                                 blocks_iter != blocks_end; ++blocks_iter)
+                                        {
+                                                LLMessageBlock* block = (*blocks_iter);
+                                                const char* block_name = block->mName;
+                                                S32 num_blocks = sTemplateMessageReader->getNumberOfBlocks(block_name);
+                                                if(!num_blocks)
+                                                        mSummary.append(" { } ");
+                                                else if(num_blocks > 1)
+                                                        mSummary.append(llformat(" %s [ %d ] { ... } ", block_name, num_blocks));
+                                                else for(S32 i = 0; i < 1; i++)
+                                                {
+                                                        mSummary.append(" { ");
+                                                        LLMessageBlock::message_variable_map_t::iterator var_end = block->mMemberVariables.end();
+                                                        for (LLMessageBlock::message_variable_map_t::iterator var_iter = block->mMemberVariables.begin();
+                                                                 var_iter != var_end; ++var_iter)
+                                                        {
+                                                                LLMessageVariable* variable = (*var_iter);
+                                                                const char* var_name = variable->getName();
+                                                                BOOL returned_hex;
+                                                                std::string value = getString(sTemplateMessageReader, block_name, i, var_name, variable->getType(), returned_hex, TRUE);
+                                                                mSummary.append(llformat(" %s=%s ", var_name, value.c_str()));
+                                                        }
+                                                        mSummary.append(" } ");
+                                                        if(mSummary.length() > 255) break;
+                                                }
+                                                if(mSummary.length() > 255)
+                                                {
+                                                        mSummary.append(" ... ");
+                                                        break;
+                                                }
+                                        } // blocks_iter
+                                } // decode_valid
+                        }
+                }
+                if(decode_invalid)
+                {
+                        mName = "Invalid";
+                        mSummary = "";
+                        for(S32 i = 0; i < mDataSize; i++)
+                                mSummary.append(llformat("%02X ", mData[i]));
+                }
+        }
+        else // not template
+        {
+                mName = "SOMETHING ELSE";
+                mSummary = "TODO: SOMETHING ELSE";
+        }
+}
+LLFloaterMessageLogItem::~LLFloaterMessageLogItem()
+{
+}
+BOOL LLFloaterMessageLogItem::isOutgoing()
+{
+        return mFromHost == LLHost(16777343, gMessageSystem->getListenPort());
+}
+std::string LLFloaterMessageLogItem::getFull(BOOL show_header)
+{
+        std::string full("");
+        if(mType == TEMPLATE)
+        {
+                BOOL decode_invalid = FALSE;
+                S32 decode_len = mDataSize;
+                std::vector<U8> DecodeBuffer(MAX_PACKET_LEN,0);
+                memcpy(&(DecodeBuffer[0]),&(mData[0]),decode_len);
+                U8* decodep = &(DecodeBuffer[0]);
+                gMessageSystem->zeroCodeExpand(&decodep, &decode_len);
+                if(decode_len < 7)
+                        decode_invalid = TRUE;
+                else
+                {
+                        sTemplateMessageReader->clearMessage();
+                        if(!sTemplateMessageReader->validateMessage(decodep, decode_len, mFromHost, TRUE))
+                                decode_invalid = TRUE;
+                        else
+                        {
+                                if(!sTemplateMessageReader->decodeData(decodep, mFromHost, TRUE))
+                                        decode_invalid = TRUE;
+                                else
+                                {
+                                        LLMessageTemplate* temp = sTemplateMessageReader->getTemplate();
+                                        full.append(isOutgoing() ? "out " : "in ");
+                                        full.append(llformat("%s\n", temp->mName));
+                                        if(show_header)
+                                        {
+                                                full.append("[Header]\n");
+                                                full.append(llformat("SequenceID = %u\n", mSequenceID));
+                                                full.append(llformat("LL_ZERO_CODE_FLAG = %s\n", (mFlags & LL_ZERO_CODE_FLAG) ? "True" : "False"));
+                                                full.append(llformat("LL_RELIABLE_FLAG = %s\n", (mFlags & LL_RELIABLE_FLAG) ? "True" : "False"));
+                                                full.append(llformat("LL_RESENT_FLAG = %s\n", (mFlags & LL_RESENT_FLAG) ? "True" : "False"));
+                                                full.append(llformat("LL_ACK_FLAG = %s\n", (mFlags & LL_ACK_FLAG) ? "True" : "False"));
+                                        }
+                                        LLMessageTemplate::message_block_map_t::iterator blocks_end = temp->mMemberBlocks.end();
+                                        for (LLMessageTemplate::message_block_map_t::iterator blocks_iter = temp->mMemberBlocks.begin();
+                                                 blocks_iter != blocks_end; ++blocks_iter)
+                                        {
+                                                LLMessageBlock* block = (*blocks_iter);
+                                                const char* block_name = block->mName;
+                                                S32 num_blocks = sTemplateMessageReader->getNumberOfBlocks(block_name);
+                                                for(S32 i = 0; i < num_blocks; i++)
+                                                {
+                                                        full.append(llformat("[%s]\n", block->mName));
+                                                        LLMessageBlock::message_variable_map_t::iterator var_end = block->mMemberVariables.end();
+                                                        for (LLMessageBlock::message_variable_map_t::iterator var_iter = block->mMemberVariables.begin();
+                                                                 var_iter != var_end; ++var_iter)
+                                                        {
+                                                                LLMessageVariable* variable = (*var_iter);
+                                                                const char* var_name = variable->getName();
+                                                                BOOL returned_hex;
+                                                                std::string value = getString(sTemplateMessageReader, block_name, i, var_name, variable->getType(), returned_hex);
+                                                                if(returned_hex)
+                                                                        full.append(llformat("%s =| ", var_name));
+                                                                else
+                                                                        full.append(llformat("%s = ", var_name));
+                                                                // llformat has a 1024 char limit!?
+                                                                full.append(value);
+                                                                full.append("\n");
+                                                        }
+                                                }
+                                        } // blocks_iter
+                                } // decode_valid
+                        }
+                }
+                if(decode_invalid)
+                {
+                        full = isOutgoing() ? "out" : "in";
+                        full.append("\n");
+                        for(S32 i = 0; i < mDataSize; i++)
+                                full.append(llformat("%02X ", mData[i]));
+                }
+        }
+        else // not template
+        {
+                full = "FIXME";
+        }
+        return full;
+}
+// static
+std::string LLFloaterMessageLogItem::getString(LLTemplateMessageReader* readerp, const char* block_name, S32 block_num, const char* var_name, e_message_variable_type var_type, BOOL &returned_hex, BOOL summary_mode)
+{
+        returned_hex = FALSE;
+        std::stringstream stream;
+        char* value;
+        U32 valueU32;
+        U16 valueU16;
+        LLVector3 valueVector3;
+        LLVector3d valueVector3d;
+        LLVector4 valueVector4;
+        LLQuaternion valueQuaternion;
+        LLUUID valueLLUUID;
+        switch(var_type)
+        {
+        case MVT_U8:
+                U8 valueU8;
+                readerp->getU8(block_name, var_name, valueU8, block_num);
+                stream << U32(valueU8);
+                break;
+        case MVT_U16:
+                readerp->getU16(block_name, var_name, valueU16, block_num);
+                stream << valueU16;
+                break;
+        case MVT_U32:
+                readerp->getU32(block_name, var_name, valueU32, block_num);
+                stream << valueU32;
+                break;
+        case MVT_U64:
+                U64 valueU64;
+                readerp->getU64(block_name, var_name, valueU64, block_num);
+                stream << valueU64;
+                break;
+        case MVT_S8:
+                S8 valueS8;
+                readerp->getS8(block_name, var_name, valueS8, block_num);
+                stream << S32(valueS8);
+                break;
+        case MVT_S16:
+                S16 valueS16;
+                readerp->getS16(block_name, var_name, valueS16, block_num);
+                stream << valueS16;
+                break;
+        case MVT_S32:
+                S32 valueS32;
+                readerp->getS32(block_name, var_name, valueS32, block_num);
+                stream << valueS32;
+                break;
+        /*case MVT_S64:
+                S64 valueS64;
+                readerp->getS64(block_name, var_name, valueS64, block_num);
+                stream << valueS64;
+                break;*/
+        case MVT_F32:
+                F32 valueF32;
+                readerp->getF32(block_name, var_name, valueF32, block_num);
+                stream << valueF32;
+                break;
+        case MVT_F64:
+                F64 valueF64;
+                readerp->getF64(block_name, var_name, valueF64, block_num);
+                stream << valueF64;
+                break;
+        case MVT_LLVector3:
+                readerp->getVector3(block_name, var_name, valueVector3, block_num);
+                //stream << valueVector3;
+                stream << "<" << valueVector3.mV[0] << ", " << valueVector3.mV[1] << ", " << valueVector3.mV[2] << ">";
+                break;
+        case MVT_LLVector3d:
+                readerp->getVector3d(block_name, var_name, valueVector3d, block_num);
+                //stream << valueVector3d;
+                stream << "<" << valueVector3d.mdV[0] << ", " << valueVector3d.mdV[1] << ", " << valueVector3d.mdV[2] << ">";
+                break;
+        case MVT_LLVector4:
+                readerp->getVector4(block_name, var_name, valueVector4, block_num);
+                //stream << valueVector4;
+                stream << "<" << valueVector4.mV[0] << ", " << valueVector4.mV[1] << ", " << valueVector4.mV[2] << ", " << valueVector4.mV[3] << ">";
+                break;
+        case MVT_LLQuaternion:
+                readerp->getQuat(block_name, var_name, valueQuaternion, block_num);
+                //stream << valueQuaternion;
+                stream << "<" << valueQuaternion.mQ[0] << ", " << valueQuaternion.mQ[1] << ", " << valueQuaternion.mQ[2] << ", " << valueQuaternion.mQ[3] << ">";
+                break;
+        case MVT_LLUUID:
+                readerp->getUUID(block_name, var_name, valueLLUUID, block_num);
+                stream << valueLLUUID;
+                break;
+        case MVT_BOOL:
+                BOOL valueBOOL;
+                readerp->getBOOL(block_name, var_name, valueBOOL, block_num);
+                stream << valueBOOL;
+                break;
+        case MVT_IP_ADDR:
+                readerp->getIPAddr(block_name, var_name, valueU32, block_num);
+                stream << LLHost(valueU32, 0).getIPString();
+                break;
+        case MVT_IP_PORT:
+                readerp->getIPPort(block_name, var_name, valueU16, block_num);
+                stream << valueU16;
+        case MVT_VARIABLE:
+        case MVT_FIXED:
+        default:
+                S32 size = readerp->getSize(block_name, block_num, var_name);
+                if(size)
+                {
+                        value = new char[size + 1];
+                        readerp->getBinaryData(block_name, var_name, value, size, block_num);
+                        value[size] = '\0';
+                        S32 readable = 0;
+                        S32 unreadable = 0;
+                        S32 end = (summary_mode && (size > 64)) ? 64 : size;
+                        for(S32 i = 0; i < end; i++)
+                        {
+                                if(!value[i])
+                                {
+                                        if(i != (end - 1))
+                                        { // don't want null terminator hiding data
+                                                unreadable = S32_MAX;
+                                                break;
+                                        }
+                                }
+                                else if(value[i] < 0x20 || value[i] >= 0x7F)
+                                {
+                                        if(summary_mode)
+                                                unreadable++;
+                                        else
+                                        { // never want any wrong characters outside of summary mode
+                                                unreadable = S32_MAX;
+                                                break;
+                                        }
+                                }
+                                else readable++;
+                        }
+                        if(readable >= unreadable)
+                        {
+                                if(summary_mode && (size > 64))
+                                {
+                                        for(S32 i = 60; i < 63; i++)
+                                                value[i] = '.';
+                                        value[63] = '\0';
+                                }
+                                stream << value;
+                                
+                                delete[] value;
+                        }
+                        else
+                        {
+                                returned_hex = TRUE;
+                                S32 end = (summary_mode && (size > 8)) ? 8 : size;
+                                for(S32 i = 0; i < end; i++)
+                                        //stream << std::uppercase << std::hex << U32(value[i]) << " ";
+                                        stream << llformat("%02X ", (U8)value[i]);
+                                if(summary_mode && (size > 8))
+                                        stream << " ... ";
+                        }
+                }
+                break;
+        }
+
+        return stream.str();
+}
+LLMessageLogFilter::LLMessageLogFilter()
+{
+}
+LLMessageLogFilter::~LLMessageLogFilter()
+{
+}
+BOOL LLMessageLogFilter::set(std::string filter)
+{
+        mPositiveNames.clear();
+        mNegativeNames.clear();
+        typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+        boost::char_separator<char> sep(" ","",boost::keep_empty_tokens);
+        boost::tokenizer<boost::char_separator<char> > tokens(filter, sep);
+        boost::tokenizer<boost::char_separator<char> >::iterator end = tokens.end();
+        for(boost::tokenizer<boost::char_separator<char> >::iterator iter = tokens.begin(); iter != end; ++iter)
+        {
+                std::string token = (*iter);
+                LLStringUtil::trim(token);
+                LLStringUtil::toLower(token);
+                BOOL negative = token.find("!") == 0;
+                if(negative)
+                {
+                        token = token.substr(1);
+                        mNegativeNames.push_back(token);
+                }
+                else
+                        mPositiveNames.push_back(token);
+        }
+        return TRUE;
+}
+////////////////////////////////
+// LLMessageLogFilterApply
+////////////////////////////////
+LLMessageLogFilterApply::LLMessageLogFilterApply()
+:       LLEventTimer(0.1f),
+        mFinished(FALSE),
+        mProgress(0)
+{
+        mIter = LLFloaterMessageLog::sMessageLogEntries.begin();
+}
+void LLMessageLogFilterApply::cancel()
+{
+        mFinished = TRUE;
+}
+BOOL LLMessageLogFilterApply::tick()
+{
+        std::deque<LLMessageLogEntry>::iterator end = LLFloaterMessageLog::sMessageLogEntries.end();
+        if(mIter == end || !LLFloaterMessageLog::sInstance)
+        {
+                mFinished = TRUE;
+                if(LLFloaterMessageLog::sInstance)
+                {
+                        if(LLFloaterMessageLog::sInstance->mMessageLogFilterApply == this)
+                        {
+                                LLFloaterMessageLog::sInstance->stopApplyingFilter();
+                        }
+                }
+                return TRUE;
+        }
+        for(S32 i = 0; i < 256; i++)
+        {
+                if(mIter == end)
+                {
+                        mFinished = TRUE;
+                        if(LLFloaterMessageLog::sInstance)
+                        {
+                                if(LLFloaterMessageLog::sInstance->mMessageLogFilterApply == this)
+                                {
+                                        LLFloaterMessageLog::sInstance->stopApplyingFilter();
+
+                                        //we're done messing with the deque, push all queued items to the main deque
+                                        std::deque<LLMessageLogEntry>::iterator queueIter = mQueuedMessages.begin();
+                                        std::deque<LLMessageLogEntry>::iterator queueEnd = mQueuedMessages.end();
+
+                                        while(queueIter != queueEnd)
+                                        {
+                                                LLFloaterMessageLog::sInstance->conditionalLog(LLFloaterMessageLogItem((*queueIter)));
+                                                ++queueIter;
+                                        }
+
+                                        mQueuedMessages.clear();
+                                }
+                        }
+
+                        return TRUE;
+                }
+
+                LLFloaterMessageLog::sInstance->conditionalLog(LLFloaterMessageLogItem((*mIter)));
+                
+                mIter++;
+                mProgress++;
+        }
+        LLFloaterMessageLog::sInstance->updateFilterStatus();
+        return FALSE;
+}
+////////////////////////////////
+// LLFloaterMessageLog
+////////////////////////////////
+LLFloaterMessageLog* LLFloaterMessageLog::sInstance;
+std::list<LLNetListItem*> LLFloaterMessageLog::sNetListItems;
+std::deque<LLMessageLogEntry> LLFloaterMessageLog::sMessageLogEntries;
+std::vector<LLFloaterMessageLogItem> LLFloaterMessageLog::sFloaterMessageLogItems;
+LLMessageLogFilter LLFloaterMessageLog::sMessageLogFilter = LLMessageLogFilter();
+std::string LLFloaterMessageLog::sMessageLogFilterString("!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket !SoundTrigger !AttachedSound !PreloadSound");
+BOOL LLFloaterMessageLog::sBusyApplyingFilter = FALSE;
+LLFloaterMessageLog::LLFloaterMessageLog()
+:       LLFloater(),
+        LLEventTimer(1.0f),
+        mNetInfoMode(NI_NET),
+        mMessageLogFilterApply(NULL)
+{
+        sInstance = this;
+        LLMessageLog::setCallback(onLog);
+        sMessageLogEntries = LLMessageLog::getDeque();
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_message_log.xml");
+}
+LLFloaterMessageLog::~LLFloaterMessageLog()
+{
+        LLMessageLog::setCallback(NULL);
+        stopApplyingFilter();
+        sInstance = NULL;
+        sNetListItems.clear();
+        sMessageLogEntries.clear();
+        sFloaterMessageLogItems.clear();
+}
+// static
+void LLFloaterMessageLog::show()
+{
+        if(!sInstance) sInstance = new LLFloaterMessageLog();
+        sInstance->open();
+}
+BOOL LLFloaterMessageLog::postBuild()
+{
+        childSetCommitCallback("net_list", onCommitNetList, this);
+        childSetCommitCallback("message_log", onCommitMessageLog, this);
+        childSetAction("filter_choice_btn", onClickFilterChoice, this);
+        childSetAction("filter_apply_btn", onClickFilterApply, this);
+        childSetCommitCallback("filter_edit", onCommitFilter, this);
+        childSetAction("clear_log_btn", onClickClearLog, this);
+        childSetAction("send_to_message_builder_btn", onClickSendToMessageBuilder, this);
+        childSetText("filter_edit", sMessageLogFilterString);
+        refreshNetList();
+        refreshNetInfo(TRUE);
+        startApplyingFilter(sMessageLogFilterString, TRUE);
+        return TRUE;
+}
+BOOL LLFloaterMessageLog::tick()
+{
+        refreshNetList();
+        refreshNetInfo(FALSE);
+        return FALSE;
+}
+LLNetListItem* LLFloaterMessageLog::findNetListItem(LLHost host)
+{
+        std::list<LLNetListItem*>::iterator end = sNetListItems.end();
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != end; ++iter)
+                if((*iter)->mCircuitData && (*iter)->mCircuitData->getHost() == host)
+                        return (*iter);
+        return NULL;
+}
+LLNetListItem* LLFloaterMessageLog::findNetListItem(LLUUID id)
+{
+        std::list<LLNetListItem*>::iterator end = sNetListItems.end();
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != end; ++iter)
+                if((*iter)->mID == id)
+                        return (*iter);
+        return NULL;
+}
+void LLFloaterMessageLog::refreshNetList()
+{
+        LLScrollListCtrl* scrollp = getChild<LLScrollListCtrl>("net_list");
+        // Update circuit data of net list items
+        std::vector<LLCircuitData*> circuits = gMessageSystem->getCircuit()->getCircuitDataList();
+        std::vector<LLCircuitData*>::iterator circuits_end = circuits.end();
+        for(std::vector<LLCircuitData*>::iterator iter = circuits.begin(); iter != circuits_end; ++iter)
+        {
+                LLNetListItem* itemp = findNetListItem((*iter)->getHost());
+                if(!itemp)
+                {
+                        LLUUID id; id.generate();
+                        itemp = new LLNetListItem(id);
+                        sNetListItems.push_back(itemp);
+                }
+                itemp->mCircuitData = (*iter);
+        }
+        // Clear circuit data of items whose circuits are gone
+        std::list<LLNetListItem*>::iterator items_end = sNetListItems.end();
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != items_end; ++iter)
+        {
+                if(std::find(circuits.begin(), circuits.end(), (*iter)->mCircuitData) == circuits.end())
+                        (*iter)->mCircuitData = NULL;
+        }
+        // Remove net list items that are totally useless now
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != sNetListItems.end();)
+        {
+                if((*iter)->mCircuitData == NULL)
+                        iter = sNetListItems.erase(iter);
+                else ++iter;
+        }
+        // Update names of net list items
+        items_end = sNetListItems.end();
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != items_end; ++iter)
+        {
+                LLNetListItem* itemp = (*iter);
+                if(itemp->mAutoName)
+                {
+                        if(itemp->mCircuitData)
+                        {
+                                LLViewerRegion* regionp = LLWorld::getInstance()->getRegion(itemp->mCircuitData->getHost());
+                                if(regionp)
+                                {
+                                        std::string name = regionp->getName();
+                                        if(name == "") name = llformat("%s (awaiting region name)", itemp->mCircuitData->getHost().getString().c_str());
+                                        itemp->mName = name;
+                                        itemp->mPreviousRegionName = name;
+                                }
+                                else
+                                {
+                                        itemp->mName = itemp->mCircuitData->getHost().getString();
+                                        if(itemp->mPreviousRegionName != "")
+                                                itemp->mName.append(llformat(" (was %s)", itemp->mPreviousRegionName.c_str()));
+                                }
+                        }
+                        else
+                        {
+                                // an item just for an event queue, not handled yet
+                                itemp->mName = "Something else";
+                        }
+                }
+        }
+        // Rebuild scroll list from scratch
+        LLUUID selected_id = scrollp->getFirstSelected() ? scrollp->getFirstSelected()->getUUID() : LLUUID::null;
+        S32 scroll_pos = scrollp->getScrollPos();
+        scrollp->clearRows();
+        for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != items_end; ++iter)
+        {
+                LLNetListItem* itemp = (*iter);
+                LLSD element;
+                element["id"] = itemp->mID;
+                LLSD& text_column = element["columns"][0];
+                text_column["column"] = "text";
+                text_column["value"] = itemp->mName + (itemp->mCircuitData->getHost() == gAgent.getRegionHost() ? " (main)" : "");
+                for(int i = 0; i < 2; i++)
+                {
+                        LLSD& icon_column = element["columns"][i + 1];
+                        icon_column["column"] = llformat("icon%d", i);
+                        icon_column["type"] = "icon";
+                        icon_column["value"] = "";
+                }
+                LLScrollListItem* scroll_itemp = scrollp->addElement(element);
+                BOOL has_live_circuit = itemp->mCircuitData && itemp->mCircuitData->isAlive();
+                if(has_live_circuit)
+                {
+                        LLScrollListIcon* icon = (LLScrollListIcon*)scroll_itemp->getColumn(1);
+                        icon->setValue("icon_net_close_circuit.tga");
+                        icon->setClickCallback(onClickCloseCircuit, itemp);
+                }
+                else
+                {
+                        LLScrollListIcon* icon = (LLScrollListIcon*)scroll_itemp->getColumn(1);
+                        icon->setValue("icon_net_close_circuit_gray.tga");
+                        icon->setClickCallback(NULL, NULL);
+                }
+                // Event queue isn't even supported yet... FIXME
+                LLScrollListIcon* icon = (LLScrollListIcon*)scroll_itemp->getColumn(2);
+                icon->setValue("icon_net_close_eventpoll_gray.tga");
+                icon->setClickCallback(NULL, NULL);
+        }
+        if(selected_id.notNull()) scrollp->selectByID(selected_id);
+        if(scroll_pos < scrollp->getItemCount()) scrollp->setScrollPos(scroll_pos);
+}
+void LLFloaterMessageLog::refreshNetInfo(BOOL force)
+{
+        if(mNetInfoMode != NI_NET) return;
+        LLScrollListCtrl* scrollp = getChild<LLScrollListCtrl>("net_list");
+        LLScrollListItem* selected_itemp = scrollp->getFirstSelected();
+        if(selected_itemp)
+        {
+                if(!force) if(getChild<LLTextEditor>("net_info")->hasSelection()) return;
+                LLNetListItem* itemp = findNetListItem(selected_itemp->getUUID());
+                if(itemp)
+                {
+                        std::string info(llformat("%s\n--------------------------------\n\n", itemp->mName.c_str()));
+                        if(itemp->mCircuitData)
+                        {
+                                LLCircuitData* cdp = itemp->mCircuitData;
+                                info.append("Circuit\n--------------------------------\n");
+                                info.append(llformat(" * Host: %s\n", cdp->getHost().getString().c_str()));
+                                S32 seconds = (S32)cdp->getAgeInSeconds();
+                                S32 minutes = seconds / 60;
+                                seconds = seconds % 60;
+                                S32 hours = minutes / 60;
+                                minutes = minutes % 60;
+                                info.append(llformat(" * Age: %dh %dm %ds\n", hours, minutes, seconds));
+                                info.append(llformat(" * Alive: %s\n", cdp->isAlive() ? "yes" : "no"));
+                                info.append(llformat(" * Blocked: %s\n", cdp->isBlocked() ? "yes" : "no"));
+                                info.append(llformat(" * Allow timeout: %s\n", cdp->getAllowTimeout() ? "yes" : "no"));
+                                info.append(llformat(" * Trusted: %s\n", cdp->getTrusted() ? "yes" : "no"));
+                                info.append(llformat(" * Ping delay: %d\n", cdp->getPingDelay()));
+                                info.append(llformat(" * Packets out: %d\n", cdp->getPacketsOut()));
+                                info.append(llformat(" * Bytes out: %d\n", cdp->getBytesOut()));
+                                info.append(llformat(" * Packets in: %d\n", cdp->getPacketsIn()));
+                                info.append(llformat(" * Bytes in: %d\n", cdp->getBytesIn()));
+                                info.append(llformat(" * Endpoint ID: %s\n", cdp->getLocalEndPointID().asString().c_str()));
+                                info.append(llformat(" * Remote ID: %s\n", cdp->getRemoteID().asString().c_str()));
+                                info.append(llformat(" * Remote session ID: %s\n", cdp->getRemoteSessionID().asString().c_str()));
+                        }
+                        childSetText("net_info", info);
+                }
+                else childSetText("net_info", std::string(""));
+        }
+        else childSetText("net_info", std::string(""));
+}
+void LLFloaterMessageLog::setNetInfoMode(ENetInfoMode mode)
+{
+        mNetInfoMode = mode;
+        if(mNetInfoMode == NI_NET)
+                refreshNetInfo(TRUE);
+        childSetEnabled("send_to_message_builder_btn", mNetInfoMode == NI_LOG);
+}
+// static
+void LLFloaterMessageLog::onLog(LLMessageLogEntry entry)
+{
+        //don't mess with the queue while a filter's being applied, or face invalid iterators
+        if(!sBusyApplyingFilter)
+        {
+                sMessageLogEntries.push_back(entry);
+                conditionalLog(LLFloaterMessageLogItem(entry));
+        }
+}
+// static
+void LLFloaterMessageLog::conditionalLog(LLFloaterMessageLogItem item)
+{       
+        if(!sBusyApplyingFilter)
+                sInstance->childSetText("log_status_text", llformat("Showing %d messages from %d", sFloaterMessageLogItems.size(), sMessageLogEntries.size()));
+        std::string find_name = item.mName;
+        LLStringUtil::toLower(find_name);
+        if(sMessageLogFilter.mPositiveNames.size())
+                if(std::find(sMessageLogFilter.mPositiveNames.begin(), sMessageLogFilter.mPositiveNames.end(), find_name) == sMessageLogFilter.mPositiveNames.end())
+                        return;
+        if(std::find(sMessageLogFilter.mNegativeNames.begin(), sMessageLogFilter.mNegativeNames.end(), find_name) != sMessageLogFilter.mNegativeNames.end())
+                return;
+        sFloaterMessageLogItems.push_back(item); // moved from beginning...
+        BOOL outgoing = item.isOutgoing();
+        std::string net_name("\?\?\?");
+        if(item.mType == LLFloaterMessageLogItem::TEMPLATE)
+        {
+                LLHost find_host = outgoing ? item.mToHost : item.mFromHost;
+                net_name = find_host.getIPandPort();
+                std::list<LLNetListItem*>::iterator end = sNetListItems.end();
+                for(std::list<LLNetListItem*>::iterator iter = sNetListItems.begin(); iter != end; ++iter)
+                {
+                        if((*iter)->mCircuitData->getHost() == find_host)
+                        {
+                                net_name = (*iter)->mName;
+                                break;
+                        }
+                }
+        }
+        LLSD element;
+        element["id"] = item.mID;
+        LLSD& sequence_column = element["columns"][0];
+        sequence_column["column"] = "sequence";
+        sequence_column["value"] = llformat("%u", item.mSequenceID);
+        LLSD& type_column = element["columns"][1];
+        type_column["column"] = "type";
+        type_column["value"] = item.mType == LLFloaterMessageLogItem::TEMPLATE ? "UDP" : "\?\?\?";
+        LLSD& direction_column = element["columns"][2];
+        direction_column["column"] = "direction";
+        direction_column["value"] = outgoing ? "to" : "from";
+        LLSD& net_column = element["columns"][3];
+        net_column["column"] = "net";
+        net_column["value"] = net_name;
+        LLSD& name_column = element["columns"][4];
+        name_column["column"] = "name";
+        name_column["value"] = item.mName;
+        /*
+        LLSD& zer_column = element["columns"][5];
+        zer_column["column"] = "flag_zer";
+        zer_column["type"] = "icon";
+        zer_column["value"] = (item.mFlags & LL_ZERO_CODE_FLAG) ? "flag_zer.tga" : "";
+        LLSD& rel_column = element["columns"][6];
+        rel_column["column"] = "flag_rel";
+        rel_column["type"] = "icon";
+        rel_column["value"] = (item.mFlags & LL_RELIABLE_FLAG) ? "flag_rel.tga" : "";
+        LLSD& rsd_column = element["columns"][7];
+        rsd_column["column"] = "flag_rsd";
+        rsd_column["type"] = "icon";
+        rsd_column["value"] = (item.mFlags & LL_RESENT_FLAG) ? "flag_rsd.tga" : "";
+        LLSD& ack_column = element["columns"][8];
+        ack_column["column"] = "flag_ack";
+        ack_column["type"] = "icon";
+        ack_column["value"] = (item.mFlags & LL_ACK_FLAG) ? "flag_ack.tga" : "";
+        */
+        LLSD& summary_column = element["columns"][5];
+        summary_column["column"] = "summary";
+        summary_column["value"] = item.mSummary;
+        LLScrollListCtrl* scrollp = sInstance->getChild<LLScrollListCtrl>("message_log");
+        S32 scroll_pos = scrollp->getScrollPos();
+        scrollp->addElement(element);
+        if(scroll_pos > scrollp->getItemCount() - scrollp->getPageLines() - 4)
+                scrollp->setScrollPos(scrollp->getItemCount());
+}
+// static
+void LLFloaterMessageLog::onCommitNetList(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterMessageLog* floaterp = (LLFloaterMessageLog*)user_data;
+        floaterp->setNetInfoMode(NI_NET);
+        floaterp->refreshNetInfo(TRUE);
+}
+// static
+void LLFloaterMessageLog::onCommitMessageLog(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterMessageLog* floaterp = (LLFloaterMessageLog*)user_data;
+        LLScrollListCtrl* scrollp = floaterp->getChild<LLScrollListCtrl>("message_log");
+        LLScrollListItem* selected_itemp = scrollp->getFirstSelected();
+        if(!selected_itemp) return;
+        LLUUID id = selected_itemp->getUUID();
+        std::vector<LLFloaterMessageLogItem>::iterator end = sFloaterMessageLogItems.end();
+        for(std::vector<LLFloaterMessageLogItem>::iterator iter = sFloaterMessageLogItems.begin(); iter != end; ++iter)
+        {
+                if(iter->mID == id)
+                {
+                        floaterp->setNetInfoMode(NI_LOG);
+                        floaterp->childSetText("net_info", iter->getFull(FALSE));
+                        break;
+                }
+        }
+}
+// static
+BOOL LLFloaterMessageLog::onClickCloseCircuit(void* user_data)
+{
+        LLNetListItem* itemp = (LLNetListItem*)user_data;
+        LLCircuitData* cdp = (LLCircuitData*)itemp->mCircuitData;
+        if(!cdp) return FALSE;
+        LLHost myhost = cdp->getHost();
+        LLSD args;
+        args["MESSAGE"] = "This will delete local circuit data.\nDo you want to tell the remote host to close the circuit too?";
+        LLSD payload;
+        payload["circuittoclose"] = myhost.getString(); 
+        LLNotifications::instance().add("GenericAlertYesCancel", args, payload, onConfirmCloseCircuit);
+        return TRUE;
+}
+// static
+bool LLFloaterMessageLog::onConfirmCloseCircuit(const LLSD& notification, const LLSD& response )
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        LLCircuitData* cdp = gMessageSystem->mCircuitInfo.findCircuit(LLHost(notification["payload"]["circuittoclose"].asString()));
+        if(!cdp) return false;
+        LLViewerRegion* regionp = LLWorld::getInstance()->getRegion(cdp->getHost());
+        switch(option)
+        {
+        case 0: // yes
+                gMessageSystem->newMessageFast(_PREHASH_CloseCircuit);
+                gMessageSystem->sendReliable(cdp->getHost());
+                break;
+        case 2: // cancel
+                return false;
+                break;
+        case 1: // no
+        default:
+                break;
+        }
+        if(gMessageSystem->findCircuitCode(cdp->getHost()))
+                gMessageSystem->disableCircuit(cdp->getHost());
+        else
+                gMessageSystem->getCircuit()->removeCircuitData(cdp->getHost());
+        if(regionp)
+        {
+                LLHost myhost = regionp->getHost();
+                LLSD args;
+                args["MESSAGE"] = "That host had a region associated with it.\nDo you want to clean that up?";
+                LLSD payload;
+                payload["regionhost"] = myhost.getString();
+                LLNotifications::instance().add("GenericAlertYesCancel", args, payload, onConfirmRemoveRegion);
+        }
+        return false;
+}
+// static
+bool LLFloaterMessageLog::onConfirmRemoveRegion(const LLSD& notification, const LLSD& response )
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if(option == 0) // yes
+                LLWorld::getInstance()->removeRegion(LLHost(notification["payload"]["regionhost"].asString()));
+        return false;
+}
+// static
+void LLFloaterMessageLog::onClickFilterApply(void* user_data)
+{
+        LLFloaterMessageLog* floaterp = (LLFloaterMessageLog*)user_data;
+        floaterp->startApplyingFilter(floaterp->childGetValue("filter_edit"), FALSE);
+}
+void LLFloaterMessageLog::startApplyingFilter(std::string filter, BOOL force)
+{
+        LLMessageLogFilter new_filter = LLMessageLogFilter();
+        sMessageLogFilterString = filter;
+        new_filter.set(sMessageLogFilterString);
+        if(!filter.length() || filter.at(filter.length()-1) != ' ')
+                childSetText("filter_edit", filter + " ");
+        if(force
+                || (new_filter.mNegativeNames != sMessageLogFilter.mNegativeNames)
+                || (new_filter.mPositiveNames != sMessageLogFilter.mPositiveNames))
+        {
+                stopApplyingFilter();
+                sMessageLogFilter = new_filter;
+                sFloaterMessageLogItems.clear();
+                getChild<LLScrollListCtrl>("message_log")->clearRows();
+                sBusyApplyingFilter = TRUE;
+                childSetVisible("message_log", false);
+                //childSetVisible("log_status_text", true);
+                mMessageLogFilterApply = new LLMessageLogFilterApply();
+        }
+}
+void LLFloaterMessageLog::stopApplyingFilter()
+{
+        if(mMessageLogFilterApply)
+        {
+                if(!(mMessageLogFilterApply->mFinished))
+                        mMessageLogFilterApply->cancel();
+                //delete mMessageLogFilterApply;
+                sBusyApplyingFilter = FALSE;
+                //childSetVisible("log_status_text", false);
+                childSetVisible("message_log", true);
+                childSetText("log_status_text", llformat("Showing %d messages from %d", sFloaterMessageLogItems.size(), sMessageLogEntries.size()));
+        }
+}
+void LLFloaterMessageLog::updateFilterStatus()
+{
+        if(!mMessageLogFilterApply || !sBusyApplyingFilter) return;
+        S32 progress = mMessageLogFilterApply->mProgress;
+        S32 packets = sMessageLogEntries.size();
+        S32 matches = sFloaterMessageLogItems.size();
+        std::string text = llformat("Applying filter ( %d / %d ), %d matches ...", progress, packets, matches);
+        childSetText("log_status_text", text);
+}
+// static
+void LLFloaterMessageLog::onCommitFilter(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterMessageLog* floaterp = (LLFloaterMessageLog*)user_data;
+        floaterp->startApplyingFilter(floaterp->childGetValue("filter_edit"), FALSE);
+}
+// static
+void LLFloaterMessageLog::onClickClearLog(void* user_data)
+{
+        LLFloaterMessageLog* floaterp = (LLFloaterMessageLog*)user_data;
+        floaterp->stopApplyingFilter();
+        floaterp->getChild<LLScrollListCtrl>("message_log")->clearRows();
+        floaterp->setNetInfoMode(NI_NET);
+        sMessageLogEntries.clear();
+        sFloaterMessageLogItems.clear();
+}
+// static
+void LLFloaterMessageLog::onClickFilterChoice(void* user_data)
+{
+        LLMenuGL* menu = new LLMenuGL(LLStringUtil::null);
+        menu->append(new LLMenuItemCallGL("No filter", onClickFilterMenu, NULL, (void*)""));
+        menu->append(new LLMenuItemCallGL("Fewer spammy messages", onClickFilterMenu, NULL, (void*)"!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket"));
+        menu->append(new LLMenuItemCallGL("Fewer spammy messages (minus sound crap)", onClickFilterMenu, NULL, (void*)"!StartPingCheck !CompletePingCheck !PacketAck !SimulatorViewerTimeMessage !SimStats !AgentUpdate !AgentAnimation !AvatarAnimation !ViewerEffect !CoarseLocationUpdate !LayerData !CameraConstraint !ObjectUpdateCached !RequestMultipleObjects !ObjectUpdate !ObjectUpdateCompressed !ImprovedTerseObjectUpdate !KillObject !ImagePacket !SendXferPacket !ConfirmXferPacket !TransferPacket !SoundTrigger !AttachedSound !PreloadSound"));
+        menu->append(new LLMenuItemCallGL("Object updates", onClickFilterMenu, NULL, (void*)"ObjectUpdateCached ObjectUpdate ObjectUpdateCompressed ImprovedTerseObjectUpdate KillObject RequestMultipleObjects"));
+        menu->append(new LLMenuItemCallGL("Abnormal", onClickFilterMenu, NULL, (void*)"Invalid TestMessage AddCircuitCode NeighborList AvatarTextureUpdate SimulatorMapUpdate SimulatorSetMap SubscribeLoad UnsubscribeLoad SimulatorReady SimulatorPresentAtLocation SimulatorLoad SimulatorShutdownRequest RegionPresenceRequestByRegionID RegionPresenceRequestByHandle RegionPresenceResponse UpdateSimulator LogDwellTime FeatureDisabled LogFailedMoneyTransaction UserReportInternal SetSimStatusInDatabase SetSimPresenceInDatabase OpenCircuit CloseCircuit DirFindQueryBackend DirPlacesQueryBackend DirClassifiedQueryBackend DirLandQueryBackend DirPopularQueryBackend GroupNoticeAdd DataHomeLocationRequest DataHomeLocationReply DerezContainer ObjectCategory ObjectExportSelected StateSave ReportAutosaveCrash AgentAlertMessage NearestLandingRegionRequest NearestLandingRegionReply NearestLandingRegionUpdated TeleportLandingStatusChanged ConfirmEnableSimulator KickUserAck SystemKickUser AvatarPropertiesRequestBackend UpdateParcel RemoveParcel MergeParcel LogParcelChanges CheckParcelSales ParcelSales StartAuction ConfirmAuctionStart CompleteAuction CancelAuction CheckParcelAuctions ParcelAuctions ChatPass EdgeDataPacket SimStatus ChildAgentUpdate ChildAgentAlive ChildAgentPositionUpdate ChildAgentDying ChildAgentUnknown AtomicPassObject KillChildAgents ScriptSensorRequest ScriptSensorReply DataServerLogout RequestInventoryAsset InventoryAssetResponse TransferInventory TransferInventoryAck EventLocationRequest EventLocationReply MoneyTransferBackend RoutedMoneyBalanceReply SetStartLocation NetTest SetCPURatio SimCrashed NameValuePair RemoveNameValuePair UpdateAttachment RemoveAttachment EmailMessageRequest EmailMessageReply InternalScriptMail ScriptDataRequest ScriptDataReply InviteGroupResponse TallyVotes LiveHelpGroupRequest LiveHelpGroupReply GroupDataUpdate LogTextMessage CreateTrustedCircuit ParcelRename SystemMessage RpcChannelRequest RpcChannelReply RpcScriptRequestInbound RpcScriptRequestInboundForward RpcScriptReplyInbound ScriptMailRegistration Error"));
+        menu->updateParent(LLMenuGL::sMenuContainer);
+        menu->setCanTearOff(FALSE);
+        LLView* buttonp = sInstance->getChild<LLView>("filter_choice_btn");
+        S32 x = buttonp->getRect().mLeft;
+        S32 y = buttonp->getRect().mBottom;
+        LLMenuGL::showPopup(sInstance, menu, x, y);
+}
+// static
+void LLFloaterMessageLog::onClickFilterMenu(void* user_data)
+{
+        std::string filter = std::string((char*)user_data);
+        sInstance->childSetText("filter_edit", filter);
+        sInstance->startApplyingFilter(filter, FALSE);
+}
+// static
+void LLFloaterMessageLog::onClickSendToMessageBuilder(void* user_data)
+{
+        LLFloaterMessageLog* floaterp = (LLFloaterMessageLog*)user_data;
+        LLScrollListCtrl* scrollp = floaterp->getChild<LLScrollListCtrl>("message_log");
+        LLScrollListItem* selected_itemp = scrollp->getFirstSelected();
+        if(!selected_itemp) return;
+        LLUUID id = selected_itemp->getUUID();
+        std::vector<LLFloaterMessageLogItem>::iterator end = sFloaterMessageLogItems.end();
+        for(std::vector<LLFloaterMessageLogItem>::iterator iter = sFloaterMessageLogItems.begin(); iter != end; ++iter)
+        {
+                if(iter->mID == id)
+                {
+                        std::string message_text = iter->getFull(FALSE);
+                        LLFloaterMessageBuilder::show(message_text);
+                        break;
+                }
+        }
+}
+// </edit>
diff --git a/linden/indra/newview/llfloatermessagelog.h b/linden/indra/newview/llfloatermessagelog.h
new file mode 100644
index 0000000..ebc4f2a
--- /dev/null
+++ b/linden/indra/newview/llfloatermessagelog.h
@@ -0,0 +1,84 @@
+// <edit>
+#include "llfloater.h"
+#include "llmessagelog.h"
+#include "lltemplatemessagereader.h"
+#include "llfloatermessagebuilder.h"
+
+class LLFloaterMessageLogItem : public LLMessageLogEntry
+{
+public:
+        LLFloaterMessageLogItem(LLMessageLogEntry entry);
+        ~LLFloaterMessageLogItem();
+        LLUUID mID;
+        U32 mSequenceID;
+        std::string mName;
+        std::string mSummary;
+        U32 mFlags;
+        std::string getFull(BOOL show_header = TRUE);
+        BOOL isOutgoing();
+private:
+        static LLTemplateMessageReader* sTemplateMessageReader;
+        static std::string getString(LLTemplateMessageReader* readerp, const char* block_name, S32 block_num, const char* var_name, e_message_variable_type var_type, BOOL &returned_hex, BOOL summary_mode = FALSE);
+};
+class LLMessageLogFilter
+{
+public:
+        LLMessageLogFilter();
+        ~LLMessageLogFilter();
+        BOOL set(std::string filter);
+        std::list<std::string> mPositiveNames;
+        std::list<std::string> mNegativeNames;
+};
+class LLMessageLogFilterApply : public LLEventTimer
+{
+public:
+        LLMessageLogFilterApply();
+        void cancel();
+        BOOL tick();
+        S32 mProgress;
+        BOOL mFinished;
+private:
+        std::deque<LLMessageLogEntry> mQueuedMessages;
+        std::deque<LLMessageLogEntry>::iterator mIter;
+};
+class LLFloaterMessageLog : public LLFloater, public LLEventTimer
+{
+public:
+        LLFloaterMessageLog();
+        ~LLFloaterMessageLog();
+        static void show();
+        BOOL postBuild();
+        BOOL tick();
+        LLNetListItem* findNetListItem(LLHost host);
+        LLNetListItem* findNetListItem(LLUUID id);
+        void refreshNetList();
+        void refreshNetInfo(BOOL force);
+        enum ENetInfoMode { NI_NET, NI_LOG };
+        void setNetInfoMode(ENetInfoMode mode);
+        static void onLog(LLMessageLogEntry entry);
+        static void conditionalLog(LLFloaterMessageLogItem item);
+        static void onCommitNetList(LLUICtrl* ctrl, void* user_data);
+        static void onCommitMessageLog(LLUICtrl* ctrl, void* user_data);
+        static void onCommitFilter(LLUICtrl* ctrl, void* user_data);
+        static BOOL onClickCloseCircuit(void* user_data);
+        static bool onConfirmCloseCircuit(const LLSD& notification, const LLSD& response );
+        static bool onConfirmRemoveRegion(const LLSD& notification, const LLSD& response );
+        static void onClickFilterApply(void* user_data);
+        void startApplyingFilter(std::string filter, BOOL force);
+        void stopApplyingFilter();
+        void updateFilterStatus();
+        static BOOL sBusyApplyingFilter;
+        LLMessageLogFilterApply* mMessageLogFilterApply;
+        static void onClickClearLog(void* user_data);
+        static LLFloaterMessageLog* sInstance;
+        static std::list<LLNetListItem*> sNetListItems;
+        static std::deque<LLMessageLogEntry> sMessageLogEntries;
+        static std::vector<LLFloaterMessageLogItem> sFloaterMessageLogItems;
+        static LLMessageLogFilter sMessageLogFilter;
+        static std::string sMessageLogFilterString;
+        ENetInfoMode mNetInfoMode;
+        static void onClickFilterChoice(void* user_data);
+        static void onClickFilterMenu(void* user_data);
+        static void onClickSendToMessageBuilder(void* user_data);
+};
+// </edit>
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index deee0f6..c7f1c38 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -1,3298 +1,3436 @@
-/** 
- * @file llfloaterregioninfo.cpp
- * @author Aaron Brashears
- * @brief Implementation of the region info and controls floater and panels.
- *
- * $LicenseInfo:firstyear=2004&license=viewergpl$
- * 
- * Copyright (c) 2004-2009, 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
- * ("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
- * 
- * 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
- * 
- * 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.
- * 
- * 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"
-#include "llfloaterregioninfo.h"
-
-#include <algorithm>
-#include <functional>
-
-#include "llcachename.h"
-#include "lldir.h"
-#include "lldispatcher.h"
-#include "llglheaders.h"
-#include "llregionflags.h"
-#include "llstl.h"
-#include "indra_constants.h"
-#include "message.h"
-
-#include "llagent.h"
-#include "llalertdialog.h"
-#include "llappviewer.h"
-#include "llfloateravatarpicker.h"
-#include "llbutton.h" 
-#include "llcheckboxctrl.h"
-#include "llcombobox.h"
-#include "llfilepicker.h"
-#include "llfloaterdaycycle.h"
-#include "llfloatergodtools.h"  // for send_sim_wide_deletes()
-#include "llfloatertopobjects.h" // added to fix SL-32336
-#include "llfloatergroups.h"
-#include "llfloatertelehub.h"
-#include "llfloaterwindlight.h"
-#include "llinventorymodel.h"
-#include "lllineeditor.h"
-#include "llalertdialog.h"
-#include "llnamelistctrl.h"
-#include "llsliderctrl.h"
-#include "llspinctrl.h"
-#include "lltabcontainer.h"
-#include "lltextbox.h"
-#include "llinventory.h"
-#include "lltexturectrl.h"
-#include "lltrans.h"
-#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
-#include "llviewerimage.h"
-#include "llviewerimagelist.h"
-#include "llviewerregion.h"
-#include "llviewerstats.h"
-#include "llviewertexteditor.h"
-#include "llviewerwindow.h"
-#include "llvlcomposition.h"
-
-// [RLVa:KB]
-#include "rlvhandler.h"
-// [/RLVa:KB]
-
-#define ELAR_ENABLED 0 // Enable when server support is implemented
-
-const S32 TERRAIN_TEXTURE_COUNT = 4;
-const S32 CORNER_COUNT = 4;
-
-///----------------------------------------------------------------------------
-/// Local class declaration
-///----------------------------------------------------------------------------
-
-class LLDispatchEstateUpdateInfo : public LLDispatchHandler
-{
-public:
-        LLDispatchEstateUpdateInfo() {}
-        virtual ~LLDispatchEstateUpdateInfo() {}
-        virtual bool operator()(
-                const LLDispatcher* dispatcher,
-                const std::string& key,
-                const LLUUID& invoice,
-                const sparam_t& strings);
-};
-
-class LLDispatchSetEstateAccess : public LLDispatchHandler
-{
-public:
-        LLDispatchSetEstateAccess() {}
-        virtual ~LLDispatchSetEstateAccess() {}
-        virtual bool operator()(
-                const LLDispatcher* dispatcher,
-                const std::string& key,
-                const LLUUID& invoice,
-                const sparam_t& strings);
-};
-
-
-/*
-void unpack_request_params(
-        LLMessageSystem* msg,
-        LLDispatcher::sparam_t& strings,
-        LLDispatcher::iparam_t& integers)
-{
-        char str_buf[MAX_STRING];
-        S32 str_count = msg->getNumberOfBlocksFast(_PREHASH_StringData);
-        S32 i;
-        for (i = 0; i < str_count; ++i)
-        {
-                // we treat the SParam as binary data (since it might be an 
-                // LLUUID in compressed form which may have embedded \0's,)
-                str_buf[0] = '\0';
-                S32 data_size = msg->getSizeFast(_PREHASH_StringData, i, _PREHASH_SParam);
-                if (data_size >= 0)
-                {
-                        msg->getBinaryDataFast(_PREHASH_StringData, _PREHASH_SParam,
-                                                                   str_buf, data_size, i, MAX_STRING - 1);
-                        strings.push_back(std::string(str_buf, data_size));
-                }
-        }
-
-        U32 int_buf;
-        S32 int_count = msg->getNumberOfBlocksFast(_PREHASH_IntegerData);
-        for (i = 0; i < int_count; ++i)
-        {
-                msg->getU32("IntegerData", "IParam", int_buf, i);
-                integers.push_back(int_buf);
-        }
-}
-*/
-
-
-
-bool estate_dispatch_initialized = false;
-
-
-///----------------------------------------------------------------------------
-/// LLFloaterRegionInfo
-///----------------------------------------------------------------------------
-
-//S32 LLFloaterRegionInfo::sRequestSerial = 0;
-LLUUID LLFloaterRegionInfo::sRequestInvoice;
-
-LLFloaterRegionInfo::LLFloaterRegionInfo(const LLSD& seed)
-{
-        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_info.xml", NULL, FALSE);
-}
-
-BOOL LLFloaterRegionInfo::postBuild()
-{
-        mTab = getChild<LLTabContainer>("region_panels");
-
-        // contruct the panels
-        LLPanelRegionInfo* panel;
-        panel = new LLPanelRegionGeneralInfo;
-        mInfoPanels.push_back(panel);
-        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_general.xml");
-        mTab->addTabPanel(panel, panel->getLabel(), TRUE);
-
-        panel = new LLPanelRegionDebugInfo;
-        mInfoPanels.push_back(panel);
-        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_debug.xml");
-        mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-
-        panel = new LLPanelRegionTextureInfo;
-        mInfoPanels.push_back(panel);
-        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_texture.xml");
-        mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-
-        panel = new LLPanelRegionTerrainInfo;
-        mInfoPanels.push_back(panel);
-        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_terrain.xml");
-        mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-
-        panel = new LLPanelEstateInfo;
-        mInfoPanels.push_back(panel);
-        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_estate.xml");
-        mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-
-        panel = new LLPanelEstateCovenant;
-        mInfoPanels.push_back(panel);
-        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_covenant.xml");
-        mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-
-        gMessageSystem->setHandlerFunc(
-                "EstateOwnerMessage", 
-                &processEstateOwnerRequest);
-
-        return TRUE;
-}
-
-LLFloaterRegionInfo::~LLFloaterRegionInfo()
-{
-}
-
-void LLFloaterRegionInfo::onOpen()
-{
-        LLRect rect = gSavedSettings.getRect("FloaterRegionInfo");
-        S32 left, top;
-        gFloaterView->getNewFloaterPosition(&left, &top);
-        rect.translate(left,top);
-
-        refreshFromRegion(gAgent.getRegion());
-        requestRegionInfo();
-        LLFloater::onOpen();
-}
-
-// static
-void LLFloaterRegionInfo::requestRegionInfo()
-{
-        LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
-
-        tab->getChild<LLPanel>("General")->setCtrlsEnabled(FALSE);
-        tab->getChild<LLPanel>("Debug")->setCtrlsEnabled(FALSE);
-        tab->getChild<LLPanel>("Terrain")->setCtrlsEnabled(FALSE);
-        tab->getChild<LLPanel>("Estate")->setCtrlsEnabled(FALSE);
-
-        // Must allow anyone to request the RegionInfo data
-        // so non-owners/non-gods can see the values. 
-        // Therefore can't use an EstateOwnerMessage JC
-        LLMessageSystem* msg = gMessageSystem;
-        msg->newMessage("RequestRegionInfo");
-        msg->nextBlock("AgentData");
-        msg->addUUID("AgentID", gAgent.getID());
-        msg->addUUID("SessionID", gAgent.getSessionID());
-        gAgent.sendReliableMessage();
-}
-
-// static
-void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
-{
-        static LLDispatcher dispatch;
-        if(!findInstance())
-        {
-                return;
-        }
-        
-        if (!estate_dispatch_initialized)
-        {
-                LLPanelEstateInfo::initDispatch(dispatch);
-        }
-
-        LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
-        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
-
-        // unpack the message
-        std::string request;
-        LLUUID invoice;
-        LLDispatcher::sparam_t strings;
-        LLDispatcher::unpackMessage(msg, request, invoice, strings);
-        if(invoice != getLastInvoice())
-        {
-                llwarns << "Mismatched Estate message: " << request << llendl;
-                return;
-        }
-
-        //dispatch the message
-        dispatch.dispatch(request, invoice, strings);
-
-        LLViewerRegion* region = gAgent.getRegion();
-        panel->updateControls(region);
-}
-
-
-// static
-void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
-{
-        LLPanel* panel;
-
-        llinfos << "LLFloaterRegionInfo::processRegionInfo" << llendl;
-        if(!findInstance())
-        {
-                return;
-        }
-        
-        LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
-
-        LLViewerRegion* region = gAgent.getRegion();
-        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
-
-        // extract message
-        std::string sim_name;
-        std::string sim_type = LLTrans::getString("land_type_unknown");
-        U32 region_flags;
-        U8 agent_limit;
-        F32 object_bonus_factor;
-        U8 sim_access;
-        F32 water_height;
-        F32 terrain_raise_limit;
-        F32 terrain_lower_limit;
-        BOOL use_estate_sun;
-        F32 sun_hour;
-        msg->getString("RegionInfo", "SimName", sim_name);
-        msg->getU32("RegionInfo", "RegionFlags", region_flags);
-        msg->getU8("RegionInfo", "MaxAgents", agent_limit);
-        msg->getF32("RegionInfo", "ObjectBonusFactor", object_bonus_factor);
-        msg->getU8("RegionInfo", "SimAccess", sim_access);
-        msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_WaterHeight, water_height);
-        msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainRaiseLimit, terrain_raise_limit);
-        msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainLowerLimit, terrain_lower_limit);
-        msg->getBOOL("RegionInfo", "UseEstateSun", use_estate_sun);
-        // actually the "last set" sun hour, not the current sun hour. JC
-        msg->getF32("RegionInfo", "SunHour", sun_hour);
-        // the only reasonable way to decide if we actually have any data is to
-        // check to see if any of these fields have nonzero sizes
-        if (msg->getSize("RegionInfo2", "ProductSKU") > 0 ||
-                msg->getSize("RegionInfo2", "ProductName") > 0)
-        {
-                msg->getString("RegionInfo2", "ProductName", sim_type);
-        }
-
-        // GENERAL PANEL
-        panel = tab->getChild<LLPanel>("General");
-        panel->childSetValue("region_text", LLSD(sim_name));
-        panel->childSetValue("region_type", LLSD(sim_type));
-        panel->childSetValue("version_channel_text", gLastVersionChannel);
-
-        panel->childSetValue("block_terraform_check", (region_flags & REGION_FLAGS_BLOCK_TERRAFORM) ? TRUE : FALSE );
-        panel->childSetValue("block_fly_check", (region_flags & REGION_FLAGS_BLOCK_FLY) ? TRUE : FALSE );
-        panel->childSetValue("allow_damage_check", (region_flags & REGION_FLAGS_ALLOW_DAMAGE) ? TRUE : FALSE );
-        panel->childSetValue("restrict_pushobject", (region_flags & REGION_FLAGS_RESTRICT_PUSHOBJECT) ? TRUE : FALSE );
-        panel->childSetValue("allow_land_resell_check", (region_flags & REGION_FLAGS_BLOCK_LAND_RESELL) ? FALSE : TRUE );
-        panel->childSetValue("allow_parcel_changes_check", (region_flags & REGION_FLAGS_ALLOW_PARCEL_CHANGES) ? TRUE : FALSE );
-        panel->childSetValue("block_parcel_search_check", (region_flags & REGION_FLAGS_BLOCK_PARCEL_SEARCH) ? TRUE : FALSE );
-        panel->childSetValue("agent_limit_spin", LLSD((F32)agent_limit) );
-        panel->childSetValue("object_bonus_spin", LLSD(object_bonus_factor) );
-        panel->childSetValue("access_combo", LLSD(sim_access) );
-
-
-        // detect teen grid for maturity
-
-        U32 parent_estate_id;
-        msg->getU32("RegionInfo", "ParentEstateID", parent_estate_id);
-        BOOL teen_grid = (parent_estate_id == 5);  // *TODO add field to estate table and test that
-        panel->childSetEnabled("access_combo", gAgent.isGodlike() || (region && region->canManageEstate() && !teen_grid));
-        panel->setCtrlsEnabled(allow_modify);
-        
-
-        // DEBUG PANEL
-        panel = tab->getChild<LLPanel>("Debug");
-
-        panel->childSetValue("region_text", LLSD(sim_name) );
-        panel->childSetValue("disable_scripts_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_SCRIPTS)) );
-        panel->childSetValue("disable_collisions_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_COLLISIONS)) );
-        panel->childSetValue("disable_physics_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_PHYSICS)) );
-        panel->setCtrlsEnabled(allow_modify);
-
-        // TERRAIN PANEL
-        panel = tab->getChild<LLPanel>("Terrain");
-
-        panel->childSetValue("region_text", LLSD(sim_name));
-        panel->childSetValue("water_height_spin", LLSD(water_height));
-        panel->childSetValue("terrain_raise_spin", LLSD(terrain_raise_limit));
-        panel->childSetValue("terrain_lower_spin", LLSD(terrain_lower_limit));
-        panel->childSetValue("use_estate_sun_check", LLSD(use_estate_sun));
-
-        panel->childSetValue("fixed_sun_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SUN_FIXED)));
-        panel->childSetEnabled("fixed_sun_check", allow_modify && !use_estate_sun);
-        panel->childSetValue("sun_hour_slider", LLSD(sun_hour));
-        panel->childSetEnabled("sun_hour_slider", allow_modify && !use_estate_sun);
-        panel->setCtrlsEnabled(allow_modify);
-
-        getInstance()->refreshFromRegion( gAgent.getRegion() );
-}
-
-// static
-LLPanelEstateInfo* LLFloaterRegionInfo::getPanelEstate()
-{
-        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
-        if (!floater) return NULL;
-        LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
-        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
-        return panel;
-}
-
-// static
-LLPanelEstateCovenant* LLFloaterRegionInfo::getPanelCovenant()
-{
-        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
-        if (!floater) return NULL;
-        LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
-        LLPanelEstateCovenant* panel = (LLPanelEstateCovenant*)tab->getChild<LLPanel>("Covenant");
-        return panel;
-}
-
-void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region)
-{
-        // call refresh from region on all panels
-        std::for_each(
-                mInfoPanels.begin(),
-                mInfoPanels.end(),
-                llbind2nd(
-#if LL_WINDOWS
-                        std::mem_fun1(&LLPanelRegionInfo::refreshFromRegion),
-#else
-                        std::mem_fun(&LLPanelRegionInfo::refreshFromRegion),
-#endif
-                        region));
-}
-
-// public
-void LLFloaterRegionInfo::refresh()
-{
-        for(info_panels_t::iterator iter = mInfoPanels.begin();
-                iter != mInfoPanels.end(); ++iter)
-        {
-                (*iter)->refresh();
-        }
-}
-
-
-///----------------------------------------------------------------------------
-/// Local class implementation
-///----------------------------------------------------------------------------
-
-//
-// LLPanelRegionInfo
-//
-
-// static
-void LLPanelRegionInfo::onBtnSet(void* user_data)
-{
-        LLPanelRegionInfo* panel = (LLPanelRegionInfo*)user_data;
-        if(!panel) return;
-        if (panel->sendUpdate())
-        {
-                panel->disableButton("apply_btn");
-        }
-}
-
-//static 
-void LLPanelRegionInfo::onChangeChildCtrl(LLUICtrl* ctrl, void* user_data)
-{
-        if (ctrl)
-        {
-                LLPanelRegionInfo* panel = (LLPanelRegionInfo*) ctrl->getParent();
-                panel->updateChild(ctrl);
-        }
-}
-
-// static
-// Enables the "set" button if it is not already enabled
-void LLPanelRegionInfo::onChangeAnything(LLUICtrl* ctrl, void* user_data)
-{
-        LLPanelRegionInfo* panel = (LLPanelRegionInfo*)user_data;
-        if(panel)
-        {
-                panel->enableButton("apply_btn");
-                panel->refresh();
-        }
-}
-
-// static
-// Enables set button on change to line editor
-void LLPanelRegionInfo::onChangeText(LLLineEditor* caller, void* user_data)
-{
-        // reuse the previous method
-        onChangeAnything(0, user_data);
-}
-
-
-// virtual
-BOOL LLPanelRegionInfo::postBuild()
-{
-        childSetAction("apply_btn", onBtnSet, this);
-        childDisable("apply_btn");
-        refresh();
-        return TRUE;
-}
-
-// virtual 
-void LLPanelRegionInfo::updateChild(LLUICtrl* child_ctr)
-{
-}
-
-// virtual
-bool LLPanelRegionInfo::refreshFromRegion(LLViewerRegion* region)
-{
-        if (region) mHost = region->getHost();
-        return true;
-}
-
-void LLPanelRegionInfo::sendEstateOwnerMessage(
-        LLMessageSystem* msg,
-        const std::string& request,
-        const LLUUID& invoice,
-        const strings_t& strings)
-{
-        llinfos << "Sending estate request '" << request << "'" << llendl;
-        msg->newMessage("EstateOwnerMessage");
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-        msg->nextBlock("MethodData");
-        msg->addString("Method", request);
-        msg->addUUID("Invoice", invoice);
-        if(strings.empty())
-        {
-                msg->nextBlock("ParamList");
-                msg->addString("Parameter", NULL);
-        }
-        else
-        {
-                strings_t::const_iterator it = strings.begin();
-                strings_t::const_iterator end = strings.end();
-                for(; it != end; ++it)
-                {
-                        msg->nextBlock("ParamList");
-                        msg->addString("Parameter", *it);
-                }
-        }
-        msg->sendReliable(mHost);
-}
-
-void LLPanelRegionInfo::enableButton(const std::string& btn_name, BOOL enable)
-{
-        childSetEnabled(btn_name, enable);
-}
-
-void LLPanelRegionInfo::disableButton(const std::string& btn_name)
-{
-        childDisable(btn_name);
-}
-
-void LLPanelRegionInfo::initCtrl(const std::string& name)
-{
-        childSetCommitCallback(name, onChangeAnything, this);
-}
-
-void LLPanelRegionInfo::initHelpBtn(const std::string& name, const std::string& xml_alert)
-{
-        childSetAction(name, onClickHelp, new std::string(xml_alert));
-}
-
-// static
-void LLPanelRegionInfo::onClickHelp(void* data)
-{
-        std::string* xml_alert = (std::string*)data;
-        LLNotifications::instance().add(*xml_alert);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelRegionGeneralInfo
-//
-bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)
-{
-        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
-        setCtrlsEnabled(allow_modify);
-        childDisable("apply_btn");
-        childSetEnabled("access_text", allow_modify);
-        // childSetEnabled("access_combo", allow_modify);
-        // now set in processRegionInfo for teen grid detection
-        childSetEnabled("kick_btn", allow_modify);
-        childSetEnabled("kick_all_btn", allow_modify);
-        childSetEnabled("im_btn", allow_modify);
-        childSetEnabled("manage_telehub_btn", allow_modify);
-
-        // Data gets filled in by processRegionInfo
-
-        return LLPanelRegionInfo::refreshFromRegion(region);
-}
-
-BOOL LLPanelRegionGeneralInfo::postBuild()
-{
-        // Enable the "Apply" button if something is changed. JC
-        initCtrl("block_terraform_check");
-        initCtrl("block_fly_check");
-        initCtrl("allow_damage_check");
-        initCtrl("allow_land_resell_check");
-        initCtrl("allow_parcel_changes_check");
-        initCtrl("agent_limit_spin");
-        initCtrl("object_bonus_spin");
-        initCtrl("access_combo");
-        initCtrl("restrict_pushobject");
-        initCtrl("block_parcel_search_check");
-
-        initHelpBtn("terraform_help",           "HelpRegionBlockTerraform");
-        initHelpBtn("fly_help",                         "HelpRegionBlockFly");
-        initHelpBtn("damage_help",                      "HelpRegionAllowDamage");
-        initHelpBtn("agent_limit_help",         "HelpRegionAgentLimit");
-        initHelpBtn("object_bonus_help",        "HelpRegionObjectBonus");
-        initHelpBtn("access_help",                      "HelpRegionMaturity");
-        initHelpBtn("restrict_pushobject_help",         "HelpRegionRestrictPushObject");
-        initHelpBtn("land_resell_help", "HelpRegionLandResell");
-        initHelpBtn("parcel_changes_help", "HelpParcelChanges");
-        initHelpBtn("parcel_search_help", "HelpRegionSearch");
-
-        childSetAction("kick_btn", onClickKick, this);
-        childSetAction("kick_all_btn", onClickKickAll, this);
-        childSetAction("im_btn", onClickMessage, this);
-        childSetAction("manage_telehub_btn", onClickManageTelehub, this);
-
-        return LLPanelRegionInfo::postBuild();
-}
-
-// static
-void LLPanelRegionGeneralInfo::onClickKick(void* userdata)
-{
-        llinfos << "LLPanelRegionGeneralInfo::onClickKick" << llendl;
-        LLPanelRegionGeneralInfo* panelp = (LLPanelRegionGeneralInfo*)userdata;
-
-        // this depends on the grandparent view being a floater
-        // in order to set up floater dependency
-        LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
-        LLFloater* child_floater = LLFloaterAvatarPicker::show(onKickCommit, userdata, FALSE, TRUE);
-        parent_floater->addDependentFloater(child_floater);
-}
-
-// static
-void LLPanelRegionGeneralInfo::onKickCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata)
-{
-        if (names.empty() || ids.empty()) return;
-        if(ids[0].notNull())
-        {
-                LLPanelRegionGeneralInfo* self = (LLPanelRegionGeneralInfo*)userdata;
-                if(!self) return;
-                strings_t strings;
-                // [0] = our agent id
-                // [1] = target agent id
-                std::string buffer;
-                gAgent.getID().toString(buffer);
-                strings.push_back(buffer);
-
-                ids[0].toString(buffer);
-                strings.push_back(strings_t::value_type(buffer));
-
-                LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-                self->sendEstateOwnerMessage(gMessageSystem, "teleporthomeuser", invoice, strings);
-        }
-}
-
-// static
-void LLPanelRegionGeneralInfo::onClickKickAll(void* userdata)
-{
-        llinfos << "LLPanelRegionGeneralInfo::onClickKickAll" << llendl;
-        LLNotifications::instance().add("KickUsersFromRegion", 
-                                                                        LLSD(), 
-                                                                        LLSD(), 
-                                                                        boost::bind(&LLPanelRegionGeneralInfo::onKickAllCommit, (LLPanelRegionGeneralInfo*)userdata, _1, _2));
-}
-
-bool LLPanelRegionGeneralInfo::onKickAllCommit(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if (option == 0)
-        {
-                strings_t strings;
-                // [0] = our agent id
-                std::string buffer;
-                gAgent.getID().toString(buffer);
-                strings.push_back(buffer);
-
-                LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-                // historical message name
-                sendEstateOwnerMessage(gMessageSystem, "teleporthomeallusers", invoice, strings);
-        }
-        return false;
-}
-
-// static
-void LLPanelRegionGeneralInfo::onClickMessage(void* userdata)
-{
-        llinfos << "LLPanelRegionGeneralInfo::onClickMessage" << llendl;
-        LLNotifications::instance().add("MessageRegion", 
-                LLSD(), 
-                LLSD(), 
-                boost::bind(&LLPanelRegionGeneralInfo::onMessageCommit, (LLPanelRegionGeneralInfo*)userdata, _1, _2));
-}
-
-// static
-bool LLPanelRegionGeneralInfo::onMessageCommit(const LLSD& notification, const LLSD& response)
-{
-        if(LLNotification::getSelectedOption(notification, response) != 0) return false;
-
-        std::string text = response["message"].asString();
-        if (text.empty()) return false;
-
-        llinfos << "Message to everyone: " << text << llendl;
-        strings_t strings;
-        // [0] grid_x, unused here
-        // [1] grid_y, unused here
-        // [2] agent_id of sender
-        // [3] sender name
-        // [4] message
-        strings.push_back("-1");
-        strings.push_back("-1");
-        std::string buffer;
-        gAgent.getID().toString(buffer);
-        strings.push_back(buffer);
-        std::string name;
-        gAgent.buildFullname(name);
-        strings.push_back(strings_t::value_type(name));
-        strings.push_back(strings_t::value_type(text));
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        sendEstateOwnerMessage(gMessageSystem, "simulatormessage", invoice, strings);
-        return false;
-}
-
-// static
-void LLPanelRegionGeneralInfo::onClickManageTelehub(void* data)
-{
-        LLFloaterRegionInfo::getInstance()->close();
-
-        LLFloaterTelehub::show();
-}
-
-// setregioninfo
-// strings[0] = 'Y' - block terraform, 'N' - not
-// strings[1] = 'Y' - block fly, 'N' - not
-// strings[2] = 'Y' - allow damage, 'N' - not
-// strings[3] = 'Y' - allow land sale, 'N' - not
-// strings[4] = agent limit
-// strings[5] = object bonus
-// strings[6] = sim access (0 = unknown, 13 = PG, 21 = Mature, 42 = Adult)
-// strings[7] = restrict pushobject
-// strings[8] = 'Y' - allow parcel subdivide, 'N' - not
-// strings[9] = 'Y' - block parcel search, 'N' - allow
-BOOL LLPanelRegionGeneralInfo::sendUpdate()
-{
-        llinfos << "LLPanelRegionGeneralInfo::sendUpdate()" << llendl;
-
-        // First try using a Cap.  If that fails use the old method.
-        LLSD body;
-        std::string url = gAgent.getRegion()->getCapability("DispatchRegionInfo");
-        if (!url.empty())
-        {
-                body["block_terraform"] = childGetValue("block_terraform_check");
-                body["block_fly"] = childGetValue("block_fly_check");
-                body["allow_damage"] = childGetValue("allow_damage_check");
-                body["allow_land_resell"] = childGetValue("allow_land_resell_check");
-                body["agent_limit"] = childGetValue("agent_limit_spin");
-                body["prim_bonus"] = childGetValue("object_bonus_spin");
-                body["sim_access"] = childGetValue("access_combo");
-                body["restrict_pushobject"] = childGetValue("restrict_pushobject");
-                body["allow_parcel_changes"] = childGetValue("allow_parcel_changes_check");
-                body["block_parcel_search"] = childGetValue("block_parcel_search_check");
-
-                LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
-        }
-        else
-        {
-                strings_t strings;
-                std::string buffer;
-
-                buffer = llformat("%s", (childGetValue("block_terraform_check").asBoolean() ? "Y" : "N"));
-                strings.push_back(strings_t::value_type(buffer));
-
-                buffer = llformat("%s", (childGetValue("block_fly_check").asBoolean() ? "Y" : "N"));
-                strings.push_back(strings_t::value_type(buffer));
-
-                buffer = llformat("%s", (childGetValue("allow_damage_check").asBoolean() ? "Y" : "N"));
-                strings.push_back(strings_t::value_type(buffer));
-
-                buffer = llformat("%s", (childGetValue("allow_land_resell_check").asBoolean() ? "Y" : "N"));
-                strings.push_back(strings_t::value_type(buffer));
-
-                F32 value = (F32)childGetValue("agent_limit_spin").asReal();
-                buffer = llformat("%f", value);
-                strings.push_back(strings_t::value_type(buffer));
-
-                value = (F32)childGetValue("object_bonus_spin").asReal();
-                buffer = llformat("%f", value);
-                strings.push_back(strings_t::value_type(buffer));
-
-                buffer = llformat("%d", childGetValue("access_combo").asInteger());
-                strings.push_back(strings_t::value_type(buffer));
-
-                buffer = llformat("%s", (childGetValue("restrict_pushobject").asBoolean() ? "Y" : "N"));
-                strings.push_back(strings_t::value_type(buffer));
-
-                buffer = llformat("%s", (childGetValue("allow_parcel_changes_check").asBoolean() ? "Y" : "N"));
-                strings.push_back(strings_t::value_type(buffer));
-
-                LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-                sendEstateOwnerMessage(gMessageSystem, "setregioninfo", invoice, strings);
-        }
-
-        // if we changed access levels, tell user about it
-        LLViewerRegion* region = gAgent.getRegion();
-        if (region && (childGetValue("access_combo").asInteger() != region->getSimAccess()) )
-        {
-                LLNotifications::instance().add("RegionMaturityChange");
-        }       
-
-        return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelRegionDebugInfo
-/////////////////////////////////////////////////////////////////////////////
-BOOL LLPanelRegionDebugInfo::postBuild()
-{
-        LLPanelRegionInfo::postBuild();
-        initCtrl("disable_scripts_check");
-        initCtrl("disable_collisions_check");
-        initCtrl("disable_physics_check");
-
-        initHelpBtn("disable_scripts_help",             "HelpRegionDisableScripts");
-        initHelpBtn("disable_collisions_help",  "HelpRegionDisableCollisions");
-        initHelpBtn("disable_physics_help",             "HelpRegionDisablePhysics");
-        initHelpBtn("top_colliders_help",               "HelpRegionTopColliders");
-        initHelpBtn("top_scripts_help",                 "HelpRegionTopScripts");
-        initHelpBtn("restart_help",                             "HelpRegionRestart");
-
-        childSetAction("choose_avatar_btn", onClickChooseAvatar, this);
-        childSetAction("return_btn", onClickReturn, this);
-        childSetAction("top_colliders_btn", onClickTopColliders, this);
-        childSetAction("top_scripts_btn", onClickTopScripts, this);
-        childSetAction("restart_btn", onClickRestart, this);
-        childSetAction("cancel_restart_btn", onClickCancelRestart, this);
-
-        return TRUE;
-}
-
-// virtual
-bool LLPanelRegionDebugInfo::refreshFromRegion(LLViewerRegion* region)
-{
-        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
-        setCtrlsEnabled(allow_modify);
-        childDisable("apply_btn");
-        childDisable("target_avatar_name");
-        
-        childSetEnabled("choose_avatar_btn", allow_modify);
-        childSetEnabled("return_scripts", allow_modify && !mTargetAvatar.isNull());
-        childSetEnabled("return_other_land", allow_modify && !mTargetAvatar.isNull());
-        childSetEnabled("return_estate_wide", allow_modify && !mTargetAvatar.isNull());
-        childSetEnabled("return_btn", allow_modify && !mTargetAvatar.isNull());
-        childSetEnabled("top_colliders_btn", allow_modify);
-        childSetEnabled("top_scripts_btn", allow_modify);
-        childSetEnabled("restart_btn", allow_modify);
-        childSetEnabled("cancel_restart_btn", allow_modify);
-
-        return LLPanelRegionInfo::refreshFromRegion(region);
-}
-
-// virtual
-BOOL LLPanelRegionDebugInfo::sendUpdate()
-{
-        llinfos << "LLPanelRegionDebugInfo::sendUpdate" << llendl;
-        strings_t strings;
-        std::string buffer;
-
-        buffer = llformat("%s", (childGetValue("disable_scripts_check").asBoolean() ? "Y" : "N"));
-        strings.push_back(buffer);
-
-        buffer = llformat("%s", (childGetValue("disable_collisions_check").asBoolean() ? "Y" : "N"));
-        strings.push_back(buffer);
-
-        buffer = llformat("%s", (childGetValue("disable_physics_check").asBoolean() ? "Y" : "N"));
-        strings.push_back(buffer);
-
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        sendEstateOwnerMessage(gMessageSystem, "setregiondebug", invoice, strings);
-        return TRUE;
-}
-
-void LLPanelRegionDebugInfo::onClickChooseAvatar(void* data)
-{
-        LLFloaterAvatarPicker::show(callbackAvatarID, data, FALSE, TRUE);
-}
-
-// static
-void LLPanelRegionDebugInfo::callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data)
-{
-        LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*) data;
-        if (ids.empty() || names.empty()) return;
-        self->mTargetAvatar = ids[0];
-        self->childSetValue("target_avatar_name", LLSD(names[0]));
-        self->refreshFromRegion( gAgent.getRegion() );
-}
-
-// static
-void LLPanelRegionDebugInfo::onClickReturn(void* data)
-{
-        LLPanelRegionDebugInfo* panelp = (LLPanelRegionDebugInfo*) data;
-        if (panelp->mTargetAvatar.isNull()) return;
-
-        LLSD args;
-        args["USER_NAME"] = panelp->childGetValue("target_avatar_name").asString();
-        LLSD payload;
-        payload["avatar_id"] = panelp->mTargetAvatar;
-        
-        U32 flags = SWD_ALWAYS_RETURN_OBJECTS;
-
-        if (panelp->childGetValue("return_scripts").asBoolean())
-        {
-                flags |= SWD_SCRIPTED_ONLY;
-        }
-        
-        if (panelp->childGetValue("return_other_land").asBoolean())
-        {
-                flags |= SWD_OTHERS_LAND_ONLY;
-        }
-        payload["flags"] = int(flags);
-        payload["return_estate_wide"] = panelp->childGetValue("return_estate_wide").asBoolean();
-        LLNotifications::instance().add("EstateObjectReturn", args, payload, 
-                                                                        boost::bind(&LLPanelRegionDebugInfo::callbackReturn, panelp, _1, _2));
-}
-
-bool LLPanelRegionDebugInfo::callbackReturn(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if (option != 0) return false;
-
-        LLUUID target_avatar = notification["payload"]["avatar_id"].asUUID();
-        if (!target_avatar.isNull())
-        {
-                U32 flags = notification["payload"]["flags"].asInteger();
-                bool return_estate_wide = notification["payload"]["return_estate_wide"];
-                if (return_estate_wide)
-                {
-                        // send as estate message - routed by spaceserver to all regions in estate
-                        strings_t strings;
-                        strings.push_back(llformat("%d", flags));
-                        strings.push_back(target_avatar.asString());
-
-                        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-                
-                        sendEstateOwnerMessage(gMessageSystem, "estateobjectreturn", invoice, strings);
-                }
-                else
-                {
-                        // send to this simulator only
-                        send_sim_wide_deletes(target_avatar, flags);
-                }
-        }
-        return false;
-}
-
-
-// static
-void LLPanelRegionDebugInfo::onClickTopColliders(void* data)
-{
-        LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;
-        strings_t strings;
-        strings.push_back("1"); // one physics step
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        LLFloaterTopObjects::show();
-        LLFloaterTopObjects::clearList();
-        self->sendEstateOwnerMessage(gMessageSystem, "colliders", invoice, strings);
-}
-
-// static
-void LLPanelRegionDebugInfo::onClickTopScripts(void* data)
-{
-        LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;
-        strings_t strings;
-        strings.push_back("6"); // top 5 scripts
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        LLFloaterTopObjects::show();
-        LLFloaterTopObjects::clearList();
-        self->sendEstateOwnerMessage(gMessageSystem, "scripts", invoice, strings);
-}
-
-// static
-void LLPanelRegionDebugInfo::onClickRestart(void* data)
-{
-        LLNotifications::instance().add("ConfirmRestart", LLSD(), LLSD(), 
-                boost::bind(&LLPanelRegionDebugInfo::callbackRestart, (LLPanelRegionDebugInfo*)data, _1, _2));
-}
-
-bool LLPanelRegionDebugInfo::callbackRestart(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if (option != 0) return false;
-
-        strings_t strings;
-        strings.push_back("120");
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        sendEstateOwnerMessage(gMessageSystem, "restart", invoice, strings);
-        return false;
-}
-
-// static
-void LLPanelRegionDebugInfo::onClickCancelRestart(void* data)
-{
-        LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;
-        strings_t strings;
-        strings.push_back("-1");
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        self->sendEstateOwnerMessage(gMessageSystem, "restart", invoice, strings);
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelRegionTextureInfo
-//
-LLPanelRegionTextureInfo::LLPanelRegionTextureInfo() : LLPanelRegionInfo()
-{
-        // nothing.
-}
-
-bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)
-{
-        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
-        setCtrlsEnabled(allow_modify);
-        childDisable("apply_btn");
-
-        if (region)
-        {
-                childSetValue("region_text", LLSD(region->getName()));
-        }
-        else
-        {
-                childSetValue("region_text", LLSD(""));
-        }
-
-        if (!region) return LLPanelRegionInfo::refreshFromRegion(region);
-
-        LLVLComposition* compp = region->getComposition();
-        LLTextureCtrl* texture_ctrl;
-        std::string buffer;
-        for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
-        {
-                buffer = llformat("texture_detail_%d", i);
-                texture_ctrl = getChild<LLTextureCtrl>(buffer);
-                if(texture_ctrl)
-                {
-                        lldebugs << "Detail Texture " << i << ": "
-                                         << compp->getDetailTextureID(i) << llendl;
-                        LLUUID tmp_id(compp->getDetailTextureID(i));
-                        texture_ctrl->setImageAssetID(tmp_id);
-                }
-        }
-
-        for(S32 i = 0; i < CORNER_COUNT; ++i)
-    {
-                buffer = llformat("height_start_spin_%d", i);
-                childSetValue(buffer, LLSD(compp->getStartHeight(i)));
-                buffer = llformat("height_range_spin_%d", i);
-                childSetValue(buffer, LLSD(compp->getHeightRange(i)));
-        }
-
-        // Call the parent for common book-keeping
-        return LLPanelRegionInfo::refreshFromRegion(region);
-}
-
-
-BOOL LLPanelRegionTextureInfo::postBuild()
-{
-        LLPanelRegionInfo::postBuild();
-        std::string buffer;
-        for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
-        {
-                buffer = llformat("texture_detail_%d", i);
-                initCtrl(buffer);
-        }
-
-        for(S32 i = 0; i < CORNER_COUNT; ++i)
-        {
-                buffer = llformat("height_start_spin_%d", i);
-                initCtrl(buffer);
-                buffer = llformat("height_range_spin_%d", i);
-                initCtrl(buffer);
-        }
-
-//      LLButton* btn = new LLButton("dump", LLRect(0, 20, 100, 0), "", onClickDump, this);
-//      btn->setFollows(FOLLOWS_TOP|FOLLOWS_LEFT);
-//      addChild(btn);
-
-        return LLPanelRegionInfo::postBuild();
-}
-
-BOOL LLPanelRegionTextureInfo::sendUpdate()
-{
-        llinfos << "LLPanelRegionTextureInfo::sendUpdate()" << llendl;
-
-        // Make sure user hasn't chosen wacky textures.
-        if (!validateTextureSizes())
-        {
-                return FALSE;
-        }
-
-        LLTextureCtrl* texture_ctrl;
-        std::string buffer;
-        std::string id_str;
-        LLMessageSystem* msg = gMessageSystem;
-        strings_t strings;
-
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        
-        for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
-        {
-                buffer = llformat("texture_detail_%d", i);
-                texture_ctrl = getChild<LLTextureCtrl>(buffer);
-                if(texture_ctrl)
-                {
-                        LLUUID tmp_id(texture_ctrl->getImageAssetID());
-                        tmp_id.toString(id_str);
-                        buffer = llformat("%d %s", i, id_str.c_str());
-                        strings.push_back(buffer);
-                }
-        }
-        sendEstateOwnerMessage(msg, "texturedetail", invoice, strings);
-        strings.clear();
-        for(S32 i = 0; i < CORNER_COUNT; ++i)
-        {
-                buffer = llformat("height_start_spin_%d", i);
-                std::string buffer2 = llformat("height_range_spin_%d", i);
-                std::string buffer3 = llformat("%d %f %f", i, (F32)childGetValue(buffer).asReal(), (F32)childGetValue(buffer2).asReal());
-                strings.push_back(buffer3);
-        }
-        sendEstateOwnerMessage(msg, "textureheights", invoice, strings);
-        strings.clear();
-        sendEstateOwnerMessage(msg, "texturecommit", invoice, strings);
-        return TRUE;
-}
-
-BOOL LLPanelRegionTextureInfo::validateTextureSizes()
-{
-        for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
-        {
-                std::string buffer;
-                buffer = llformat("texture_detail_%d", i);
-                LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(buffer);
-                if (!texture_ctrl) continue;
-
-                LLUUID image_asset_id = texture_ctrl->getImageAssetID();
-                LLViewerImage* img = gImageList.getImage(image_asset_id);
-                S32 components = img->getComponents();
-                // Must ask for highest resolution version's width. JC
-                S32 width = img->getWidth(0);
-                S32 height = img->getHeight(0);
-
-                //llinfos << "texture detail " << i << " is " << width << "x" << height << "x" << components << llendl;
-
-                if (components != 3)
-                {
-                        LLSD args;
-                        args["TEXTURE_NUM"] = i+1;
-                        args["TEXTURE_BIT_DEPTH"] = llformat("%d",components * 8);
-                        LLNotifications::instance().add("InvalidTerrainBitDepth", args);
-                        return FALSE;
-                }
-
-                if (width > 512 || height > 512)
-                {
-
-                        LLSD args;
-                        args["TEXTURE_NUM"] = i+1;
-                        args["TEXTURE_SIZE_X"] = width;
-                        args["TEXTURE_SIZE_Y"] = height;
-                        LLNotifications::instance().add("InvalidTerrainSize", args);
-                        return FALSE;
-                        
-                }
-        }
-
-        return TRUE;
-}
-
-
-// static
-void LLPanelRegionTextureInfo::onClickDump(void* data)
-{
-        llinfos << "LLPanelRegionTextureInfo::onClickDump()" << llendl;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelRegionTerrainInfo
-/////////////////////////////////////////////////////////////////////////////
-BOOL LLPanelRegionTerrainInfo::postBuild()
-{
-        LLPanelRegionInfo::postBuild();
-
-        initHelpBtn("water_height_help",        "HelpRegionWaterHeight");
-        initHelpBtn("terrain_raise_help",       "HelpRegionTerrainRaise");
-        initHelpBtn("terrain_lower_help",       "HelpRegionTerrainLower");
-        initHelpBtn("upload_raw_help",          "HelpRegionUploadRaw");
-        initHelpBtn("download_raw_help",        "HelpRegionDownloadRaw");
-        initHelpBtn("use_estate_sun_help",      "HelpRegionUseEstateSun");
-        initHelpBtn("fixed_sun_help",           "HelpRegionFixedSun");
-        initHelpBtn("bake_terrain_help",        "HelpRegionBakeTerrain");
-
-        initCtrl("water_height_spin");
-        initCtrl("terrain_raise_spin");
-        initCtrl("terrain_lower_spin");
-
-        initCtrl("fixed_sun_check");
-        childSetCommitCallback("fixed_sun_check", onChangeFixedSun, this);
-        childSetCommitCallback("use_estate_sun_check", onChangeUseEstateTime, this);
-        childSetCommitCallback("sun_hour_slider", onChangeSunHour, this);
-
-        childSetAction("download_raw_btn", onClickDownloadRaw, this);
-        childSetAction("upload_raw_btn", onClickUploadRaw, this);
-        childSetAction("bake_terrain_btn", onClickBakeTerrain, this);
-
-        return TRUE;
-}
-
-// virtual
-bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region)
-{
-        llinfos << "LLPanelRegionTerrainInfo::refreshFromRegion" << llendl;
-
-        BOOL owner_or_god = gAgent.isGodlike() 
-                                                || (region && (region->getOwner() == gAgent.getID()));
-        BOOL owner_or_god_or_manager = owner_or_god
-                                                || (region && region->isEstateManager());
-        setCtrlsEnabled(owner_or_god_or_manager);
-        childDisable("apply_btn");
-
-        childSetEnabled("download_raw_btn", owner_or_god);
-        childSetEnabled("upload_raw_btn", owner_or_god);
-        childSetEnabled("bake_terrain_btn", owner_or_god);
-
-        return LLPanelRegionInfo::refreshFromRegion(region);
-}
-
-// virtual
-BOOL LLPanelRegionTerrainInfo::sendUpdate()
-{
-        llinfos << "LLPanelRegionTerrainInfo::sendUpdate" << llendl;
-        std::string buffer;
-        strings_t strings;
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-
-        buffer = llformat("%f", (F32)childGetValue("water_height_spin").asReal());
-        strings.push_back(buffer);
-        buffer = llformat("%f", (F32)childGetValue("terrain_raise_spin").asReal());
-        strings.push_back(buffer);
-        buffer = llformat("%f", (F32)childGetValue("terrain_lower_spin").asReal());
-        strings.push_back(buffer);
-        buffer = llformat("%s", (childGetValue("use_estate_sun_check").asBoolean() ? "Y" : "N"));
-        strings.push_back(buffer);
-        buffer = llformat("%s", (childGetValue("fixed_sun_check").asBoolean() ? "Y" : "N"));
-        strings.push_back(buffer);
-        buffer = llformat("%f", (F32)childGetValue("sun_hour_slider").asReal() );
-        strings.push_back(buffer);
-
-        // Grab estate information in case the user decided to set the
-        // region back to estate time. JC
-        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
-        if (!floater) return true;
-
-        LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
-        if (!tab) return true;
-
-        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
-        if (!panel) return true;
-
-        BOOL estate_global_time = panel->getGlobalTime();
-        BOOL estate_fixed_sun = panel->getFixedSun();
-        F32 estate_sun_hour;
-        if (estate_global_time)
-        {
-                estate_sun_hour = 0.f;
-        }
-        else
-        {
-                estate_sun_hour = panel->getSunHour();
-        }
-
-        buffer = llformat("%s", (estate_global_time ? "Y" : "N") );
-        strings.push_back(buffer);
-        buffer = llformat("%s", (estate_fixed_sun ? "Y" : "N") );
-        strings.push_back(buffer);
-        buffer = llformat("%f", estate_sun_hour);
-        strings.push_back(buffer);
-
-        sendEstateOwnerMessage(gMessageSystem, "setregionterrain", invoice, strings);
-        return TRUE;
-}
-
-// static 
-void LLPanelRegionTerrainInfo::onChangeUseEstateTime(LLUICtrl* ctrl, void* user_data)
-{
-        LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) user_data;
-        if (!panel) return;
-        BOOL use_estate_sun = panel->childGetValue("use_estate_sun_check").asBoolean();
-        panel->childSetEnabled("fixed_sun_check", !use_estate_sun);
-        panel->childSetEnabled("sun_hour_slider", !use_estate_sun);
-        if (use_estate_sun)
-        {
-                panel->childSetValue("fixed_sun_check", LLSD(FALSE));
-                panel->childSetValue("sun_hour_slider", LLSD(0.f));
-        }
-        panel->childEnable("apply_btn");
-}
-
-// static 
-void LLPanelRegionTerrainInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)
-{
-        LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) user_data;
-        if (!panel) return;
-        // Just enable the apply button.  We let the sun-hour slider be enabled
-        // for both fixed-sun and non-fixed-sun. JC
-        panel->childEnable("apply_btn");
-}
-
-// static 
-void LLPanelRegionTerrainInfo::onChangeSunHour(LLUICtrl* ctrl, void*)
-{
-        // can't use userdata to get panel, slider uses it internally
-        LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) ctrl->getParent();
-        if (!panel) return;
-        panel->childEnable("apply_btn");
-}
-
-// static
-void LLPanelRegionTerrainInfo::onClickDownloadRaw(void* data)
-{
-        LLFilePicker& picker = LLFilePicker::instance();
-        if (!picker.getSaveFile(LLFilePicker::FFSAVE_RAW, "terrain.raw"))
-        {
-                llwarns << "No file" << llendl;
-                return;
-        }
-        std::string filepath = picker.getFirstFile();
-        gXferManager->expectFileForRequest(filepath);
-
-        LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
-        strings_t strings;
-        strings.push_back("download filename");
-        strings.push_back(filepath);
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        self->sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);
-}
-
-// static
-void LLPanelRegionTerrainInfo::onClickUploadRaw(void* data)
-{
-        LLFilePicker& picker = LLFilePicker::instance();
-        if (!picker.getOpenFile(LLFilePicker::FFLOAD_RAW))
-        {
-                llwarns << "No file" << llendl;
-                return;
-        }
-        std::string filepath = picker.getFirstFile();
-        gXferManager->expectFileForTransfer(filepath);
-
-        LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
-        strings_t strings;
-        strings.push_back("upload filename");
-        strings.push_back(filepath);
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        self->sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);
-
-        LLNotifications::instance().add("RawUploadStarted");
-}
-
-// static
-void LLPanelRegionTerrainInfo::onClickBakeTerrain(void* data)
-{
-        LLNotifications::instance().add(
-                LLNotification::Params("ConfirmBakeTerrain")
-                .functor(boost::bind(&LLPanelRegionTerrainInfo::callbackBakeTerrain, (LLPanelRegionTerrainInfo*)data, _1, _2)));
-}
-
-bool LLPanelRegionTerrainInfo::callbackBakeTerrain(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if (option != 0) return false;
-
-        strings_t strings;
-        strings.push_back("bake");
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);
-        return false;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelEstateInfo
-//
-
-LLPanelEstateInfo::LLPanelEstateInfo() 
-:       LLPanelRegionInfo(),
-        mEstateID(0)    // invalid
-{
-}
-
-// static
-void LLPanelEstateInfo::initDispatch(LLDispatcher& dispatch)
-{
-        std::string name;
-
-//      name.assign("setowner");
-//      static LLDispatchSetEstateOwner set_owner;
-//      dispatch.addHandler(name, &set_owner);
-
-        name.assign("estateupdateinfo");
-        static LLDispatchEstateUpdateInfo estate_update_info;
-        dispatch.addHandler(name, &estate_update_info);
-
-        name.assign("setaccess");
-        static LLDispatchSetEstateAccess set_access;
-        dispatch.addHandler(name, &set_access);
-
-        estate_dispatch_initialized = true;
-}
-
-// static
-// Disables the sun-hour slider and the use fixed time check if the use global time is check
-void LLPanelEstateInfo::onChangeUseGlobalTime(LLUICtrl* ctrl, void* user_data)
-{
-        LLPanelEstateInfo* panel = (LLPanelEstateInfo*) user_data;
-        if (panel)
-        {
-                bool enabled = !panel->childGetValue("use_global_time_check").asBoolean();
-                panel->childSetEnabled("sun_hour_slider", enabled);
-                panel->childSetEnabled("fixed_sun_check", enabled);
-                panel->childSetValue("fixed_sun_check", LLSD(FALSE));
-                panel->enableButton("apply_btn");
-        }
-}
-
-// Enables the sun-hour slider if the fixed-sun checkbox is set
-void LLPanelEstateInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)
-{
-        LLPanelEstateInfo* panel = (LLPanelEstateInfo*) user_data;
-        if (panel)
-        {
-                bool enabled = !panel->childGetValue("fixed_sun_check").asBoolean();
-                panel->childSetEnabled("use_global_time_check", enabled);
-                panel->childSetValue("use_global_time_check", LLSD(FALSE));
-                panel->enableButton("apply_btn");
-        }
-}
-
-
-
-
-//---------------------------------------------------------------------------
-// Add/Remove estate access button callbacks
-//---------------------------------------------------------------------------
-void LLPanelEstateInfo::onClickEditSky(void* user_data)
-{
-        LLFloaterWindLight::show();
-}
-
-void LLPanelEstateInfo::onClickEditDayCycle(void* user_data)
-{
-        LLFloaterDayCycle::show();
-}
-
-// static
-void LLPanelEstateInfo::onClickAddAllowedAgent(void* user_data)
-{
-        LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
-        LLCtrlListInterface *list = self->childGetListInterface("allowed_avatar_name_list");
-        if (!list) return;
-        if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
-        {
-                //args
-
-                LLSD args;
-                args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
-                LLNotifications::instance().add("MaxAllowedAgentOnRegion", args);
-                return;
-        }
-        accessAddCore(ESTATE_ACCESS_ALLOWED_AGENT_ADD, "EstateAllowedAgentAdd");
-}
-
-// static
-void LLPanelEstateInfo::onClickRemoveAllowedAgent(void* user_data)
-{
-        accessRemoveCore(ESTATE_ACCESS_ALLOWED_AGENT_REMOVE, "EstateAllowedAgentRemove", "allowed_avatar_name_list");
-}
-
-// static
-void LLPanelEstateInfo::onClickAddAllowedGroup(void* user_data)
-{
-        LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
-        LLCtrlListInterface *list = self->childGetListInterface("allowed_group_name_list");
-        if (!list) return;
-        if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
-        {
-                LLSD args;
-                args["MAX_GROUPS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
-                LLNotifications::instance().add("MaxAllowedGroupsOnRegion", args);
-                return;
-        }
-
-        LLNotification::Params params("ChangeLindenAccess");
-        params.functor(boost::bind(&LLPanelEstateInfo::addAllowedGroup, self, _1, _2));
-        if (isLindenEstate())
-        {
-                LLNotifications::instance().add(params);
-        }
-        else
-        {
-                LLNotifications::instance().forceResponse(params, 0);
-        }
-}
-
-bool LLPanelEstateInfo::addAllowedGroup(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if (option != 0) return false;
-
-        LLFloater* parent_floater = gFloaterView->getParentFloater(this);
-
-        LLFloaterGroupPicker* widget;
-        widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
-        if (widget)
-        {
-                widget->setSelectCallback(addAllowedGroup2, NULL);
-                if (parent_floater)
-                {
-                        LLRect new_rect = gFloaterView->findNeighboringPosition(parent_floater, widget);
-                        widget->setOrigin(new_rect.mLeft, new_rect.mBottom);
-                        parent_floater->addDependentFloater(widget);
-                }
-        }
-
-        return false;
-}
-
-// static
-void LLPanelEstateInfo::onClickRemoveAllowedGroup(void* user_data)
-{
-        accessRemoveCore(ESTATE_ACCESS_ALLOWED_GROUP_REMOVE, "EstateAllowedGroupRemove", "allowed_group_name_list");
-}
-
-// static
-void LLPanelEstateInfo::onClickAddBannedAgent(void* user_data)
-{
-        LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
-        LLCtrlListInterface *list = self->childGetListInterface("banned_avatar_name_list");
-        if (!list) return;
-        if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
-        {
-                LLSD args;
-                args["MAX_BANNED"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
-                LLNotifications::instance().add("MaxBannedAgentsOnRegion", args);
-                return;
-        }
-        accessAddCore(ESTATE_ACCESS_BANNED_AGENT_ADD, "EstateBannedAgentAdd");
-}
-
-// static
-void LLPanelEstateInfo::onClickRemoveBannedAgent(void* user_data)
-{
-        accessRemoveCore(ESTATE_ACCESS_BANNED_AGENT_REMOVE, "EstateBannedAgentRemove", "banned_avatar_name_list");
-}
-
-// static
-void LLPanelEstateInfo::onClickAddEstateManager(void* user_data)
-{
-        LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
-        LLCtrlListInterface *list = self->childGetListInterface("estate_manager_name_list");
-        if (!list) return;
-        if (list->getItemCount() >= ESTATE_MAX_MANAGERS)
-        {       // Tell user they can't add more managers
-                LLSD args;
-                args["MAX_MANAGER"] = llformat("%d",ESTATE_MAX_MANAGERS);
-                LLNotifications::instance().add("MaxManagersOnRegion", args);
-        }
-        else
-        {       // Go pick managers to add
-                accessAddCore(ESTATE_ACCESS_MANAGER_ADD, "EstateManagerAdd");
-        }
-}
-
-// static
-void LLPanelEstateInfo::onClickRemoveEstateManager(void* user_data)
-{
-        accessRemoveCore(ESTATE_ACCESS_MANAGER_REMOVE, "EstateManagerRemove", "estate_manager_name_list");
-}
-
-//---------------------------------------------------------------------------
-// Kick from estate methods
-//---------------------------------------------------------------------------
-struct LLKickFromEstateInfo
-{
-        LLPanelEstateInfo *mEstatePanelp;
-        LLUUID      mAgentID;
-};
-
-void LLPanelEstateInfo::onClickKickUser(void *user_data)
-{
-        LLPanelEstateInfo* panelp = (LLPanelEstateInfo*)user_data;
-
-        // this depends on the grandparent view being a floater
-        // in order to set up floater dependency
-        LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
-        LLFloater* child_floater = LLFloaterAvatarPicker::show(LLPanelEstateInfo::onKickUserCommit, user_data, FALSE, TRUE);
-        parent_floater->addDependentFloater(child_floater);
-}
-
-void LLPanelEstateInfo::onKickUserCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata)
-{
-        if (names.empty() || ids.empty()) return;
-        
-        //check to make sure there is one valid user and id
-        if( (ids[0].isNull()) ||
-                (names[0].length() == 0) )
-        {
-                return;
-        }
-
-        LLPanelEstateInfo* self = (LLPanelEstateInfo*)userdata;
-        if(!self) return;
-
-        //keep track of what user they want to kick and other misc info
-        LLKickFromEstateInfo *kick_info = new LLKickFromEstateInfo();
-        kick_info->mEstatePanelp = self;
-        kick_info->mAgentID     = ids[0];
-
-        //Bring up a confirmation dialog
-        LLSD args;
-        args["EVIL_USER"] = names[0];
-        LLSD payload;
-        payload["agent_id"] = ids[0];
-        LLNotifications::instance().add("EstateKickUser", args, payload, boost::bind(&LLPanelEstateInfo::kickUserConfirm, self, _1, _2));
-
-}
-
-bool LLPanelEstateInfo::kickUserConfirm(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        switch(option)
-        {
-        case 0:
-                {
-                        //Kick User
-                        strings_t strings;
-                        strings.push_back(notification["payload"]["agent_id"].asString());
-
-                        sendEstateOwnerMessage(gMessageSystem, "kickestate", LLFloaterRegionInfo::getLastInvoice(), strings);
-                        break;
-                }
-        default:
-                break;
-        }
-        return false;
-}
-
-//---------------------------------------------------------------------------
-// Core Add/Remove estate access methods
-// TODO: INTERNATIONAL: don't build message text here;
-// instead, create multiple translatable messages and choose
-// one based on the status.
-//---------------------------------------------------------------------------
-std::string all_estates_text()
-{
-        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-        if (!panel) return "(error)";
-
-        std::string owner = panel->getOwnerName();
-
-        LLViewerRegion* region = gAgent.getRegion();
-        if (gAgent.isGodlike())
-        {
-                return llformat("all estates\nowned by %s", owner.c_str());
-        }
-        else if (region && region->getOwner() == gAgent.getID())
-        {
-                return "all estates you own";
-        }
-        else if (region && region->isEstateManager())
-        {
-                return llformat("all estates that\nyou manage for %s", owner.c_str());
-        }
-        else
-        {
-                return "(error)";
-        }
-}
-
-// static
-bool LLPanelEstateInfo::isLindenEstate()
-{
-        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-        if (!panel) return false;
-
-        U32 estate_id = panel->getEstateID();
-        return (estate_id <= ESTATE_LAST_LINDEN);
-}
-
-typedef std::vector<LLUUID> AgentOrGroupIDsVector;
-struct LLEstateAccessChangeInfo
-{
-        LLEstateAccessChangeInfo(const LLSD& sd)
-        {
-                mDialogName = sd["dialog_name"].asString();
-                mOperationFlag = (U32)sd["operation"].asInteger();
-                LLSD::array_const_iterator end_it = sd["allowed_ids"].endArray();
-                for (LLSD::array_const_iterator id_it = sd["allowed_ids"].beginArray();
-                        id_it != end_it;
-                        ++id_it)
-                {
-                        mAgentOrGroupIDs.push_back(id_it->asUUID());
-                }
-        }
-
-        const LLSD asLLSD() const
-        {
-                LLSD sd;
-                sd["name"] = mDialogName;
-                sd["operation"] = (S32)mOperationFlag;
-                for (AgentOrGroupIDsVector::const_iterator it = mAgentOrGroupIDs.begin();
-                        it != mAgentOrGroupIDs.end();
-                        ++it)
-                {
-                        sd["allowed_ids"].append(*it);
-                }
-                return sd;
-        }
-
-        U32 mOperationFlag;     // ESTATE_ACCESS_BANNED_AGENT_ADD, _REMOVE, etc.
-        std::string mDialogName;
-        AgentOrGroupIDsVector mAgentOrGroupIDs; // List of agent IDs to apply to this change
-};
-
-// Special case callback for groups, since it has different callback format than names
-// static
-void LLPanelEstateInfo::addAllowedGroup2(LLUUID id, void* user_data)
-{
-        LLSD payload;
-        payload["operation"] = (S32)ESTATE_ACCESS_ALLOWED_GROUP_ADD;
-        payload["dialog_name"] = "EstateAllowedGroupAdd";
-        payload["allowed_ids"].append(id);
-
-        LLSD args;
-        args["ALL_ESTATES"] = all_estates_text();
-
-        LLNotification::Params params("EstateAllowedGroupAdd");
-        params.payload(payload)
-                .substitutions(args)
-                .functor(accessCoreConfirm);
-        if (isLindenEstate())
-        {
-                LLNotifications::instance().forceResponse(params, 0);
-        }
-        else
-        {
-                LLNotifications::instance().add(params);
-        }
-}
-
-// static
-void LLPanelEstateInfo::accessAddCore(U32 operation_flag, const std::string& dialog_name)
-{
-        LLSD payload;
-        payload["operation"] = (S32)operation_flag;
-        payload["dialog_name"] = dialog_name;
-        // agent id filled in after avatar picker
-
-        LLNotification::Params params("ChangeLindenAccess");
-        params.payload(payload)
-                .functor(accessAddCore2);
-
-        if (isLindenEstate())
-        {
-                LLNotifications::instance().add(params);
-        }
-        else
-        {
-                // same as clicking "OK"
-                LLNotifications::instance().forceResponse(params, 0);
-        }
-}
-
-// static
-bool LLPanelEstateInfo::accessAddCore2(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if (option != 0)
-        {
-                // abort change
-                return false;
-        }
-
-        LLEstateAccessChangeInfo* change_info = new LLEstateAccessChangeInfo(notification["payload"]);
-        // avatar picker yes multi-select, yes close-on-select
-        LLFloaterAvatarPicker::show(accessAddCore3, (void*)change_info, TRUE, TRUE);
-        return false;
-}
-
-// static
-void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data)
-{
-        LLEstateAccessChangeInfo* change_info = (LLEstateAccessChangeInfo*)data;
-        if (!change_info) return;
-        if (ids.empty()) 
-        {
-                // User didn't select a name.
-                delete change_info;
-                change_info = NULL;
-                return;
-        }
-        // User did select a name.
-        change_info->mAgentOrGroupIDs = ids;
-        // Can't put estate owner on ban list
-        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-        if (!panel) return;
-        LLViewerRegion* region = gAgent.getRegion();
-        if (!region) return;
-        
-        if (change_info->mOperationFlag & ESTATE_ACCESS_ALLOWED_AGENT_ADD)
-        {
-                LLCtrlListInterface *list = panel->childGetListInterface("allowed_avatar_name_list");
-                int currentCount = (list ? list->getItemCount() : 0);
-                if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
-                {
-                        LLSD args;
-                        args["NUM_ADDED"] = llformat("%d",ids.size());
-                        args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
-                        args["LIST_TYPE"] = "Allowed Residents";
-                        args["NUM_EXCESS"] = llformat("%d",(ids.size()+currentCount)-ESTATE_MAX_ACCESS_IDS);
-                        LLNotifications::instance().add("MaxAgentOnRegionBatch", args);
-                        delete change_info;
-                        return;
-                }
-        }
-        if (change_info->mOperationFlag & ESTATE_ACCESS_BANNED_AGENT_ADD)
-        {
-                LLCtrlListInterface *list = panel->childGetListInterface("banned_avatar_name_list");
-                int currentCount = (list ? list->getItemCount() : 0);
-                if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
-                {
-                        LLSD args;
-                        args["NUM_ADDED"] = llformat("%d",ids.size());
-                        args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
-                        args["LIST_TYPE"] = "Banned Residents";
-                        args["NUM_EXCESS"] = llformat("%d",(ids.size()+currentCount)-ESTATE_MAX_ACCESS_IDS);
-                        LLNotifications::instance().add("MaxAgentOnRegionBatch", args);
-                        delete change_info;
-                        return;
-                }
-        }
-
-        LLSD args;
-        args["ALL_ESTATES"] = all_estates_text();
-
-        LLNotification::Params params(change_info->mDialogName);
-        params.substitutions(args)
-                .payload(change_info->asLLSD())
-                .functor(accessCoreConfirm);
-
-        if (isLindenEstate())
-        {
-                // just apply to this estate
-                LLNotifications::instance().forceResponse(params, 0);
-        }
-        else
-        {
-                // ask if this estate or all estates with this owner
-                LLNotifications::instance().add(params);
-        }
-}
-
-// static
-void LLPanelEstateInfo::accessRemoveCore(U32 operation_flag, const std::string& dialog_name, const std::string& list_ctrl_name)
-{
-        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-        if (!panel) return;
-        LLNameListCtrl* name_list = panel->getChild<LLNameListCtrl>(list_ctrl_name);
-        if (!name_list) return;
-
-        std::vector<LLScrollListItem*> list_vector = name_list->getAllSelected();
-        if (list_vector.size() == 0)
-                return;
-
-        LLSD payload;
-        payload["operation"] = (S32)operation_flag;
-        payload["dialog_name"] = dialog_name;
-        
-        for (std::vector<LLScrollListItem*>::const_iterator iter = list_vector.begin();
-             iter != list_vector.end();
-             iter++)
-        {
-                LLScrollListItem *item = (*iter);
-                payload["allowed_ids"].append(item->getUUID());
-        }
-        
-        LLNotification::Params params("ChangeLindenAccess");
-        params.payload(payload)
-                .functor(accessRemoveCore2);
-
-        if (isLindenEstate())
-        {
-                // warn on change linden estate
-                LLNotifications::instance().add(params);
-        }
-        else
-        {
-                // just proceed, as if clicking OK
-                LLNotifications::instance().forceResponse(params, 0);
-        }
-}
-
-// static
-bool LLPanelEstateInfo::accessRemoveCore2(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        if (option != 0)
-        {
-                // abort
-                return false;
-        }
-
-        // If Linden estate, can only apply to "this" estate, not all estates
-        // owned by NULL.
-        if (isLindenEstate())
-        {
-                accessCoreConfirm(notification, response);
-        }
-        else
-        {
-                LLSD args;
-                args["ALL_ESTATES"] = all_estates_text();
-                LLNotifications::instance().add(notification["payload"]["dialog_name"], 
-                                                                                args,
-                                                                                notification["payload"],
-                                                                                accessCoreConfirm);
-        }
-        return false;
-}
-
-// Used for both access add and remove operations, depending on the mOperationFlag
-// passed in (ESTATE_ACCESS_BANNED_AGENT_ADD, ESTATE_ACCESS_ALLOWED_AGENT_REMOVE, etc.)
-// static
-bool LLPanelEstateInfo::accessCoreConfirm(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        const U32 originalFlags = (U32)notification["payload"]["operation"].asInteger();
-
-        LLViewerRegion* region = gAgent.getRegion();
-        
-        LLSD::array_const_iterator end_it = notification["payload"]["allowed_ids"].endArray();
-
-        for (LLSD::array_const_iterator iter = notification["payload"]["allowed_ids"].beginArray();
-                iter != end_it;
-             iter++)
-        {
-                U32 flags = originalFlags;
-                if (iter + 1 != end_it)
-                        flags |= ESTATE_ACCESS_NO_REPLY;
-
-                const LLUUID id = iter->asUUID();
-                if (((U32)notification["payload"]["operation"].asInteger() & ESTATE_ACCESS_BANNED_AGENT_ADD)
-                    && region && (region->getOwner() == id))
-                {
-                        LLNotifications::instance().add("OwnerCanNotBeDenied");
-                        break;
-                }
-                switch(option)
-                {
-                        case 0:
-                            // This estate
-                            sendEstateAccessDelta(flags, id);
-                            break;
-                        case 1:
-                        {
-                                // All estates, either than I own or manage for this owner.  
-                                // This will be verified on simulator. JC
-                                if (!region) break;
-                                if (region->getOwner() == gAgent.getID()
-                                    || gAgent.isGodlike())
-                                {
-                                        flags |= ESTATE_ACCESS_APPLY_TO_ALL_ESTATES;
-                                        sendEstateAccessDelta(flags, id);
-                                }
-                                else if (region->isEstateManager())
-                                {
-                                        flags |= ESTATE_ACCESS_APPLY_TO_MANAGED_ESTATES;
-                                        sendEstateAccessDelta(flags, id);
-                                }
-                                break;
-                        }
-                        case 2:
-                        default:
-                            break;
-                }
-        }
-        return false;
-}
-
-// key = "estateaccessdelta"
-// str(estate_id) will be added to front of list by forward_EstateOwnerRequest_to_dataserver
-// str[0] = str(agent_id) requesting the change
-// str[1] = str(flags) (ESTATE_ACCESS_DELTA_*)
-// str[2] = str(agent_id) to add or remove
-// static
-void LLPanelEstateInfo::sendEstateAccessDelta(U32 flags, const LLUUID& agent_or_group_id)
-{
-        LLMessageSystem* msg = gMessageSystem;
-        msg->newMessage("EstateOwnerMessage");
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-
-        msg->nextBlock("MethodData");
-        msg->addString("Method", "estateaccessdelta");
-        msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
-
-        std::string buf;
-        gAgent.getID().toString(buf);
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", buf);
-
-        buf = llformat("%u", flags);
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", buf);
-
-        agent_or_group_id.toString(buf);
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", buf);
-
-
-        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-
-        if (flags & (ESTATE_ACCESS_ALLOWED_AGENT_ADD | ESTATE_ACCESS_ALLOWED_AGENT_REMOVE |
-                         ESTATE_ACCESS_BANNED_AGENT_ADD | ESTATE_ACCESS_BANNED_AGENT_REMOVE))
-        {
-                
-                panel->clearAccessLists();
-        }
-
-        gAgent.sendReliableMessage();
-}
-
-void LLPanelEstateInfo::updateControls(LLViewerRegion* region)
-{
-        BOOL god = gAgent.isGodlike();
-        BOOL owner = (region && (region->getOwner() == gAgent.getID()));
-        BOOL manager = (region && region->isEstateManager());
-        setCtrlsEnabled(god || owner || manager);
-        
-        childDisable("apply_btn");
-        childSetEnabled("add_allowed_avatar_btn",               god || owner || manager);
-        childSetEnabled("remove_allowed_avatar_btn",    god || owner || manager);
-        childSetEnabled("add_allowed_group_btn",                god || owner || manager);
-        childSetEnabled("remove_allowed_group_btn",             god || owner || manager);
-        childSetEnabled("add_banned_avatar_btn",                god || owner || manager);
-        childSetEnabled("remove_banned_avatar_btn",             god || owner || manager);
-        childSetEnabled("message_estate_btn",                   god || owner || manager);
-        childSetEnabled("kick_user_from_estate_btn",    god || owner || manager);
-#if ELAR_ENABLED
-        childSetEnabled("abuse_email_address",                  god || owner || manager);
-#else
-        childSetEnabled("abuse_email_address",                  false);
-#endif
-
-        // estate managers can't add estate managers
-        childSetEnabled("add_estate_manager_btn",               god || owner);
-        childSetEnabled("remove_estate_manager_btn",    god || owner);
-        childSetEnabled("estate_manager_name_list",             god || owner);
-}
-
-bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region)
-{
-        updateControls(region);
-        
-        // let the parent class handle the general data collection. 
-        bool rv = LLPanelRegionInfo::refreshFromRegion(region);
-
-        // We want estate info. To make sure it works across region
-        // boundaries and multiple packets, we add a serial number to the
-        // integers and track against that on update.
-        strings_t strings;
-        //integers_t integers;
-        //LLFloaterRegionInfo::incrementSerial();
-        LLFloaterRegionInfo::nextInvoice();
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        //integers.push_back(LLFloaterRegionInfo::());::getPanelEstate();
-
-        
-        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-        panel->clearAccessLists();
-        
-
-        sendEstateOwnerMessage(gMessageSystem, "getinfo", invoice, strings);
-
-        refresh();
-
-        return rv;
-}
-
-void LLPanelEstateInfo::updateChild(LLUICtrl* child_ctrl)
-{
-        if (checkRemovalButton(child_ctrl->getName()))
-        {
-                // do nothing
-        }
-        else if (checkSunHourSlider(child_ctrl))
-        {
-                // do nothing
-        }
-}
-
-bool LLPanelEstateInfo::estateUpdate(LLMessageSystem* msg)
-{
-        llinfos << "LLPanelEstateInfo::estateUpdate()" << llendl;
-        return false;
-}
-
-
-BOOL LLPanelEstateInfo::postBuild()
-{
-        // set up the callbacks for the generic controls
-        initCtrl("externally_visible_check");
-        initCtrl("use_global_time_check");
-        initCtrl("fixed_sun_check");
-        initCtrl("allow_direct_teleport");
-        initCtrl("limit_payment");
-        initCtrl("limit_age_verified");
-        initCtrl("voice_chat_check");
-        childSetCommitCallback("abuse_email_address", onChangeAnything, this);
-        childSetKeystrokeCallback("abuse_email_address", onChangeText, this);
-
-        initHelpBtn("estate_manager_help",                      "HelpEstateEstateManager");
-        initHelpBtn("use_global_time_help",                     "HelpEstateUseGlobalTime");
-        initHelpBtn("fixed_sun_help",                           "HelpEstateFixedSun");
-        initHelpBtn("WLEditSkyHelp",                            "HelpEditSky");
-        initHelpBtn("WLEditDayCycleHelp",                       "HelpEditDayCycle");
-
-        initHelpBtn("externally_visible_help",          "HelpEstateExternallyVisible");
-        initHelpBtn("allow_direct_teleport_help",       "HelpEstateAllowDirectTeleport");
-        initHelpBtn("allow_resident_help",                      "HelpEstateAllowResident");
-        initHelpBtn("allow_group_help",                         "HelpEstateAllowGroup");
-        initHelpBtn("ban_resident_help",                        "HelpEstateBanResident");
-        initHelpBtn("abuse_email_address_help",         "HelpEstateAbuseEmailAddress");
-        initHelpBtn("voice_chat_help",                  "HelpEstateVoiceChat");
-
-        // set up the use global time checkbox
-        childSetCommitCallback("use_global_time_check", onChangeUseGlobalTime, this);
-        childSetCommitCallback("fixed_sun_check", onChangeFixedSun, this);
-        childSetCommitCallback("sun_hour_slider", onChangeChildCtrl, this);
-
-        childSetCommitCallback("allowed_avatar_name_list", onChangeChildCtrl, this);
-        LLNameListCtrl *avatar_name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
-        if (avatar_name_list)
-        {
-                avatar_name_list->setCommitOnSelectionChange(TRUE);
-                avatar_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
-        }
-
-        childSetAction("add_allowed_avatar_btn", onClickAddAllowedAgent, this);
-        childSetAction("remove_allowed_avatar_btn", onClickRemoveAllowedAgent, this);
-
-        childSetCommitCallback("allowed_group_name_list", onChangeChildCtrl, this);
-        LLNameListCtrl* group_name_list = getChild<LLNameListCtrl>("allowed_group_name_list");
-        if (group_name_list)
-        {
-                group_name_list->setCommitOnSelectionChange(TRUE);
-                group_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
-        }
-
-        childSetAction("add_allowed_group_btn", onClickAddAllowedGroup, this);
-        childSetAction("remove_allowed_group_btn", onClickRemoveAllowedGroup, this);
-
-        childSetCommitCallback("banned_avatar_name_list", onChangeChildCtrl, this);
-        LLNameListCtrl* banned_name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");
-        if (banned_name_list)
-        {
-                banned_name_list->setCommitOnSelectionChange(TRUE);
-                banned_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
-        }
-
-        childSetAction("add_banned_avatar_btn", onClickAddBannedAgent, this);
-        childSetAction("remove_banned_avatar_btn", onClickRemoveBannedAgent, this);
-
-        childSetCommitCallback("estate_manager_name_list", onChangeChildCtrl, this);
-        LLNameListCtrl* manager_name_list = getChild<LLNameListCtrl>("estate_manager_name_list");
-        if (manager_name_list)
-        {
-                manager_name_list->setCommitOnSelectionChange(TRUE);
-                manager_name_list->setMaxItemCount(ESTATE_MAX_MANAGERS * 4);    // Allow extras for dupe issue
-        }
-
-        childSetAction("add_estate_manager_btn", onClickAddEstateManager, this);
-        childSetAction("remove_estate_manager_btn", onClickRemoveEstateManager, this);
-        childSetAction("message_estate_btn", onClickMessageEstate, this);
-        childSetAction("kick_user_from_estate_btn", onClickKickUser, this);
-
-        childSetAction("WLEditSky", onClickEditSky, this);
-        childSetAction("WLEditDayCycle", onClickEditDayCycle, this);
-
-        return LLPanelRegionInfo::postBuild();
-}
-
-void LLPanelEstateInfo::refresh()
-{
-        bool public_access = childGetValue("externally_visible_check").asBoolean();
-        childSetEnabled("Only Allow", public_access);
-        childSetEnabled("limit_payment", public_access);
-        childSetEnabled("limit_age_verified", public_access);
-        // if this is set to false, then the limit fields are meaningless and should be turned off
-        if (public_access == false)
-        {
-                childSetValue("limit_payment", false);
-                childSetValue("limit_age_verified", false);
-        }
-}
-
-BOOL LLPanelEstateInfo::sendUpdate()
-{
-        llinfos << "LLPanelEsateInfo::sendUpdate()" << llendl;
-
-        LLNotification::Params params("ChangeLindenEstate");
-        params.functor(boost::bind(&LLPanelEstateInfo::callbackChangeLindenEstate, this, _1, _2));
-
-        if (getEstateID() <= ESTATE_LAST_LINDEN)
-        {
-                // trying to change reserved estate, warn
-                LLNotifications::instance().add(params);
-        }
-        else
-        {
-                // for normal estates, just make the change
-                LLNotifications::instance().forceResponse(params, 0);
-        }
-        return TRUE;
-}
-
-bool LLPanelEstateInfo::callbackChangeLindenEstate(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        switch(option)
-        {
-        case 0:
-                // send the update
-                if (!commitEstateInfoCaps())
-                {
-                        // the caps method failed, try the old way
-                        LLFloaterRegionInfo::nextInvoice();
-                        commitEstateInfoDataserver();
-                }
-                // we don't want to do this because we'll get it automatically from the sim
-                // after the spaceserver processes it
-//              else
-//              {
-//                      // caps method does not automatically send this info
-//                      LLFloaterRegionInfo::requestRegionInfo();
-//              }
-                break;
-        case 1:
-        default:
-                // do nothing
-                break;
-        }
-        return false;
-}
-
-
-/*
-// Request = "getowner"
-// SParam[0] = "" (empty string)
-// IParam[0] = serial
-void LLPanelEstateInfo::getEstateOwner()
-{
-        // TODO -- disable the panel
-        // and call this function whenever we cross a region boundary
-        // re-enable when owner matches, and get new estate info
-        LLMessageSystem* msg = gMessageSystem;
-        msg->newMessageFast(_PREHASH_EstateOwnerRequest);
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-
-        msg->nextBlockFast(_PREHASH_RequestData);
-        msg->addStringFast(_PREHASH_Request, "getowner");
-
-        // we send an empty string so that the variable block is not empty
-        msg->nextBlockFast(_PREHASH_StringData);
-        msg->addStringFast(_PREHASH_SParam, "");
-
-        msg->nextBlockFast(_PREHASH_IntegerData);
-        msg->addS32Fast(_PREHASH_IParam, LLFloaterRegionInfo::getSerial());
-
-        gAgent.sendMessage();
-}
-*/
-
-class LLEstateChangeInfoResponder : public LLHTTPClient::Responder
-{
-public:
-        LLEstateChangeInfoResponder(void* userdata) : mpPanel((LLPanelEstateInfo*)userdata) {};
-        
-        // if we get a normal response, handle it here
-        virtual void result(const LLSD& content)
-        {
-            // refresh the panel from the database
-                mpPanel->refresh();
-        }
-        
-        // if we get an error response
-        virtual void error(U32 status, const std::string& reason)
-        {
-                llinfos << "LLEstateChangeInfoResponder::error "
-                        << status << ": " << reason << llendl;
-        }
-private:
-        LLPanelEstateInfo* mpPanel;
-};
-
-// tries to send estate info using a cap; returns true if it succeeded
-bool LLPanelEstateInfo::commitEstateInfoCaps()
-{
-        std::string url = gAgent.getRegion()->getCapability("EstateChangeInfo");
-        
-        if (url.empty())
-        {
-                // whoops, couldn't find the cap, so bail out
-                return false;
-        }
-        
-        LLSD body;
-        body["estate_name"] = getEstateName();
-
-        body["is_externally_visible"] = childGetValue("externally_visible_check").asBoolean();
-        body["allow_direct_teleport"] = childGetValue("allow_direct_teleport").asBoolean();
-        body["is_sun_fixed"         ] = childGetValue("fixed_sun_check").asBoolean();
-        body["deny_anonymous"       ] = childGetValue("limit_payment").asBoolean();
-        body["deny_age_unverified"  ] = childGetValue("limit_age_verified").asBoolean();
-        body["allow_voice_chat"     ] = childGetValue("voice_chat_check").asBoolean();
-        body["invoice"              ] = LLFloaterRegionInfo::getLastInvoice();
-
-        // block fly is in estate database but not in estate UI, so we're not supporting it
-        //body["block_fly"            ] = childGetValue("").asBoolean();
-
-        F32 sun_hour = getSunHour();
-        if (childGetValue("use_global_time_check").asBoolean())
-        {
-                sun_hour = 0.f;                 // 0 = global time
-        }
-        body["sun_hour"] = sun_hour;
-
-        body["owner_abuse_email"] = childGetValue("abuse_email_address").asString();
-
-        // we use a responder so that we can re-get the data after committing to the database
-        LLHTTPClient::post(url, body, new LLEstateChangeInfoResponder((void*)this));
-    return true;
-}
-
-/* This is the old way of doing things, is deprecated, and should be 
-   deleted when the dataserver model can be removed */
-// key = "estatechangeinfo"
-// strings[0] = str(estate_id) (added by simulator before relay - not here)
-// strings[1] = estate_name
-// strings[2] = str(estate_flags)
-// strings[3] = str((S32)(sun_hour * 1024.f))
-void LLPanelEstateInfo::commitEstateInfoDataserver()
-{
-        LLMessageSystem* msg = gMessageSystem;
-        msg->newMessage("EstateOwnerMessage");
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-
-        msg->nextBlock("MethodData");
-        msg->addString("Method", "estatechangeinfo");
-        msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
-
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", getEstateName());
-
-        std::string buffer;
-        buffer = llformat("%u", computeEstateFlags());
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", buffer);
-
-        F32 sun_hour = getSunHour();
-        if (childGetValue("use_global_time_check").asBoolean())
-        {
-                sun_hour = 0.f; // 0 = global time
-        }
-
-        buffer = llformat("%d", (S32)(sun_hour*1024.0f));
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", buffer);
-
-        gAgent.sendMessage();
-}
-
-void LLPanelEstateInfo::setEstateFlags(U32 flags)
-{
-        childSetValue("externally_visible_check", LLSD(flags & REGION_FLAGS_EXTERNALLY_VISIBLE ? TRUE : FALSE) );
-        childSetValue("fixed_sun_check", LLSD(flags & REGION_FLAGS_SUN_FIXED ? TRUE : FALSE) );
-        childSetValue(
-                "voice_chat_check",
-                LLSD(flags & REGION_FLAGS_ALLOW_VOICE ? TRUE : FALSE));
-        childSetValue("allow_direct_teleport", LLSD(flags & REGION_FLAGS_ALLOW_DIRECT_TELEPORT ? TRUE : FALSE) );
-        childSetValue("limit_payment", LLSD(flags & REGION_FLAGS_DENY_ANONYMOUS ? TRUE : FALSE) );
-        childSetValue("limit_age_verified", LLSD(flags & REGION_FLAGS_DENY_AGEUNVERIFIED ? TRUE : FALSE) );
-
-        refresh();
-}
-
-U32 LLPanelEstateInfo::computeEstateFlags()
-{
-        U32 flags = 0;
-
-        if (childGetValue("externally_visible_check").asBoolean())
-        {
-                flags |= REGION_FLAGS_EXTERNALLY_VISIBLE;
-        }
-
-        if ( childGetValue("voice_chat_check").asBoolean() )
-        {
-                flags |= REGION_FLAGS_ALLOW_VOICE;
-        }
-        
-        if (childGetValue("allow_direct_teleport").asBoolean())
-        {
-                flags |= REGION_FLAGS_ALLOW_DIRECT_TELEPORT;
-        }
-
-        if (childGetValue("fixed_sun_check").asBoolean())
-        {
-                flags |= REGION_FLAGS_SUN_FIXED;
-        }
-        
-        if (childGetValue("limit_payment").asBoolean())
-        {
-                flags |= REGION_FLAGS_DENY_ANONYMOUS;
-        }
-        
-        if (childGetValue("limit_age_verified").asBoolean())
-        {
-                flags |= REGION_FLAGS_DENY_AGEUNVERIFIED;
-        }
-
-        
-        return flags;
-}
-
-BOOL LLPanelEstateInfo::getGlobalTime()
-{
-        return childGetValue("use_global_time_check").asBoolean();
-}
-
-void LLPanelEstateInfo::setGlobalTime(bool b)
-{
-        childSetValue("use_global_time_check", LLSD(b));
-        childSetEnabled("fixed_sun_check", LLSD(!b));
-        childSetEnabled("sun_hour_slider", LLSD(!b));
-        if (b)
-        {
-                childSetValue("sun_hour_slider", LLSD(0.f));
-        }
-}
-
-
-BOOL LLPanelEstateInfo::getFixedSun()
-{
-        return childGetValue("fixed_sun_check").asBoolean();
-}
-
-void LLPanelEstateInfo::setSunHour(F32 sun_hour)
-{
-        if(sun_hour < 6.0f)
-        {
-                sun_hour = 24.0f + sun_hour;
-        }
-        childSetValue("sun_hour_slider", LLSD(sun_hour));
-}
-
-F32 LLPanelEstateInfo::getSunHour()
-{
-        if (childIsEnabled("sun_hour_slider"))
-        {
-                return (F32)childGetValue("sun_hour_slider").asReal();
-        }
-        return 0.f;
-}
-
-const std::string LLPanelEstateInfo::getEstateName() const
-{
-        return childGetValue("estate_name").asString();
-}
-
-void LLPanelEstateInfo::setEstateName(const std::string& name)
-{
-        childSetValue("estate_name", LLSD(name));
-}
-
-const std::string LLPanelEstateInfo::getOwnerName() const
-{
-        return childGetValue("estate_owner").asString();
-}
-
-void LLPanelEstateInfo::setOwnerName(const std::string& name)
-{
-        childSetValue("estate_owner", LLSD(name));
-}
-
-const std::string LLPanelEstateInfo::getAbuseEmailAddress() const
-{
-        return childGetValue("abuse_email_address").asString();
-}
-
-void LLPanelEstateInfo::setAbuseEmailAddress(const std::string& address)
-{
-        childSetValue("abuse_email_address", LLSD(address));
-}
-
-void LLPanelEstateInfo::setAccessAllowedEnabled(bool enable_agent,
-                                                                                                bool enable_group,
-                                                                                                bool enable_ban)
-{
-        childSetEnabled("allow_resident_label", enable_agent);
-        childSetEnabled("allowed_avatar_name_list", enable_agent);
-        childSetVisible("allowed_avatar_name_list", enable_agent);
-        childSetEnabled("add_allowed_avatar_btn", enable_agent);
-        childSetEnabled("remove_allowed_avatar_btn", enable_agent);
-
-        // Groups
-        childSetEnabled("allow_group_label", enable_group);
-        childSetEnabled("allowed_group_name_list", enable_group);
-        childSetVisible("allowed_group_name_list", enable_group);
-        childSetEnabled("add_allowed_group_btn", enable_group);
-        childSetEnabled("remove_allowed_group_btn", enable_group);
-
-        // Ban
-        childSetEnabled("ban_resident_label", enable_ban);
-        childSetEnabled("banned_avatar_name_list", enable_ban);
-        childSetVisible("banned_avatar_name_list", enable_ban);
-        childSetEnabled("add_banned_avatar_btn", enable_ban);
-        childSetEnabled("remove_banned_avatar_btn", enable_ban);
-
-        // Update removal buttons if needed
-        if (enable_agent)
-        {
-                checkRemovalButton("allowed_avatar_name_list");
-        }
-
-        if (enable_group)
-        {
-                checkRemovalButton("allowed_group_name_list");
-        }
-
-        if (enable_ban)
-        {
-                checkRemovalButton("banned_avatar_name_list");
-        }
-}
-
-// static
-void LLPanelEstateInfo::callbackCacheName(
-        const LLUUID& id,
-        const std::string& first,
-        const std::string& last,
-        BOOL is_group,
-        void*)
-{
-        LLPanelEstateInfo* self = LLFloaterRegionInfo::getPanelEstate();
-        if (!self) return;
-
-        std::string name;
-        
-        if (id.isNull())
-        {
-                name = "(none)";
-        }
-        else
-        {
-                name = first + " " + last;
-        }
-
-        self->setOwnerName(name);
-}
-
-void LLPanelEstateInfo::clearAccessLists() 
-{
-        LLNameListCtrl* name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
-        if (name_list)
-        {
-                name_list->deleteAllItems();
-        }
-
-        name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");
-        if (name_list)
-        {
-                name_list->deleteAllItems();
-        }
-}
-
-// enables/disables the "remove" button for the various allow/ban lists
-BOOL LLPanelEstateInfo::checkRemovalButton(std::string name)
-{
-        std::string btn_name = "";
-        if (name == "allowed_avatar_name_list")
-        {
-                btn_name = "remove_allowed_avatar_btn";
-        }
-        else if (name == "allowed_group_name_list")
-        {
-                btn_name = "remove_allowed_group_btn";
-        }
-        else if (name == "banned_avatar_name_list")
-        {
-                btn_name = "remove_banned_avatar_btn";
-        }
-        else if (name == "estate_manager_name_list")
-        {
-                //ONLY OWNER CAN ADD /DELET ESTATE MANAGER
-                LLViewerRegion* region = gAgent.getRegion();
-                if (region && (region->getOwner() == gAgent.getID()))
-                {
-                        btn_name = "remove_estate_manager_btn";
-                }
-        }
-
-        // enable the remove button if something is selected
-        LLNameListCtrl* name_list = getChild<LLNameListCtrl>(name);
-        childSetEnabled(btn_name, name_list && name_list->getFirstSelected() ? TRUE : FALSE);
-
-        return (btn_name != "");
-}
-
-BOOL LLPanelEstateInfo::checkSunHourSlider(LLUICtrl* child_ctrl)
-{
-        BOOL found_child_ctrl = FALSE;
-        if (child_ctrl->getName() == "sun_hour_slider")
-        {
-                enableButton("apply_btn");
-                found_child_ctrl = TRUE;
-        }
-        return found_child_ctrl;
-}
-
-// static
-void LLPanelEstateInfo::onClickMessageEstate(void* userdata)
-{
-        llinfos << "LLPanelEstateInfo::onClickMessageEstate" << llendl;
-        LLNotifications::instance().add("MessageEstate", LLSD(), LLSD(), boost::bind(&LLPanelEstateInfo::onMessageCommit, (LLPanelEstateInfo*)userdata, _1, _2));
-}
-
-bool LLPanelEstateInfo::onMessageCommit(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        std::string text = response["message"].asString();
-        if(option != 0) return false;
-        if(text.empty()) return false;
-        llinfos << "Message to everyone: " << text << llendl;
-        strings_t strings;
-        //integers_t integers;
-        std::string name;
-        gAgent.buildFullname(name);
-        strings.push_back(strings_t::value_type(name));
-        strings.push_back(strings_t::value_type(text));
-        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-        sendEstateOwnerMessage(gMessageSystem, "instantmessage", invoice, strings);
-        return false;
-}
-
-LLPanelEstateCovenant::LLPanelEstateCovenant()
-: mCovenantID(LLUUID::null)
-{
-}
-
-// virtual 
-bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region)
-{
-        LLTextBox* region_name = getChild<LLTextBox>("region_name_text");
-        if (region_name)
-        {
-                region_name->setText(region->getName());
-        }
-
-        LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause");
-        if (resellable_clause)
-        {
-                if (region->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL)
-                {
-                        resellable_clause->setText(getString("can_not_resell"));
-                }
-                else
-                {
-                        resellable_clause->setText(getString("can_resell"));
-                }
-        }
-        
-        LLTextBox* changeable_clause = getChild<LLTextBox>("changeable_clause");
-        if (changeable_clause)
-        {
-                if (region->getRegionFlags() & REGION_FLAGS_ALLOW_PARCEL_CHANGES)
-                {
-                        changeable_clause->setText(getString("can_change"));
-                }
-                else
-                {
-                        changeable_clause->setText(getString("can_not_change"));
-                }
-        }
-
-        LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text");
-        if (region_maturity)
-        {
-                region_maturity->setText(region->getSimAccessString());
-        }
-        
-        LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text");
-        if (region_landtype)
-        {
-                region_landtype->setText(region->getSimProductName());
-        }
-        
-        
-        // let the parent class handle the general data collection. 
-        bool rv = LLPanelRegionInfo::refreshFromRegion(region);
-        LLMessageSystem *msg = gMessageSystem;
-        msg->newMessage("EstateCovenantRequest");
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID,      gAgent.getID());
-        msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
-        msg->sendReliable(region->getHost());
-        return rv;
-}
-
-// virtual 
-bool LLPanelEstateCovenant::estateUpdate(LLMessageSystem* msg)
-{
-        llinfos << "LLPanelEstateCovenant::estateUpdate()" << llendl;
-        return true;
-}
-        
-// virtual 
-BOOL LLPanelEstateCovenant::postBuild()
-{
-        initHelpBtn("covenant_help",            "HelpEstateCovenant");
-        mEstateNameText = getChild<LLTextBox>("estate_name_text");
-        mEstateOwnerText = getChild<LLTextBox>("estate_owner_text");
-        mLastModifiedText = getChild<LLTextBox>("covenant_timestamp_text");
-        mEditor = getChild<LLViewerTextEditor>("covenant_editor");
-        if (mEditor) mEditor->setHandleEditKeysDirectly(TRUE);
-        LLButton* reset_button = getChild<LLButton>("reset_covenant");
-        reset_button->setEnabled(gAgent.canManageEstate());
-        reset_button->setClickedCallback(LLPanelEstateCovenant::resetCovenantID, NULL);
-
-        return LLPanelRegionInfo::postBuild();
-}
-
-// virtual 
-void LLPanelEstateCovenant::updateChild(LLUICtrl* child_ctrl)
-{
-}
-
-// virtual
-BOOL LLPanelEstateCovenant::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-                                                                  EDragAndDropType cargo_type,
-                                                                  void* cargo_data,
-                                                                  EAcceptance* accept,
-                                                                  std::string& tooltip_msg)
-{
-        LLInventoryItem* item = (LLInventoryItem*)cargo_data;
-
-        if (!gAgent.canManageEstate())
-        {
-                *accept = ACCEPT_NO;
-                return TRUE;
-        }
-
-        switch(cargo_type)
-        {
-        case DAD_NOTECARD:
-                *accept = ACCEPT_YES_COPY_SINGLE;
-                if (item && drop)
-                {
-                        LLSD payload;
-                        payload["item_id"] = item->getUUID();
-                        LLNotifications::instance().add("EstateChangeCovenant", LLSD(), payload,
-                                                                        LLPanelEstateCovenant::confirmChangeCovenantCallback);
-                }
-                break;
-        default:
-                *accept = ACCEPT_NO;
-                break;
-        }
-
-        return TRUE;
-} 
-
-// static 
-bool LLPanelEstateCovenant::confirmChangeCovenantCallback(const LLSD& notification, const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        LLInventoryItem* item = gInventory.getItem(notification["payload"]["item_id"].asUUID());
-        LLPanelEstateCovenant* self = LLFloaterRegionInfo::getPanelCovenant();
-
-        if (!item || !self) return false;
-
-        switch(option)
-        {
-        case 0:
-                self->loadInvItem(item);
-                break;
-        default:
-                break;
-        }
-        return false;
-}
-
-// static
-void LLPanelEstateCovenant::resetCovenantID(void* userdata)
-{
-        LLNotifications::instance().add("EstateChangeCovenant", LLSD(), LLSD(), confirmResetCovenantCallback);
-}
-
-// static
-bool LLPanelEstateCovenant::confirmResetCovenantCallback(const LLSD& notification, const LLSD& response)
-{
-        LLPanelEstateCovenant* self = LLFloaterRegionInfo::getPanelCovenant();
-        if (!self) return false;
-
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        switch(option)
-        {
-        case 0:         
-                self->loadInvItem(NULL);
-                break;
-        default:
-                break;
-        }
-        return false;
-}
-
-void LLPanelEstateCovenant::loadInvItem(LLInventoryItem *itemp)
-{
-        const BOOL high_priority = TRUE;        
-        if (itemp)
-        {
-                gAssetStorage->getInvItemAsset(gAgent.getRegionHost(),
-                                                                        gAgent.getID(),
-                                                                        gAgent.getSessionID(),
-                                                                        itemp->getPermissions().getOwner(),
-                                                                        LLUUID::null,
-                                                                        itemp->getUUID(),
-                                                                        itemp->getAssetUUID(),
-                                                                        itemp->getType(),
-                                    onLoadComplete,
-                                                                        (void*)this,
-                                                                        high_priority);
-                mAssetStatus = ASSET_LOADING;
-        }
-        else
-        {
-                mAssetStatus = ASSET_LOADED;
-                setCovenantTextEditor("There is no Covenant provided for this Estate.");
-                sendChangeCovenantID(LLUUID::null);
-        }
-}
-
-// static
-void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs,
-                                                                           const LLUUID& asset_uuid,
-                                                                           LLAssetType::EType type,
-                                                                           void* user_data, S32 status, LLExtStat ext_status)
-{
-        llinfos << "LLPanelEstateCovenant::onLoadComplete()" << llendl;
-        LLPanelEstateCovenant* panelp = (LLPanelEstateCovenant*)user_data;
-        if( panelp )
-        {
-                if(0 == status)
-                {
-                        LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
-
-                        S32 file_length = file.getSize();
-
-                        char* buffer = new char[file_length+1];
-                        if (buffer == NULL)
-                        {
-                                llerrs << "Memory Allocation Failed" << llendl;
-                                return;
-                        }
-
-                        file.read((U8*)buffer, file_length);            /* Flawfinder: ignore */
-                        // put a EOS at the end
-                        buffer[file_length] = 0;
-
-                        if( (file_length > 19) && !strncmp( buffer, "Linden text version", 19 ) )
-                        {
-                                if( !panelp->mEditor->importBuffer( buffer, file_length+1 ) )
-                                {
-                                        llwarns << "Problem importing estate covenant." << llendl;
-                                        LLNotifications::instance().add("ProblemImportingEstateCovenant");
-                                }
-                                else
-                                {
-                                        panelp->sendChangeCovenantID(asset_uuid);       
-                                }
-                        }
-                        else
-                        {
-                                // Version 0 (just text, doesn't include version number)
-                                panelp->sendChangeCovenantID(asset_uuid);
-                        }
-                        delete[] buffer;
-                }
-                else
-                {
-                        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-
-                        if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
-                                LL_ERR_FILE_EMPTY == status)
-                        {
-                                LLNotifications::instance().add("MissingNotecardAssetID");
-                        }
-                        else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
-                        {
-                                LLNotifications::instance().add("NotAllowedToViewNotecard");
-                        }
-                        else
-                        {
-                                LLNotifications::instance().add("UnableToLoadNotecardAsset");
-                        }
-
-                        llwarns << "Problem loading notecard: " << status << llendl;
-                }
-                panelp->mAssetStatus = ASSET_LOADED;
-                panelp->setCovenantID(asset_uuid);
-        }
-}
-
-// key = "estatechangecovenantid"
-// strings[0] = str(estate_id) (added by simulator before relay - not here)
-// strings[1] = str(covenant_id)
-void LLPanelEstateCovenant::sendChangeCovenantID(const LLUUID &asset_id)
-{
-        if (asset_id != getCovenantID())
-        {
-        setCovenantID(asset_id);
-
-                LLMessageSystem* msg = gMessageSystem;
-                msg->newMessage("EstateOwnerMessage");
-                msg->nextBlockFast(_PREHASH_AgentData);
-                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-
-                msg->nextBlock("MethodData");
-                msg->addString("Method", "estatechangecovenantid");
-                msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
-
-                msg->nextBlock("ParamList");
-                msg->addString("Parameter", getCovenantID().asString());
-                gAgent.sendReliableMessage();
-        }
-}
-
-// virtual 
-BOOL LLPanelEstateCovenant::sendUpdate()
-{
-        return TRUE;
-}
-
-const std::string& LLPanelEstateCovenant::getEstateName() const
-{
-        return mEstateNameText->getText();
-}
-
-void LLPanelEstateCovenant::setEstateName(const std::string& name)
-{
-        mEstateNameText->setText(name);
-}
-
-// static
-void LLPanelEstateCovenant::updateCovenantText(const std::string& string, const LLUUID& asset_id)
-{
-        LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
-        if( panelp )
-        {
-                panelp->mEditor->setText(string);
-                panelp->setCovenantID(asset_id);
-        }
-}
-
-// static
-void LLPanelEstateCovenant::updateEstateName(const std::string& name)
-{
-        LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
-        if( panelp )
-        {
-                panelp->mEstateNameText->setText(name);
-        }
-}
-
-// static
-void LLPanelEstateCovenant::updateLastModified(const std::string& text)
-{
-        LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
-        if( panelp )
-        {
-                panelp->mLastModifiedText->setText(text);
-        }
-}
-
-// static
-void LLPanelEstateCovenant::updateEstateOwnerName(const std::string& name)
-{
-        LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
-        if( panelp )
-        {
-                panelp->mEstateOwnerText->setText(name);
-        }
-}
-
-const std::string& LLPanelEstateCovenant::getOwnerName() const
-{
-        return mEstateOwnerText->getText();
-}
-
-void LLPanelEstateCovenant::setOwnerName(const std::string& name)
-{
-        mEstateOwnerText->setText(name);
-}
-
-void LLPanelEstateCovenant::setCovenantTextEditor(const std::string& text)
-{
-        mEditor->setText(text);
-}
-
-// key = "estateupdateinfo"
-// strings[0] = estate name
-// strings[1] = str(owner_id)
-// strings[2] = str(estate_id)
-// strings[3] = str(estate_flags)
-// strings[4] = str((S32)(sun_hour * 1024))
-// strings[5] = str(parent_estate_id)
-// strings[6] = str(covenant_id)
-// strings[7] = str(covenant_timestamp)
-// strings[8] = str(send_to_agent_only)
-// strings[9] = str(abuse_email_addr)
-bool LLDispatchEstateUpdateInfo::operator()(
-                const LLDispatcher* dispatcher,
-                const std::string& key,
-                const LLUUID& invoice,
-                const sparam_t& strings)
-{
-        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-        if (!panel) return true;
-
-        // NOTE: LLDispatcher extracts strings with an extra \0 at the
-        // end.  If we pass the std::string direct to the UI/renderer
-        // it draws with a weird character at the end of the string.
-        std::string estate_name = strings[0].c_str(); // preserve c_str() call!
-        panel->setEstateName(estate_name);
-        
-#if ELAR_ENABLED
-        if (strings.size() > 9)
-        {
-                std::string abuse_email = strings[9].c_str(); // preserve c_str() call!
-                panel->setAbuseEmailAddress(abuse_email);
-        }
-        else
-#endif
-        {
-                panel->setAbuseEmailAddress(panel->getString("email_unsupported"));
-        }
-
-        LLViewerRegion* regionp = gAgent.getRegion();
-
-        LLUUID owner_id(strings[1]);
-        regionp->setOwner(owner_id);
-        // Update estate owner name in UI
-        const BOOL is_group = FALSE;
-        gCacheName->get(owner_id, is_group, LLPanelEstateInfo::callbackCacheName);
-
-        U32 estate_id = strtoul(strings[2].c_str(), NULL, 10);
-        panel->setEstateID(estate_id);
-
-        U32 flags = strtoul(strings[3].c_str(), NULL, 10);
-        panel->setEstateFlags(flags);
-
-        F32 sun_hour = ((F32)(strtod(strings[4].c_str(), NULL)))/1024.0f;
-        if(sun_hour == 0 && (flags & REGION_FLAGS_SUN_FIXED ? FALSE : TRUE))
-        {
-                panel->setGlobalTime(TRUE);
-        } 
-        else
-        {
-                panel->setGlobalTime(FALSE);
-                panel->setSunHour(sun_hour);
-        }
-
-        bool visible_from_mainland = (bool)(flags & REGION_FLAGS_EXTERNALLY_VISIBLE);
-        bool god = gAgent.isGodlike();
-        bool linden_estate = (estate_id <= ESTATE_LAST_LINDEN);
-
-        // If visible from mainland, disable the access allowed
-        // UI, as anyone can teleport there.
-        // However, gods need to be able to edit the access list for
-        // linden estates, regardless of visibility, to allow object
-        // and L$ transfers.
-        bool enable_agent = (!visible_from_mainland || (god && linden_estate));
-        bool enable_group = enable_agent;
-        bool enable_ban = !linden_estate;
-        panel->setAccessAllowedEnabled(enable_agent, enable_group, enable_ban);
-
-        return true;
-}
-
-
-// key = "setaccess"
-// strings[0] = str(estate_id)
-// strings[1] = str(packed_access_lists)
-// strings[2] = str(num allowed agent ids)
-// strings[3] = str(num allowed group ids)
-// strings[4] = str(num banned agent ids)
-// strings[5] = str(num estate manager agent ids)
-// strings[6] = bin(uuid)
-// strings[7] = bin(uuid)
-// strings[8] = bin(uuid)
-// ...
-bool LLDispatchSetEstateAccess::operator()(
-                const LLDispatcher* dispatcher,
-                const std::string& key,
-                const LLUUID& invoice,
-                const sparam_t& strings)
-{
-        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-        if (!panel) return true;
-
-        S32 index = 1;  // skip estate_id
-        U32 access_flags = strtoul(strings[index++].c_str(), NULL,10);
-        S32 num_allowed_agents = strtol(strings[index++].c_str(), NULL, 10);
-        S32 num_allowed_groups = strtol(strings[index++].c_str(), NULL, 10);
-        S32 num_banned_agents = strtol(strings[index++].c_str(), NULL, 10);
-        S32 num_estate_managers = strtol(strings[index++].c_str(), NULL, 10);
-
-        // sanity ckecks
-        if (num_allowed_agents > 0
-                && !(access_flags & ESTATE_ACCESS_ALLOWED_AGENTS))
-        {
-                llwarns << "non-zero count for allowed agents, but no corresponding flag" << llendl;
-        }
-        if (num_allowed_groups > 0
-                && !(access_flags & ESTATE_ACCESS_ALLOWED_GROUPS))
-        {
-                llwarns << "non-zero count for allowed groups, but no corresponding flag" << llendl;
-        }
-        if (num_banned_agents > 0
-                && !(access_flags & ESTATE_ACCESS_BANNED_AGENTS))
-        {
-                llwarns << "non-zero count for banned agents, but no corresponding flag" << llendl;
-        }
-        if (num_estate_managers > 0
-                && !(access_flags & ESTATE_ACCESS_MANAGERS))
-        {
-                llwarns << "non-zero count for managers, but no corresponding flag" << llendl;
-        }
-
-        // grab the UUID's out of the string fields
-        if (access_flags & ESTATE_ACCESS_ALLOWED_AGENTS)
-        {
-                LLNameListCtrl* allowed_agent_name_list;
-                allowed_agent_name_list = panel->getChild<LLNameListCtrl>("allowed_avatar_name_list");
-
-                int totalAllowedAgents = num_allowed_agents;
-                
-                if (allowed_agent_name_list) 
-                {
-                        totalAllowedAgents += allowed_agent_name_list->getItemCount();
-                }
-
-                std::string msg = llformat("Allowed residents: (%d, max %d)",
-                                                                        totalAllowedAgents,
-                                                                        ESTATE_MAX_ACCESS_IDS);
-                panel->childSetValue("allow_resident_label", LLSD(msg));
-
-                if (allowed_agent_name_list)
-                {
-                        //allowed_agent_name_list->deleteAllItems();
-                        for (S32 i = 0; i < num_allowed_agents && i < ESTATE_MAX_ACCESS_IDS; i++)
-                        {
-                                LLUUID id;
-                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */
-                                allowed_agent_name_list->addNameItem(id);
-                        }
-                        panel->childSetEnabled("remove_allowed_avatar_btn", allowed_agent_name_list->getFirstSelected() ? TRUE : FALSE);
-                        allowed_agent_name_list->sortByColumnIndex(0, TRUE);
-                }
-        }
-
-        if (access_flags & ESTATE_ACCESS_ALLOWED_GROUPS)
-        {
-                LLNameListCtrl* allowed_group_name_list;
-                allowed_group_name_list = panel->getChild<LLNameListCtrl>("allowed_group_name_list");
-
-                std::string msg = llformat("Allowed groups: (%d, max %d)",
-                                                                        num_allowed_groups,
-                                                                        (S32) ESTATE_MAX_GROUP_IDS);
-                panel->childSetValue("allow_group_label", LLSD(msg));
-
-                if (allowed_group_name_list)
-                {
-                        allowed_group_name_list->deleteAllItems();
-                        for (S32 i = 0; i < num_allowed_groups && i < ESTATE_MAX_GROUP_IDS; i++)
-                        {
-                                LLUUID id;
-                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */
-                                allowed_group_name_list->addGroupNameItem(id);
-                        }
-                        panel->childSetEnabled("remove_allowed_group_btn", allowed_group_name_list->getFirstSelected() ? TRUE : FALSE);
-                        allowed_group_name_list->sortByColumnIndex(0, TRUE);
-                }
-        }
-
-        if (access_flags & ESTATE_ACCESS_BANNED_AGENTS)
-        {
-                LLNameListCtrl* banned_agent_name_list;
-                banned_agent_name_list = panel->getChild<LLNameListCtrl>("banned_avatar_name_list");
-
-                int totalBannedAgents = num_banned_agents;
-                
-                if (banned_agent_name_list) 
-                {
-                        totalBannedAgents += banned_agent_name_list->getItemCount();
-                }
-
-
-                std::string msg = llformat("Banned residents: (%d, max %d)",
-                                                                        totalBannedAgents,
-                                                                        ESTATE_MAX_ACCESS_IDS);
-                panel->childSetValue("ban_resident_label", LLSD(msg));
-
-                if (banned_agent_name_list)
-                {
-                        //banned_agent_name_list->deleteAllItems();
-                        for (S32 i = 0; i < num_banned_agents && i < ESTATE_MAX_ACCESS_IDS; i++)
-                        {
-                                LLUUID id;
-                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */
-                                banned_agent_name_list->addNameItem(id);
-                        }
-                        panel->childSetEnabled("remove_banned_avatar_btn", banned_agent_name_list->getFirstSelected() ? TRUE : FALSE);
-                        banned_agent_name_list->sortByColumnIndex(0, TRUE);
-                }
-        }
-
-        if (access_flags & ESTATE_ACCESS_MANAGERS)
-        {
-                std::string msg = llformat("Estate Managers: (%d, max %d)",
-                                                                        num_estate_managers,
-                                                                        ESTATE_MAX_MANAGERS);
-                panel->childSetValue("estate_manager_label", LLSD(msg));
-
-                LLNameListCtrl* estate_manager_name_list =
-                        panel->getChild<LLNameListCtrl>("estate_manager_name_list");
-                if (estate_manager_name_list)
-                {       
-                        estate_manager_name_list->deleteAllItems();             // Clear existing entries
-
-                        // There should be only ESTATE_MAX_MANAGERS people in the list, but if the database gets more (SL-46107) don't 
-                        // truncate the list unless it's really big.  Go ahead and show the extras so the user doesn't get confused, 
-                        // and they can still remove them.
-                        for (S32 i = 0; i < num_estate_managers && i < (ESTATE_MAX_MANAGERS * 4); i++)
-                        {
-                                LLUUID id;
-                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */
-                                estate_manager_name_list->addNameItem(id);
-                        }
-                        panel->childSetEnabled("remove_estate_manager_btn", estate_manager_name_list->getFirstSelected() ? TRUE : FALSE);
-                        estate_manager_name_list->sortByColumnIndex(0, TRUE);
-                }
-        }
-
-        return true;
-}
-
-// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
-void LLFloaterRegionInfo::open()
-{
-        // We'll allow access to the estate tools for estate managers (and for the sim owner)
-        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
-        {
-                LLViewerRegion* pRegion = gAgent.getRegion();
-                if (!pRegion)
-                        return;
-
-                // Should be able to call LLRegion::canManageEstate() but then we can fake god like
-                if ( (!pRegion->isEstateManager()) && (pRegion->getOwner() != gAgent.getID()) )
-                        return;
-        }
-
-        LLFloater::open();
-}
-// [/RLVa:KB]
+/** 

+ * @file llfloaterregioninfo.cpp

+ * @author Aaron Brashears

+ * @brief Implementation of the region info and controls floater and panels.

+ *

+ * $LicenseInfo:firstyear=2004&license=viewergpl$

+ * 

+ * Copyright (c) 2004-2009, 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

+ * ("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

+ * 

+ * 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

+ * 

+ * 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.

+ * 

+ * 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"

+#include "llfloaterregioninfo.h"

+

+#include <algorithm>

+#include <functional>

+

+#include "llcachename.h"

+#include "lldir.h"

+#include "lldispatcher.h"

+#include "llglheaders.h"

+#include "llregionflags.h"

+#include "llstl.h"

+#include "indra_constants.h"

+#include "message.h"

+

+#include "llagent.h"

+#include "llalertdialog.h"

+#include "llappviewer.h"

+#include "llfloateravatarpicker.h"

+#include "llbutton.h" 

+#include "llcheckboxctrl.h"

+#include "llcombobox.h"

+#include "llfilepicker.h"

+#include "llfloaterdaycycle.h"

+#include "llfloatergodtools.h"  // for send_sim_wide_deletes()

+#include "llfloatertopobjects.h" // added to fix SL-32336

+#include "llfloatergroups.h"

+#include "llfloatertelehub.h"

+#include "llfloaterwindlight.h"

+#include "llinventorymodel.h"

+#include "lllineeditor.h"

+#include "llalertdialog.h"

+#include "llnamelistctrl.h"

+#include "llsliderctrl.h"

+#include "llspinctrl.h"

+#include "lltabcontainer.h"

+#include "lltextbox.h"

+#include "llinventory.h"

+#include "lltexturectrl.h"

+#include "lltrans.h"

+#include "llviewercontrol.h"

+#include "lluictrlfactory.h"

+#include "llviewerimage.h"

+#include "llviewerimagelist.h"

+#include "llviewerregion.h"

+#include "llviewerstats.h"

+#include "llviewertexteditor.h"

+#include "llviewerwindow.h"

+#include "llvlcomposition.h"

+#include "hippoLimits.h"

+

+// [RLVa:KB]

+#include "rlvhandler.h"

+// [/RLVa:KB]

+

+#define ELAR_ENABLED 0 // Enable when server support is implemented

+

+const S32 TERRAIN_TEXTURE_COUNT = 4;

+const S32 CORNER_COUNT = 4;

+

+///----------------------------------------------------------------------------

+/// Local class declaration

+///----------------------------------------------------------------------------

+

+class LLDispatchEstateUpdateInfo : public LLDispatchHandler

+{

+public:

+        LLDispatchEstateUpdateInfo() {}

+        virtual ~LLDispatchEstateUpdateInfo() {}

+        virtual bool operator()(

+                const LLDispatcher* dispatcher,

+                const std::string& key,

+                const LLUUID& invoice,

+                const sparam_t& strings);

+};

+

+class LLDispatchSetEstateAccess : public LLDispatchHandler

+{

+public:

+        LLDispatchSetEstateAccess() {}

+        virtual ~LLDispatchSetEstateAccess() {}

+        virtual bool operator()(

+                const LLDispatcher* dispatcher,

+                const std::string& key,

+                const LLUUID& invoice,

+                const sparam_t& strings);

+};

+

+

+/*

+void unpack_request_params(

+        LLMessageSystem* msg,

+        LLDispatcher::sparam_t& strings,

+        LLDispatcher::iparam_t& integers)

+{

+        char str_buf[MAX_STRING];

+        S32 str_count = msg->getNumberOfBlocksFast(_PREHASH_StringData);

+        S32 i;

+        for (i = 0; i < str_count; ++i)

+        {

+                // we treat the SParam as binary data (since it might be an 

+                // LLUUID in compressed form which may have embedded \0's,)

+                str_buf[0] = '\0';

+                S32 data_size = msg->getSizeFast(_PREHASH_StringData, i, _PREHASH_SParam);

+                if (data_size >= 0)

+                {

+                        msg->getBinaryDataFast(_PREHASH_StringData, _PREHASH_SParam,

+                                                                   str_buf, data_size, i, MAX_STRING - 1);

+                        strings.push_back(std::string(str_buf, data_size));

+                }

+        }

+

+        U32 int_buf;

+        S32 int_count = msg->getNumberOfBlocksFast(_PREHASH_IntegerData);

+        for (i = 0; i < int_count; ++i)

+        {

+                msg->getU32("IntegerData", "IParam", int_buf, i);

+                integers.push_back(int_buf);

+        }

+}

+*/

+

+

+

+bool estate_dispatch_initialized = false;

+

+

+///----------------------------------------------------------------------------

+/// LLFloaterRegionInfo

+///----------------------------------------------------------------------------

+

+//S32 LLFloaterRegionInfo::sRequestSerial = 0;

+LLUUID LLFloaterRegionInfo::sRequestInvoice;

+

+LLFloaterRegionInfo::LLFloaterRegionInfo(const LLSD& seed)

+{

+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_info.xml", NULL, FALSE);

+}

+

+BOOL LLFloaterRegionInfo::postBuild()

+{

+        mTab = getChild<LLTabContainer>("region_panels");

+

+        // contruct the panels

+        LLPanelRegionInfo* panel;

+

+        panel = new LLPanelRegionGeneralInfo;

+        mInfoPanels.push_back(panel);

+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_general.xml");

+        mTab->addTabPanel(panel, panel->getLabel(), TRUE);

+

+        panel = new LLPanelRegionOpenSettingsInfo;

+        mInfoPanels.push_back(panel);

+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_open_region_settings.xml");

+        mTab->addTabPanel(panel, panel->getLabel(), FALSE);

+

+        panel = new LLPanelRegionDebugInfo;

+        mInfoPanels.push_back(panel);

+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_debug.xml");

+        mTab->addTabPanel(panel, panel->getLabel(), FALSE);

+

+        panel = new LLPanelRegionTextureInfo;

+        mInfoPanels.push_back(panel);

+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_texture.xml");

+        mTab->addTabPanel(panel, panel->getLabel(), FALSE);

+

+        panel = new LLPanelRegionTerrainInfo;

+        mInfoPanels.push_back(panel);

+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_terrain.xml");

+        mTab->addTabPanel(panel, panel->getLabel(), FALSE);

+

+        panel = new LLPanelEstateInfo;

+        mInfoPanels.push_back(panel);

+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_estate.xml");

+        mTab->addTabPanel(panel, panel->getLabel(), FALSE);

+

+        panel = new LLPanelEstateCovenant;

+        mInfoPanels.push_back(panel);

+        LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_covenant.xml");

+        mTab->addTabPanel(panel, panel->getLabel(), FALSE);

+

+        gMessageSystem->setHandlerFunc(

+                "EstateOwnerMessage", 

+                &processEstateOwnerRequest);

+

+        return TRUE;

+}

+

+LLFloaterRegionInfo::~LLFloaterRegionInfo()

+{

+}

+

+void LLFloaterRegionInfo::onOpen()

+{

+        LLRect rect = gSavedSettings.getRect("FloaterRegionInfo");

+        S32 left, top;

+        gFloaterView->getNewFloaterPosition(&left, &top);

+        rect.translate(left,top);

+

+        refreshFromRegion(gAgent.getRegion());

+        requestRegionInfo();

+        LLFloater::onOpen();

+}

+

+// static

+void LLFloaterRegionInfo::requestRegionInfo()

+{

+        LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");

+

+        tab->getChild<LLPanel>("General")->setCtrlsEnabled(FALSE);

+        tab->getChild<LLPanel>("Debug")->setCtrlsEnabled(FALSE);

+        tab->getChild<LLPanel>("Terrain")->setCtrlsEnabled(FALSE);

+        tab->getChild<LLPanel>("Estate")->setCtrlsEnabled(FALSE);

+        tab->getChild<LLPanel>("RegionSettings")->setCtrlsEnabled(FALSE);

+

+        // Must allow anyone to request the RegionInfo data

+        // so non-owners/non-gods can see the values. 

+        // Therefore can't use an EstateOwnerMessage JC

+        LLMessageSystem* msg = gMessageSystem;

+        msg->newMessage("RequestRegionInfo");

+        msg->nextBlock("AgentData");

+        msg->addUUID("AgentID", gAgent.getID());

+        msg->addUUID("SessionID", gAgent.getSessionID());

+        gAgent.sendReliableMessage();

+}

+

+// static

+void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)

+{

+        static LLDispatcher dispatch;

+        if(!findInstance())

+        {

+                return;

+        }

+        

+        if (!estate_dispatch_initialized)

+        {

+                LLPanelEstateInfo::initDispatch(dispatch);

+        }

+

+        LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");

+        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");

+

+        // unpack the message

+        std::string request;

+        LLUUID invoice;

+        LLDispatcher::sparam_t strings;

+        LLDispatcher::unpackMessage(msg, request, invoice, strings);

+        if(invoice != getLastInvoice())

+        {

+                llwarns << "Mismatched Estate message: " << request << llendl;

+                return;

+        }

+

+        //dispatch the message

+        dispatch.dispatch(request, invoice, strings);

+

+        LLViewerRegion* region = gAgent.getRegion();

+        panel->updateControls(region);

+}

+

+

+// static

+void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)

+{

+        LLPanel* panel;

+

+        llinfos << "LLFloaterRegionInfo::processRegionInfo" << llendl;

+        if(!findInstance())

+        {

+                return;

+        }

+        

+        LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");

+

+        LLViewerRegion* region = gAgent.getRegion();

+        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());

+

+        // extract message

+        std::string sim_name;

+        std::string sim_type = LLTrans::getString("land_type_unknown");

+        U32 region_flags;

+        U8 agent_limit;

+        F32 object_bonus_factor;

+        U8 sim_access;

+        F32 water_height;

+        F32 terrain_raise_limit;

+        F32 terrain_lower_limit;

+        BOOL use_estate_sun;

+        F32 sun_hour;

+        msg->getString("RegionInfo", "SimName", sim_name);

+        msg->getU32("RegionInfo", "RegionFlags", region_flags);

+        msg->getU8("RegionInfo", "MaxAgents", agent_limit);

+        msg->getF32("RegionInfo", "ObjectBonusFactor", object_bonus_factor);

+        msg->getU8("RegionInfo", "SimAccess", sim_access);

+        msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_WaterHeight, water_height);

+        msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainRaiseLimit, terrain_raise_limit);

+        msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainLowerLimit, terrain_lower_limit);

+        msg->getBOOL("RegionInfo", "UseEstateSun", use_estate_sun);

+        // actually the "last set" sun hour, not the current sun hour. JC

+        msg->getF32("RegionInfo", "SunHour", sun_hour);

+        // the only reasonable way to decide if we actually have any data is to

+        // check to see if any of these fields have nonzero sizes

+        if (msg->getSize("RegionInfo2", "ProductSKU") > 0 ||

+                msg->getSize("RegionInfo2", "ProductName") > 0)

+        {

+                msg->getString("RegionInfo2", "ProductName", sim_type);

+        }

+

+        // GENERAL PANEL

+        panel = tab->getChild<LLPanel>("General");

+        panel->childSetValue("region_text", LLSD(sim_name));

+        panel->childSetValue("region_type", LLSD(sim_type));

+        panel->childSetValue("version_channel_text", gLastVersionChannel);

+

+        panel->childSetValue("block_terraform_check", (region_flags & REGION_FLAGS_BLOCK_TERRAFORM) ? TRUE : FALSE );

+        panel->childSetValue("block_fly_check", (region_flags & REGION_FLAGS_BLOCK_FLY) ? TRUE : FALSE );

+        panel->childSetValue("allow_damage_check", (region_flags & REGION_FLAGS_ALLOW_DAMAGE) ? TRUE : FALSE );

+        panel->childSetValue("restrict_pushobject", (region_flags & REGION_FLAGS_RESTRICT_PUSHOBJECT) ? TRUE : FALSE );

+        panel->childSetValue("allow_land_resell_check", (region_flags & REGION_FLAGS_BLOCK_LAND_RESELL) ? FALSE : TRUE );

+        panel->childSetValue("allow_parcel_changes_check", (region_flags & REGION_FLAGS_ALLOW_PARCEL_CHANGES) ? TRUE : FALSE );

+        panel->childSetValue("block_parcel_search_check", (region_flags & REGION_FLAGS_BLOCK_PARCEL_SEARCH) ? TRUE : FALSE );

+        panel->childSetValue("agent_limit_spin", LLSD((F32)agent_limit) );

+        panel->childSetValue("object_bonus_spin", LLSD(object_bonus_factor) );

+        panel->childSetValue("access_combo", LLSD(sim_access) );

+

+

+        // detect teen grid for maturity

+

+        U32 parent_estate_id;

+        msg->getU32("RegionInfo", "ParentEstateID", parent_estate_id);

+        BOOL teen_grid = (parent_estate_id == 5);  // *TODO add field to estate table and test that

+        panel->childSetEnabled("access_combo", gAgent.isGodlike() || (region && region->canManageEstate() && !teen_grid));

+        panel->setCtrlsEnabled(allow_modify);

+        

+        // RegionSettings PANEL

+        panel = tab->getChild<LLPanel>("RegionSettings");

+        panel->setCtrlsEnabled(allow_modify);

+

+        // DEBUG PANEL

+        panel = tab->getChild<LLPanel>("Debug");

+

+        panel->childSetValue("region_text", LLSD(sim_name) );

+        panel->childSetValue("disable_scripts_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_SCRIPTS)) );

+        panel->childSetValue("disable_collisions_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_COLLISIONS)) );

+        panel->childSetValue("disable_physics_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_PHYSICS)) );

+        panel->setCtrlsEnabled(allow_modify);

+

+        // TERRAIN PANEL

+        panel = tab->getChild<LLPanel>("Terrain");

+

+        panel->childSetValue("region_text", LLSD(sim_name));

+        panel->childSetValue("water_height_spin", LLSD(water_height));

+        panel->childSetValue("terrain_raise_spin", LLSD(terrain_raise_limit));

+        panel->childSetValue("terrain_lower_spin", LLSD(terrain_lower_limit));

+        panel->childSetValue("use_estate_sun_check", LLSD(use_estate_sun));

+

+        panel->childSetValue("fixed_sun_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SUN_FIXED)));

+        panel->childSetEnabled("fixed_sun_check", allow_modify && !use_estate_sun);

+        panel->childSetValue("sun_hour_slider", LLSD(sun_hour));

+        panel->childSetEnabled("sun_hour_slider", allow_modify && !use_estate_sun);

+        panel->setCtrlsEnabled(allow_modify);

+

+        getInstance()->refreshFromRegion( gAgent.getRegion() );

+}

+

+// static

+LLPanelEstateInfo* LLFloaterRegionInfo::getPanelEstate()

+{

+        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();

+        if (!floater) return NULL;

+        LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");

+        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");

+        return panel;

+}

+

+// static

+LLPanelEstateCovenant* LLFloaterRegionInfo::getPanelCovenant()

+{

+        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();

+        if (!floater) return NULL;

+        LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");

+        LLPanelEstateCovenant* panel = (LLPanelEstateCovenant*)tab->getChild<LLPanel>("Covenant");

+        return panel;

+}

+

+// static

+LLPanelRegionOpenSettingsInfo* LLFloaterRegionInfo::getPanelOpenSettings()

+{

+        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();

+        if (!floater) return NULL;

+        LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");

+        LLPanelRegionOpenSettingsInfo* panel;

+        panel = (LLPanelRegionOpenSettingsInfo*)tab->getChild<LLPanel>("RegionSettings");

+        return panel;

+}

+

+void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region)

+{

+        // call refresh from region on all panels

+        std::for_each(

+                mInfoPanels.begin(),

+                mInfoPanels.end(),

+                llbind2nd(

+#if LL_WINDOWS

+                        std::mem_fun1(&LLPanelRegionInfo::refreshFromRegion),

+#else

+                        std::mem_fun(&LLPanelRegionInfo::refreshFromRegion),

+#endif

+                        region));

+}

+

+// public

+void LLFloaterRegionInfo::refresh()

+{

+        for(info_panels_t::iterator iter = mInfoPanels.begin();

+                iter != mInfoPanels.end(); ++iter)

+        {

+                (*iter)->refresh();

+        }

+}

+

+

+///----------------------------------------------------------------------------

+/// Local class implementation

+///----------------------------------------------------------------------------

+

+//

+// LLPanelRegionInfo

+//

+

+// static

+void LLPanelRegionInfo::onBtnSet(void* user_data)

+{

+        LLPanelRegionInfo* panel = (LLPanelRegionInfo*)user_data;

+        if(!panel) return;

+        if (panel->sendUpdate())

+        {

+                panel->disableButton("apply_btn");

+        }

+}

+

+//static 

+void LLPanelRegionInfo::onChangeChildCtrl(LLUICtrl* ctrl, void* user_data)

+{

+        if (ctrl)

+        {

+                LLPanelRegionInfo* panel = (LLPanelRegionInfo*) ctrl->getParent();

+                panel->updateChild(ctrl);

+        }

+}

+

+// static

+// Enables the "set" button if it is not already enabled

+void LLPanelRegionInfo::onChangeAnything(LLUICtrl* ctrl, void* user_data)

+{

+        LLPanelRegionInfo* panel = (LLPanelRegionInfo*)user_data;

+        if(panel)

+        {

+                panel->enableButton("apply_btn");

+                panel->refresh();

+        }

+}

+

+// static

+// Enables set button on change to line editor

+void LLPanelRegionInfo::onChangeText(LLLineEditor* caller, void* user_data)

+{

+        // reuse the previous method

+        onChangeAnything(0, user_data);

+}

+

+

+// virtual

+BOOL LLPanelRegionInfo::postBuild()

+{

+        childSetAction("apply_btn", onBtnSet, this);

+        childDisable("apply_btn");

+        refresh();

+        return TRUE;

+}

+

+// virtual 

+void LLPanelRegionInfo::updateChild(LLUICtrl* child_ctr)

+{

+}

+

+// virtual

+bool LLPanelRegionInfo::refreshFromRegion(LLViewerRegion* region)

+{

+        if (region) mHost = region->getHost();

+        return true;

+}

+

+void LLPanelRegionInfo::sendEstateOwnerMessage(

+        LLMessageSystem* msg,

+        const std::string& request,

+        const LLUUID& invoice,

+        const strings_t& strings)

+{

+        llinfos << "Sending estate request '" << request << "'" << llendl;

+        msg->newMessage("EstateOwnerMessage");

+        msg->nextBlockFast(_PREHASH_AgentData);

+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());

+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());

+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used

+        msg->nextBlock("MethodData");

+        msg->addString("Method", request);

+        msg->addUUID("Invoice", invoice);

+        if(strings.empty())

+        {

+                msg->nextBlock("ParamList");

+                msg->addString("Parameter", NULL);

+        }

+        else

+        {

+                strings_t::const_iterator it = strings.begin();

+                strings_t::const_iterator end = strings.end();

+                for(; it != end; ++it)

+                {

+                        msg->nextBlock("ParamList");

+                        msg->addString("Parameter", *it);

+                }

+        }

+        msg->sendReliable(mHost);

+}

+

+void LLPanelRegionInfo::enableButton(const std::string& btn_name, BOOL enable)

+{

+        childSetEnabled(btn_name, enable);

+}

+

+void LLPanelRegionInfo::disableButton(const std::string& btn_name)

+{

+        childDisable(btn_name);

+}

+

+void LLPanelRegionInfo::initCtrl(const std::string& name)

+{

+        childSetCommitCallback(name, onChangeAnything, this);

+}

+

+void LLPanelRegionInfo::initHelpBtn(const std::string& name, const std::string& xml_alert)

+{

+        childSetAction(name, onClickHelp, new std::string(xml_alert));

+}

+

+// static

+void LLPanelRegionInfo::onClickHelp(void* data)

+{

+        std::string* xml_alert = (std::string*)data;

+        LLNotifications::instance().add(*xml_alert);

+}

+

+/////////////////////////////////////////////////////////////////////////////

+// LLPanelRegionGeneralInfo

+//

+bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)

+{

+        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());

+        setCtrlsEnabled(allow_modify);

+        childDisable("apply_btn");

+        childSetEnabled("access_text", allow_modify);

+        // childSetEnabled("access_combo", allow_modify);

+        // now set in processRegionInfo for teen grid detection

+        childSetEnabled("kick_btn", allow_modify);

+        childSetEnabled("kick_all_btn", allow_modify);

+        childSetEnabled("im_btn", allow_modify);

+        childSetEnabled("manage_telehub_btn", allow_modify);

+

+        // Data gets filled in by processRegionInfo

+

+        return LLPanelRegionInfo::refreshFromRegion(region);

+}

+

+BOOL LLPanelRegionGeneralInfo::postBuild()

+{

+        // Enable the "Apply" button if something is changed. JC

+        initCtrl("block_terraform_check");

+        initCtrl("block_fly_check");

+        initCtrl("allow_damage_check");

+        initCtrl("allow_land_resell_check");

+        initCtrl("allow_parcel_changes_check");

+        initCtrl("agent_limit_spin");

+        initCtrl("object_bonus_spin");

+        initCtrl("access_combo");

+        initCtrl("restrict_pushobject");

+        initCtrl("block_parcel_search_check");

+        initCtrl("minimum_agent_age");

+

+        initHelpBtn("terraform_help",           "HelpRegionBlockTerraform");

+        initHelpBtn("fly_help",                         "HelpRegionBlockFly");

+        initHelpBtn("damage_help",                      "HelpRegionAllowDamage");

+        initHelpBtn("agent_limit_help",         "HelpRegionAgentLimit");

+        initHelpBtn("object_bonus_help",        "HelpRegionObjectBonus");

+        initHelpBtn("access_help",                      "HelpRegionMaturity");

+        initHelpBtn("restrict_pushobject_help",         "HelpRegionRestrictPushObject");

+        initHelpBtn("land_resell_help", "HelpRegionLandResell");

+        initHelpBtn("parcel_changes_help", "HelpParcelChanges");

+        initHelpBtn("parcel_search_help", "HelpRegionSearch");

+

+        childSetAction("kick_btn", onClickKick, this);

+        childSetAction("kick_all_btn", onClickKickAll, this);

+        childSetAction("im_btn", onClickMessage, this);

+        childSetAction("manage_telehub_btn", onClickManageTelehub, this);

+

+        return LLPanelRegionInfo::postBuild();

+}

+

+// static

+void LLPanelRegionGeneralInfo::onClickKick(void* userdata)

+{

+        llinfos << "LLPanelRegionGeneralInfo::onClickKick" << llendl;

+        LLPanelRegionGeneralInfo* panelp = (LLPanelRegionGeneralInfo*)userdata;

+

+        // this depends on the grandparent view being a floater

+        // in order to set up floater dependency

+        LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);

+        LLFloater* child_floater = LLFloaterAvatarPicker::show(onKickCommit, userdata, FALSE, TRUE);

+        parent_floater->addDependentFloater(child_floater);

+}

+

+// static

+void LLPanelRegionGeneralInfo::onKickCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata)

+{

+        if (names.empty() || ids.empty()) return;

+        if(ids[0].notNull())

+        {

+                LLPanelRegionGeneralInfo* self = (LLPanelRegionGeneralInfo*)userdata;

+                if(!self) return;

+                strings_t strings;

+                // [0] = our agent id

+                // [1] = target agent id

+                std::string buffer;

+                gAgent.getID().toString(buffer);

+                strings.push_back(buffer);

+

+                ids[0].toString(buffer);

+                strings.push_back(strings_t::value_type(buffer));

+

+                LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+                self->sendEstateOwnerMessage(gMessageSystem, "teleporthomeuser", invoice, strings);

+        }

+}

+

+// static

+void LLPanelRegionGeneralInfo::onClickKickAll(void* userdata)

+{

+        llinfos << "LLPanelRegionGeneralInfo::onClickKickAll" << llendl;

+        LLNotifications::instance().add("KickUsersFromRegion", 

+                                                                        LLSD(), 

+                                                                        LLSD(), 

+                                                                        boost::bind(&LLPanelRegionGeneralInfo::onKickAllCommit, (LLPanelRegionGeneralInfo*)userdata, _1, _2));

+}

+

+bool LLPanelRegionGeneralInfo::onKickAllCommit(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        if (option == 0)

+        {

+                strings_t strings;

+                // [0] = our agent id

+                std::string buffer;

+                gAgent.getID().toString(buffer);

+                strings.push_back(buffer);

+

+                LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+                // historical message name

+                sendEstateOwnerMessage(gMessageSystem, "teleporthomeallusers", invoice, strings);

+        }

+        return false;

+}

+

+// static

+void LLPanelRegionGeneralInfo::onClickMessage(void* userdata)

+{

+        llinfos << "LLPanelRegionGeneralInfo::onClickMessage" << llendl;

+        LLNotifications::instance().add("MessageRegion", 

+                LLSD(), 

+                LLSD(), 

+                boost::bind(&LLPanelRegionGeneralInfo::onMessageCommit, (LLPanelRegionGeneralInfo*)userdata, _1, _2));

+}

+

+// static

+bool LLPanelRegionGeneralInfo::onMessageCommit(const LLSD& notification, const LLSD& response)

+{

+        if(LLNotification::getSelectedOption(notification, response) != 0) return false;

+

+        std::string text = response["message"].asString();

+        if (text.empty()) return false;

+

+        llinfos << "Message to everyone: " << text << llendl;

+        strings_t strings;

+        // [0] grid_x, unused here

+        // [1] grid_y, unused here

+        // [2] agent_id of sender

+        // [3] sender name

+        // [4] message

+        strings.push_back("-1");

+        strings.push_back("-1");

+        std::string buffer;

+        gAgent.getID().toString(buffer);

+        strings.push_back(buffer);

+        std::string name;

+        gAgent.buildFullname(name);

+        strings.push_back(strings_t::value_type(name));

+        strings.push_back(strings_t::value_type(text));

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        sendEstateOwnerMessage(gMessageSystem, "simulatormessage", invoice, strings);

+        return false;

+}

+

+// static

+void LLPanelRegionGeneralInfo::onClickManageTelehub(void* data)

+{

+        LLFloaterRegionInfo::getInstance()->close();

+

+        LLFloaterTelehub::show();

+}

+

+// setregioninfo

+// strings[0] = 'Y' - block terraform, 'N' - not

+// strings[1] = 'Y' - block fly, 'N' - not

+// strings[2] = 'Y' - allow damage, 'N' - not

+// strings[3] = 'Y' - allow land sale, 'N' - not

+// strings[4] = agent limit

+// strings[5] = object bonus

+// strings[6] = sim access (0 = unknown, 13 = PG, 21 = Mature, 42 = Adult)

+// strings[7] = restrict pushobject

+// strings[8] = 'Y' - allow parcel subdivide, 'N' - not

+// strings[9] = 'Y' - block parcel search, 'N' - allow

+BOOL LLPanelRegionGeneralInfo::sendUpdate()

+{

+        llinfos << "LLPanelRegionGeneralInfo::sendUpdate()" << llendl;

+

+        // First try using a Cap.  If that fails use the old method.

+        LLSD body;

+        std::string url = gAgent.getRegion()->getCapability("DispatchRegionInfo");

+        if (!url.empty())

+        {

+                body["block_terraform"] = childGetValue("block_terraform_check");

+                body["block_fly"] = childGetValue("block_fly_check");

+                body["allow_damage"] = childGetValue("allow_damage_check");

+                body["allow_land_resell"] = childGetValue("allow_land_resell_check");

+                body["agent_limit"] = childGetValue("agent_limit_spin");

+                body["prim_bonus"] = childGetValue("object_bonus_spin");

+                body["sim_access"] = childGetValue("access_combo");

+                body["restrict_pushobject"] = childGetValue("restrict_pushobject");

+                body["allow_parcel_changes"] = childGetValue("allow_parcel_changes_check");

+                body["block_parcel_search"] = childGetValue("block_parcel_search_check");

+                body["minimum_agent_age"] = childGetValue("minimum_agent_age");

+

+                LLHTTPClient::post(url, body, new LLHTTPClient::Responder());

+        }

+        else

+        {

+                strings_t strings;

+                std::string buffer;

+

+                buffer = llformat("%s", (childGetValue("block_terraform_check").asBoolean() ? "Y" : "N"));

+                strings.push_back(strings_t::value_type(buffer));

+

+                buffer = llformat("%s", (childGetValue("block_fly_check").asBoolean() ? "Y" : "N"));

+                strings.push_back(strings_t::value_type(buffer));

+

+                buffer = llformat("%s", (childGetValue("allow_damage_check").asBoolean() ? "Y" : "N"));

+                strings.push_back(strings_t::value_type(buffer));

+

+                buffer = llformat("%s", (childGetValue("allow_land_resell_check").asBoolean() ? "Y" : "N"));

+                strings.push_back(strings_t::value_type(buffer));

+

+                F32 value = (F32)childGetValue("agent_limit_spin").asReal();

+                buffer = llformat("%f", value);

+                strings.push_back(strings_t::value_type(buffer));

+

+                value = (F32)childGetValue("object_bonus_spin").asReal();

+                buffer = llformat("%f", value);

+                strings.push_back(strings_t::value_type(buffer));

+

+                buffer = llformat("%d", childGetValue("access_combo").asInteger());

+                strings.push_back(strings_t::value_type(buffer));

+

+                buffer = llformat("%s", (childGetValue("restrict_pushobject").asBoolean() ? "Y" : "N"));

+                strings.push_back(strings_t::value_type(buffer));

+

+                buffer = llformat("%s", (childGetValue("allow_parcel_changes_check").asBoolean() ? "Y" : "N"));

+                strings.push_back(strings_t::value_type(buffer));

+

+                LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+                sendEstateOwnerMessage(gMessageSystem, "setregioninfo", invoice, strings);

+        }

+

+        // if we changed access levels, tell user about it

+        LLViewerRegion* region = gAgent.getRegion();

+        if (region && (childGetValue("access_combo").asInteger() != region->getSimAccess()) )

+        {

+                LLNotifications::instance().add("RegionMaturityChange");

+        }       

+

+        return TRUE;

+}

+

+/////////////////////////////////////////////////////////////////////////////

+// LLPanelRegionOpenSettingsInfo

+//

+bool LLPanelRegionOpenSettingsInfo::refreshFromRegion(LLViewerRegion* region)

+{

+        // Data gets filled in by hippo manager

+        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());

+        

+        childSetValue("draw_distance", gAgent.mDrawDistance);

+        childSetValue("force_draw_distance", gAgent.mLockedDrawDistance);

+        childSetValue("allow_minimap", LLSD(gHippoLimits->mAllowMinimap));

+        childSetValue("allow_physical_prims", (gHippoLimits->mAllowPhysicalPrims == 1 ? TRUE : FALSE));

+        childSetValue("max_drag_distance", LLSD(gHippoLimits->mMaxDragDistance));

+        childSetValue("min_hole_size", LLSD(gHippoLimits->mMinHoleSize));

+        childSetValue("max_hollow_size", LLSD(gHippoLimits->mMaxHollow));

+        childSetValue("max_inventory_items_transfer", LLSD(gHippoLimits->mMaxInventoryItemsTransfer));

+        childSetValue("max_link_count", LLSD(gHippoLimits->mMaxLinkedPrims));

+        childSetValue("max_link_count_phys", LLSD(gHippoLimits->mMaxPhysLinkedPrims));

+        childSetValue("max_phys_prim_scale", LLSD(gHippoLimits->mMaxPrimScale));//Todo:Fix

+        childSetValue("max_prim_scale", LLSD(gHippoLimits->mMaxPrimScale));

+        childSetValue("min_prim_scale", LLSD(gHippoLimits->mMinPrimScale));

+        childSetValue("render_water", LLSD(gHippoLimits->mRenderWater));

+        childSetValue("show_tags", LLSD(gHippoLimits->mRenderName));

+        childSetValue("max_groups", LLSD(gHippoLimits->mMaxAgentGroups));

+        childSetValue("allow_parcel_windlight", LLSD(gHippoLimits->mAllowParcelWindLight));

+        childSetValue("enable_teen_mode", LLSD(gHippoLimits->mEnableTeenMode));

+        childSetValue("enforce_max_build", LLSD(gHippoLimits->mEnforceMaxBuild));

+

+        setCtrlsEnabled(allow_modify);

+ 

+        return LLPanelRegionInfo::refreshFromRegion(region);

+}

+

+BOOL LLPanelRegionOpenSettingsInfo::postBuild()

+{

+        // Enable the "Apply" button if something is changed. JC

+        initCtrl("draw_distance");

+        initCtrl("force_draw_distance");

+        initCtrl("max_drag_distance");

+        initCtrl("max_prim_scale");

+        initCtrl("min_prim_scale");

+        initCtrl("max_phys_prim_scale");

+        initCtrl("max_hollow_size");

+        initCtrl("min_hole_size");

+        initCtrl("max_link_count");

+        initCtrl("max_link_count_phys");

+        initCtrl("max_inventory_items_transfer");

+        initCtrl("max_groups");

+        initCtrl("render_water");

+        initCtrl("allow_minimap");

+        initCtrl("allow_physical_prims");

+        initCtrl("enable_teen_mode");

+        initCtrl("show_tags");

+        initCtrl("allow_parcel_windlight");

+

+        initHelpBtn("force_draw_distance_help",         "HelpForceDrawDistance");

+        initHelpBtn("max_inventory_items_transfer_help",                                "HelpMaxInventoryItemsTransfer");

+        initHelpBtn("max_groups_help",                  "HelpMaxGroups");

+        initHelpBtn("render_water_help",                "HelpRenderWater");

+        initHelpBtn("allow_minimap_help",       "HelpAllowMinimap");

+        initHelpBtn("allow_physical_prims_help",                        "HelpAllowPhysicalPrims");

+        initHelpBtn("enable_teen_mode_help",            "HelpEnableTeenMode");

+        initHelpBtn("show_tags_help",   "HelpShowTags");

+        initHelpBtn("allow_parcel_windlight_help", "HelpAllowParcelWindLight");

+

+        childSetAction("apply_ors_btn", sendUpdate, this);

+

+        refreshFromRegion(gAgent.getRegion());

+

+        return LLPanelRegionInfo::postBuild();

+}

+

+// setregioninfo

+// strings[0] = 'Y' - block terraform, 'N' - not

+// strings[1] = 'Y' - block fly, 'N' - not

+// strings[2] = 'Y' - allow damage, 'N' - not

+// strings[3] = 'Y' - allow land sale, 'N' - not

+// strings[4] = agent limit

+// strings[5] = object bonus

+// strings[6] = sim access (0 = unknown, 13 = PG, 21 = Mature, 42 = Adult)

+// strings[7] = restrict pushobject

+// strings[8] = 'Y' - allow parcel subdivide, 'N' - not

+// strings[9] = 'Y' - block parcel search, 'N' - allow

+void LLPanelRegionOpenSettingsInfo::sendUpdate(void* userdata)

+{

+        LLPanelRegionOpenSettingsInfo* self;

+        self = (LLPanelRegionOpenSettingsInfo*)userdata;

+        

+        llinfos << "LLPanelRegionOpenSettingsInfo::sendUpdate()" << llendl;

+

+        LLSD body;

+        std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings");

+        if (!url.empty())

+        {

+                body["draw_distance"] = self->childGetValue("draw_distance");

+                body["force_draw_distance"] = self->childGetValue("force_draw_distance");

+                body["allow_minimap"] = self->childGetValue("allow_minimap");

+                body["allow_physical_prims"] = self->childGetValue("allow_physical_prims");

+                body["max_drag_distance"] = self->childGetValue("max_drag_distance");

+                body["min_hole_size"] = self->childGetValue("min_hole_size");

+                body["max_hollow_size"] = self->childGetValue("max_hollow_size");

+                body["max_inventory_items_transfer"] = self->childGetValue("max_inventory_items_transfer");

+                body["max_link_count"] = self->childGetValue("max_link_count");

+                body["max_link_count_phys"] = self->childGetValue("max_link_count_phys");

+                body["max_phys_prim_scale"] = self->childGetValue("max_phys_prim_scale");

+                body["max_prim_scale"] = self->childGetValue("max_prim_scale");

+                body["min_prim_scale"] = self->childGetValue("min_prim_scale");

+                body["render_water"] = self->childGetValue("render_water");

+                body["show_tags"] = self->childGetValue("show_tags");

+                body["max_groups"] = self->childGetValue("max_groups");

+                body["allow_parcel_windlight"] = self->childGetValue("allow_parcel_windlight");

+                body["enable_teen_mode"] = self->childGetValue("enable_teen_mode");

+                body["enforce_max_build"] = self->childGetValue("enforce_max_build");

+

+                LLHTTPClient::post(url, body, new LLHTTPClient::Responder());

+        }

+}

+

+/////////////////////////////////////////////////////////////////////////////

+// LLPanelRegionDebugInfo

+/////////////////////////////////////////////////////////////////////////////

+BOOL LLPanelRegionDebugInfo::postBuild()

+{

+        LLPanelRegionInfo::postBuild();

+        initCtrl("disable_scripts_check");

+        initCtrl("disable_collisions_check");

+        initCtrl("disable_physics_check");

+

+        initHelpBtn("disable_scripts_help",             "HelpRegionDisableScripts");

+        initHelpBtn("disable_collisions_help",  "HelpRegionDisableCollisions");

+        initHelpBtn("disable_physics_help",             "HelpRegionDisablePhysics");

+        initHelpBtn("top_colliders_help",               "HelpRegionTopColliders");

+        initHelpBtn("top_scripts_help",                 "HelpRegionTopScripts");

+        initHelpBtn("restart_help",                             "HelpRegionRestart");

+        initHelpBtn("minimum_agent_age_help",   "HelpRegionMinimumAge");

+        

+

+        childSetAction("choose_avatar_btn", onClickChooseAvatar, this);

+        childSetAction("return_btn", onClickReturn, this);

+        childSetAction("top_colliders_btn", onClickTopColliders, this);

+        childSetAction("top_scripts_btn", onClickTopScripts, this);

+        childSetAction("restart_btn", onClickRestart, this);

+        childSetAction("cancel_restart_btn", onClickCancelRestart, this);

+

+        return TRUE;

+}

+

+// virtual

+bool LLPanelRegionDebugInfo::refreshFromRegion(LLViewerRegion* region)

+{

+        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());

+        setCtrlsEnabled(allow_modify);

+        childDisable("apply_btn");

+        childDisable("target_avatar_name");

+        

+        childSetEnabled("choose_avatar_btn", allow_modify);

+        childSetEnabled("return_scripts", allow_modify && !mTargetAvatar.isNull());

+        childSetEnabled("return_other_land", allow_modify && !mTargetAvatar.isNull());

+        childSetEnabled("return_estate_wide", allow_modify && !mTargetAvatar.isNull());

+        childSetEnabled("return_btn", allow_modify && !mTargetAvatar.isNull());

+        childSetEnabled("top_colliders_btn", allow_modify);

+        childSetEnabled("top_scripts_btn", allow_modify);

+        childSetEnabled("restart_btn", allow_modify);

+        childSetEnabled("cancel_restart_btn", allow_modify);

+

+        return LLPanelRegionInfo::refreshFromRegion(region);

+}

+

+// virtual

+BOOL LLPanelRegionDebugInfo::sendUpdate()

+{

+        llinfos << "LLPanelRegionDebugInfo::sendUpdate" << llendl;

+        strings_t strings;

+        std::string buffer;

+

+        buffer = llformat("%s", (childGetValue("disable_scripts_check").asBoolean() ? "Y" : "N"));

+        strings.push_back(buffer);

+

+        buffer = llformat("%s", (childGetValue("disable_collisions_check").asBoolean() ? "Y" : "N"));

+        strings.push_back(buffer);

+

+        buffer = llformat("%s", (childGetValue("disable_physics_check").asBoolean() ? "Y" : "N"));

+        strings.push_back(buffer);

+

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        sendEstateOwnerMessage(gMessageSystem, "setregiondebug", invoice, strings);

+        return TRUE;

+}

+

+void LLPanelRegionDebugInfo::onClickChooseAvatar(void* data)

+{

+        LLFloaterAvatarPicker::show(callbackAvatarID, data, FALSE, TRUE);

+}

+

+// static

+void LLPanelRegionDebugInfo::callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data)

+{

+        LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*) data;

+        if (ids.empty() || names.empty()) return;

+        self->mTargetAvatar = ids[0];

+        self->childSetValue("target_avatar_name", LLSD(names[0]));

+        self->refreshFromRegion( gAgent.getRegion() );

+}

+

+// static

+void LLPanelRegionDebugInfo::onClickReturn(void* data)

+{

+        LLPanelRegionDebugInfo* panelp = (LLPanelRegionDebugInfo*) data;

+        if (panelp->mTargetAvatar.isNull()) return;

+

+        LLSD args;

+        args["USER_NAME"] = panelp->childGetValue("target_avatar_name").asString();

+        LLSD payload;

+        payload["avatar_id"] = panelp->mTargetAvatar;

+        

+        U32 flags = SWD_ALWAYS_RETURN_OBJECTS;

+

+        if (panelp->childGetValue("return_scripts").asBoolean())

+        {

+                flags |= SWD_SCRIPTED_ONLY;

+        }

+        

+        if (panelp->childGetValue("return_other_land").asBoolean())

+        {

+                flags |= SWD_OTHERS_LAND_ONLY;

+        }

+        payload["flags"] = int(flags);

+        payload["return_estate_wide"] = panelp->childGetValue("return_estate_wide").asBoolean();

+        LLNotifications::instance().add("EstateObjectReturn", args, payload, 

+                                                                        boost::bind(&LLPanelRegionDebugInfo::callbackReturn, panelp, _1, _2));

+}

+

+bool LLPanelRegionDebugInfo::callbackReturn(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        if (option != 0) return false;

+

+        LLUUID target_avatar = notification["payload"]["avatar_id"].asUUID();

+        if (!target_avatar.isNull())

+        {

+                U32 flags = notification["payload"]["flags"].asInteger();

+                bool return_estate_wide = notification["payload"]["return_estate_wide"];

+                if (return_estate_wide)

+                {

+                        // send as estate message - routed by spaceserver to all regions in estate

+                        strings_t strings;

+                        strings.push_back(llformat("%d", flags));

+                        strings.push_back(target_avatar.asString());

+

+                        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+                

+                        sendEstateOwnerMessage(gMessageSystem, "estateobjectreturn", invoice, strings);

+                }

+                else

+                {

+                        // send to this simulator only

+                        send_sim_wide_deletes(target_avatar, flags);

+                }

+        }

+        return false;

+}

+

+

+// static

+void LLPanelRegionDebugInfo::onClickTopColliders(void* data)

+{

+        LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;

+        strings_t strings;

+        strings.push_back("1"); // one physics step

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        LLFloaterTopObjects::show();

+        LLFloaterTopObjects::clearList();

+        self->sendEstateOwnerMessage(gMessageSystem, "colliders", invoice, strings);

+}

+

+// static

+void LLPanelRegionDebugInfo::onClickTopScripts(void* data)

+{

+        LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;

+        strings_t strings;

+        strings.push_back("6"); // top 5 scripts

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        LLFloaterTopObjects::show();

+        LLFloaterTopObjects::clearList();

+        self->sendEstateOwnerMessage(gMessageSystem, "scripts", invoice, strings);

+}

+

+// static

+void LLPanelRegionDebugInfo::onClickRestart(void* data)

+{

+        LLNotifications::instance().add("ConfirmRestart", LLSD(), LLSD(), 

+                boost::bind(&LLPanelRegionDebugInfo::callbackRestart, (LLPanelRegionDebugInfo*)data, _1, _2));

+}

+

+bool LLPanelRegionDebugInfo::callbackRestart(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        if (option != 0) return false;

+

+        strings_t strings;

+        strings.push_back("120");

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        sendEstateOwnerMessage(gMessageSystem, "restart", invoice, strings);

+        return false;

+}

+

+// static

+void LLPanelRegionDebugInfo::onClickCancelRestart(void* data)

+{

+        LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;

+        strings_t strings;

+        strings.push_back("-1");

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        self->sendEstateOwnerMessage(gMessageSystem, "restart", invoice, strings);

+}

+

+

+/////////////////////////////////////////////////////////////////////////////

+// LLPanelRegionTextureInfo

+//

+LLPanelRegionTextureInfo::LLPanelRegionTextureInfo() : LLPanelRegionInfo()

+{

+        // nothing.

+}

+

+bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)

+{

+        BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());

+        setCtrlsEnabled(allow_modify);

+        childDisable("apply_btn");

+

+        if (region)

+        {

+                childSetValue("region_text", LLSD(region->getName()));

+        }

+        else

+        {

+                childSetValue("region_text", LLSD(""));

+        }

+

+        if (!region) return LLPanelRegionInfo::refreshFromRegion(region);

+

+        LLVLComposition* compp = region->getComposition();

+        LLTextureCtrl* texture_ctrl;

+        std::string buffer;

+        for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)

+        {

+                buffer = llformat("texture_detail_%d", i);

+                texture_ctrl = getChild<LLTextureCtrl>(buffer);

+                if(texture_ctrl)

+                {

+                        lldebugs << "Detail Texture " << i << ": "

+                                         << compp->getDetailTextureID(i) << llendl;

+                        LLUUID tmp_id(compp->getDetailTextureID(i));

+                        texture_ctrl->setImageAssetID(tmp_id);

+                }

+        }

+

+        for(S32 i = 0; i < CORNER_COUNT; ++i)

+    {

+                buffer = llformat("height_start_spin_%d", i);

+                childSetValue(buffer, LLSD(compp->getStartHeight(i)));

+                buffer = llformat("height_range_spin_%d", i);

+                childSetValue(buffer, LLSD(compp->getHeightRange(i)));

+        }

+

+        // Call the parent for common book-keeping

+        return LLPanelRegionInfo::refreshFromRegion(region);

+}

+

+

+BOOL LLPanelRegionTextureInfo::postBuild()

+{

+        LLPanelRegionInfo::postBuild();

+        std::string buffer;

+        for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)

+        {

+                buffer = llformat("texture_detail_%d", i);

+                initCtrl(buffer);

+        }

+

+        for(S32 i = 0; i < CORNER_COUNT; ++i)

+        {

+                buffer = llformat("height_start_spin_%d", i);

+                initCtrl(buffer);

+                buffer = llformat("height_range_spin_%d", i);

+                initCtrl(buffer);

+        }

+

+//      LLButton* btn = new LLButton("dump", LLRect(0, 20, 100, 0), "", onClickDump, this);

+//      btn->setFollows(FOLLOWS_TOP|FOLLOWS_LEFT);

+//      addChild(btn);

+

+        return LLPanelRegionInfo::postBuild();

+}

+

+BOOL LLPanelRegionTextureInfo::sendUpdate()

+{

+        llinfos << "LLPanelRegionTextureInfo::sendUpdate()" << llendl;

+

+        // Make sure user hasn't chosen wacky textures.

+        if (!validateTextureSizes())

+        {

+                return FALSE;

+        }

+

+        LLTextureCtrl* texture_ctrl;

+        std::string buffer;

+        std::string id_str;

+        LLMessageSystem* msg = gMessageSystem;

+        strings_t strings;

+

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        

+        for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)

+        {

+                buffer = llformat("texture_detail_%d", i);

+                texture_ctrl = getChild<LLTextureCtrl>(buffer);

+                if(texture_ctrl)

+                {

+                        LLUUID tmp_id(texture_ctrl->getImageAssetID());

+                        tmp_id.toString(id_str);

+                        buffer = llformat("%d %s", i, id_str.c_str());

+                        strings.push_back(buffer);

+                }

+        }

+        sendEstateOwnerMessage(msg, "texturedetail", invoice, strings);

+        strings.clear();

+        for(S32 i = 0; i < CORNER_COUNT; ++i)

+        {

+                buffer = llformat("height_start_spin_%d", i);

+                std::string buffer2 = llformat("height_range_spin_%d", i);

+                std::string buffer3 = llformat("%d %f %f", i, (F32)childGetValue(buffer).asReal(), (F32)childGetValue(buffer2).asReal());

+                strings.push_back(buffer3);

+        }

+        sendEstateOwnerMessage(msg, "textureheights", invoice, strings);

+        strings.clear();

+        sendEstateOwnerMessage(msg, "texturecommit", invoice, strings);

+        return TRUE;

+}

+

+BOOL LLPanelRegionTextureInfo::validateTextureSizes()

+{

+        for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)

+        {

+                std::string buffer;

+                buffer = llformat("texture_detail_%d", i);

+                LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(buffer);

+                if (!texture_ctrl) continue;

+

+                LLUUID image_asset_id = texture_ctrl->getImageAssetID();

+                LLViewerImage* img = gImageList.getImage(image_asset_id);

+                S32 components = img->getComponents();

+                // Must ask for highest resolution version's width. JC

+                S32 width = img->getWidth(0);

+                S32 height = img->getHeight(0);

+

+                //llinfos << "texture detail " << i << " is " << width << "x" << height << "x" << components << llendl;

+

+                if (components != 3)

+                {

+                        LLSD args;

+                        args["TEXTURE_NUM"] = i+1;

+                        args["TEXTURE_BIT_DEPTH"] = llformat("%d",components * 8);

+                        LLNotifications::instance().add("InvalidTerrainBitDepth", args);

+                        return FALSE;

+                }

+

+                if (width > 512 || height > 512)

+                {

+

+                        LLSD args;

+                        args["TEXTURE_NUM"] = i+1;

+                        args["TEXTURE_SIZE_X"] = width;

+                        args["TEXTURE_SIZE_Y"] = height;

+                        LLNotifications::instance().add("InvalidTerrainSize", args);

+                        return FALSE;

+                        

+                }

+        }

+

+        return TRUE;

+}

+

+

+// static

+void LLPanelRegionTextureInfo::onClickDump(void* data)

+{

+        llinfos << "LLPanelRegionTextureInfo::onClickDump()" << llendl;

+}

+

+

+/////////////////////////////////////////////////////////////////////////////

+// LLPanelRegionTerrainInfo

+/////////////////////////////////////////////////////////////////////////////

+BOOL LLPanelRegionTerrainInfo::postBuild()

+{

+        LLPanelRegionInfo::postBuild();

+

+        initHelpBtn("water_height_help",        "HelpRegionWaterHeight");

+        initHelpBtn("terrain_raise_help",       "HelpRegionTerrainRaise");

+        initHelpBtn("terrain_lower_help",       "HelpRegionTerrainLower");

+        initHelpBtn("upload_raw_help",          "HelpRegionUploadRaw");

+        initHelpBtn("download_raw_help",        "HelpRegionDownloadRaw");

+        initHelpBtn("use_estate_sun_help",      "HelpRegionUseEstateSun");

+        initHelpBtn("fixed_sun_help",           "HelpRegionFixedSun");

+        initHelpBtn("bake_terrain_help",        "HelpRegionBakeTerrain");

+

+        initCtrl("water_height_spin");

+        initCtrl("terrain_raise_spin");

+        initCtrl("terrain_lower_spin");

+

+        initCtrl("fixed_sun_check");

+        childSetCommitCallback("fixed_sun_check", onChangeFixedSun, this);

+        childSetCommitCallback("use_estate_sun_check", onChangeUseEstateTime, this);

+        childSetCommitCallback("sun_hour_slider", onChangeSunHour, this);

+

+        childSetAction("download_raw_btn", onClickDownloadRaw, this);

+        childSetAction("upload_raw_btn", onClickUploadRaw, this);

+        childSetAction("bake_terrain_btn", onClickBakeTerrain, this);

+

+        return TRUE;

+}

+

+// virtual

+bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region)

+{

+        llinfos << "LLPanelRegionTerrainInfo::refreshFromRegion" << llendl;

+

+        BOOL owner_or_god = gAgent.isGodlike() 

+                                                || (region && (region->getOwner() == gAgent.getID()));

+        BOOL owner_or_god_or_manager = owner_or_god

+                                                || (region && region->isEstateManager());

+        setCtrlsEnabled(owner_or_god_or_manager);

+        childDisable("apply_btn");

+

+        childSetEnabled("download_raw_btn", owner_or_god);

+        childSetEnabled("upload_raw_btn", owner_or_god);

+        childSetEnabled("bake_terrain_btn", owner_or_god);

+

+        return LLPanelRegionInfo::refreshFromRegion(region);

+}

+

+// virtual

+BOOL LLPanelRegionTerrainInfo::sendUpdate()

+{

+        llinfos << "LLPanelRegionTerrainInfo::sendUpdate" << llendl;

+        std::string buffer;

+        strings_t strings;

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+

+        buffer = llformat("%f", (F32)childGetValue("water_height_spin").asReal());

+        strings.push_back(buffer);

+        buffer = llformat("%f", (F32)childGetValue("terrain_raise_spin").asReal());

+        strings.push_back(buffer);

+        buffer = llformat("%f", (F32)childGetValue("terrain_lower_spin").asReal());

+        strings.push_back(buffer);

+        buffer = llformat("%s", (childGetValue("use_estate_sun_check").asBoolean() ? "Y" : "N"));

+        strings.push_back(buffer);

+        buffer = llformat("%s", (childGetValue("fixed_sun_check").asBoolean() ? "Y" : "N"));

+        strings.push_back(buffer);

+        buffer = llformat("%f", (F32)childGetValue("sun_hour_slider").asReal() );

+        strings.push_back(buffer);

+

+        // Grab estate information in case the user decided to set the

+        // region back to estate time. JC

+        LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();

+        if (!floater) return true;

+

+        LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");

+        if (!tab) return true;

+

+        LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");

+        if (!panel) return true;

+

+        BOOL estate_global_time = panel->getGlobalTime();

+        BOOL estate_fixed_sun = panel->getFixedSun();

+        F32 estate_sun_hour;

+        if (estate_global_time)

+        {

+                estate_sun_hour = 0.f;

+        }

+        else

+        {

+                estate_sun_hour = panel->getSunHour();

+        }

+

+        buffer = llformat("%s", (estate_global_time ? "Y" : "N") );

+        strings.push_back(buffer);

+        buffer = llformat("%s", (estate_fixed_sun ? "Y" : "N") );

+        strings.push_back(buffer);

+        buffer = llformat("%f", estate_sun_hour);

+        strings.push_back(buffer);

+

+        sendEstateOwnerMessage(gMessageSystem, "setregionterrain", invoice, strings);

+        return TRUE;

+}

+

+// static 

+void LLPanelRegionTerrainInfo::onChangeUseEstateTime(LLUICtrl* ctrl, void* user_data)

+{

+        LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) user_data;

+        if (!panel) return;

+        BOOL use_estate_sun = panel->childGetValue("use_estate_sun_check").asBoolean();

+        panel->childSetEnabled("fixed_sun_check", !use_estate_sun);

+        panel->childSetEnabled("sun_hour_slider", !use_estate_sun);

+        if (use_estate_sun)

+        {

+                panel->childSetValue("fixed_sun_check", LLSD(FALSE));

+                panel->childSetValue("sun_hour_slider", LLSD(0.f));

+        }

+        panel->childEnable("apply_btn");

+}

+

+// static 

+void LLPanelRegionTerrainInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)

+{

+        LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) user_data;

+        if (!panel) return;

+        // Just enable the apply button.  We let the sun-hour slider be enabled

+        // for both fixed-sun and non-fixed-sun. JC

+        panel->childEnable("apply_btn");

+}

+

+// static 

+void LLPanelRegionTerrainInfo::onChangeSunHour(LLUICtrl* ctrl, void*)

+{

+        // can't use userdata to get panel, slider uses it internally

+        LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) ctrl->getParent();

+        if (!panel) return;

+        panel->childEnable("apply_btn");

+}

+

+// static

+void LLPanelRegionTerrainInfo::onClickDownloadRaw(void* data)

+{

+        LLFilePicker& picker = LLFilePicker::instance();

+        if (!picker.getSaveFile(LLFilePicker::FFSAVE_RAW, "terrain.raw"))

+        {

+                llwarns << "No file" << llendl;

+                return;

+        }

+        std::string filepath = picker.getFirstFile();

+        gXferManager->expectFileForRequest(filepath);

+

+        LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;

+        strings_t strings;

+        strings.push_back("download filename");

+        strings.push_back(filepath);

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        self->sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);

+}

+

+// static

+void LLPanelRegionTerrainInfo::onClickUploadRaw(void* data)

+{

+        LLFilePicker& picker = LLFilePicker::instance();

+        if (!picker.getOpenFile(LLFilePicker::FFLOAD_RAW))

+        {

+                llwarns << "No file" << llendl;

+                return;

+        }

+        std::string filepath = picker.getFirstFile();

+        gXferManager->expectFileForTransfer(filepath);

+

+        LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;

+        strings_t strings;

+        strings.push_back("upload filename");

+        strings.push_back(filepath);

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        self->sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);

+

+        LLNotifications::instance().add("RawUploadStarted");

+}

+

+// static

+void LLPanelRegionTerrainInfo::onClickBakeTerrain(void* data)

+{

+        LLNotifications::instance().add(

+                LLNotification::Params("ConfirmBakeTerrain")

+                .functor(boost::bind(&LLPanelRegionTerrainInfo::callbackBakeTerrain, (LLPanelRegionTerrainInfo*)data, _1, _2)));

+}

+

+bool LLPanelRegionTerrainInfo::callbackBakeTerrain(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        if (option != 0) return false;

+

+        strings_t strings;

+        strings.push_back("bake");

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);

+        return false;

+}

+

+/////////////////////////////////////////////////////////////////////////////

+// LLPanelEstateInfo

+//

+

+LLPanelEstateInfo::LLPanelEstateInfo() 

+:       LLPanelRegionInfo(),

+        mEstateID(0)    // invalid

+{

+}

+

+// static

+void LLPanelEstateInfo::initDispatch(LLDispatcher& dispatch)

+{

+        std::string name;

+

+//      name.assign("setowner");

+//      static LLDispatchSetEstateOwner set_owner;

+//      dispatch.addHandler(name, &set_owner);

+

+        name.assign("estateupdateinfo");

+        static LLDispatchEstateUpdateInfo estate_update_info;

+        dispatch.addHandler(name, &estate_update_info);

+

+        name.assign("setaccess");

+        static LLDispatchSetEstateAccess set_access;

+        dispatch.addHandler(name, &set_access);

+

+        estate_dispatch_initialized = true;

+}

+

+// static

+// Disables the sun-hour slider and the use fixed time check if the use global time is check

+void LLPanelEstateInfo::onChangeUseGlobalTime(LLUICtrl* ctrl, void* user_data)

+{

+        LLPanelEstateInfo* panel = (LLPanelEstateInfo*) user_data;

+        if (panel)

+        {

+                bool enabled = !panel->childGetValue("use_global_time_check").asBoolean();

+                panel->childSetEnabled("sun_hour_slider", enabled);

+                panel->childSetEnabled("fixed_sun_check", enabled);

+                panel->childSetValue("fixed_sun_check", LLSD(FALSE));

+                panel->enableButton("apply_btn");

+        }

+}

+

+// Enables the sun-hour slider if the fixed-sun checkbox is set

+void LLPanelEstateInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)

+{

+        LLPanelEstateInfo* panel = (LLPanelEstateInfo*) user_data;

+        if (panel)

+        {

+                bool enabled = !panel->childGetValue("fixed_sun_check").asBoolean();

+                panel->childSetEnabled("use_global_time_check", enabled);

+                panel->childSetValue("use_global_time_check", LLSD(FALSE));

+                panel->enableButton("apply_btn");

+        }

+}

+

+

+

+

+//---------------------------------------------------------------------------

+// Add/Remove estate access button callbacks

+//---------------------------------------------------------------------------

+void LLPanelEstateInfo::onClickEditSky(void* user_data)

+{

+        LLFloaterWindLight::show();

+}

+

+void LLPanelEstateInfo::onClickEditDayCycle(void* user_data)

+{

+        LLFloaterDayCycle::show();

+}

+

+// static

+void LLPanelEstateInfo::onClickAddAllowedAgent(void* user_data)

+{

+        LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;

+        LLCtrlListInterface *list = self->childGetListInterface("allowed_avatar_name_list");

+        if (!list) return;

+        if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)

+        {

+                //args

+

+                LLSD args;

+                args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);

+                LLNotifications::instance().add("MaxAllowedAgentOnRegion", args);

+                return;

+        }

+        accessAddCore(ESTATE_ACCESS_ALLOWED_AGENT_ADD, "EstateAllowedAgentAdd");

+}

+

+// static

+void LLPanelEstateInfo::onClickRemoveAllowedAgent(void* user_data)

+{

+        accessRemoveCore(ESTATE_ACCESS_ALLOWED_AGENT_REMOVE, "EstateAllowedAgentRemove", "allowed_avatar_name_list");

+}

+

+// static

+void LLPanelEstateInfo::onClickAddAllowedGroup(void* user_data)

+{

+        LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;

+        LLCtrlListInterface *list = self->childGetListInterface("allowed_group_name_list");

+        if (!list) return;

+        if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)

+        {

+                LLSD args;

+                args["MAX_GROUPS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);

+                LLNotifications::instance().add("MaxAllowedGroupsOnRegion", args);

+                return;

+        }

+

+        LLNotification::Params params("ChangeLindenAccess");

+        params.functor(boost::bind(&LLPanelEstateInfo::addAllowedGroup, self, _1, _2));

+        if (isLindenEstate())

+        {

+                LLNotifications::instance().add(params);

+        }

+        else

+        {

+                LLNotifications::instance().forceResponse(params, 0);

+        }

+}

+

+bool LLPanelEstateInfo::addAllowedGroup(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        if (option != 0) return false;

+

+        LLFloater* parent_floater = gFloaterView->getParentFloater(this);

+

+        LLFloaterGroupPicker* widget;

+        widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));

+        if (widget)

+        {

+                widget->setSelectCallback(addAllowedGroup2, NULL);

+                if (parent_floater)

+                {

+                        LLRect new_rect = gFloaterView->findNeighboringPosition(parent_floater, widget);

+                        widget->setOrigin(new_rect.mLeft, new_rect.mBottom);

+                        parent_floater->addDependentFloater(widget);

+                }

+        }

+

+        return false;

+}

+

+// static

+void LLPanelEstateInfo::onClickRemoveAllowedGroup(void* user_data)

+{

+        accessRemoveCore(ESTATE_ACCESS_ALLOWED_GROUP_REMOVE, "EstateAllowedGroupRemove", "allowed_group_name_list");

+}

+

+// static

+void LLPanelEstateInfo::onClickAddBannedAgent(void* user_data)

+{

+        LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;

+        LLCtrlListInterface *list = self->childGetListInterface("banned_avatar_name_list");

+        if (!list) return;

+        if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)

+        {

+                LLSD args;

+                args["MAX_BANNED"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);

+                LLNotifications::instance().add("MaxBannedAgentsOnRegion", args);

+                return;

+        }

+        accessAddCore(ESTATE_ACCESS_BANNED_AGENT_ADD, "EstateBannedAgentAdd");

+}

+

+// static

+void LLPanelEstateInfo::onClickRemoveBannedAgent(void* user_data)

+{

+        accessRemoveCore(ESTATE_ACCESS_BANNED_AGENT_REMOVE, "EstateBannedAgentRemove", "banned_avatar_name_list");

+}

+

+// static

+void LLPanelEstateInfo::onClickAddEstateManager(void* user_data)

+{

+        LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;

+        LLCtrlListInterface *list = self->childGetListInterface("estate_manager_name_list");

+        if (!list) return;

+        if (list->getItemCount() >= ESTATE_MAX_MANAGERS)

+        {       // Tell user they can't add more managers

+                LLSD args;

+                args["MAX_MANAGER"] = llformat("%d",ESTATE_MAX_MANAGERS);

+                LLNotifications::instance().add("MaxManagersOnRegion", args);

+        }

+        else

+        {       // Go pick managers to add

+                accessAddCore(ESTATE_ACCESS_MANAGER_ADD, "EstateManagerAdd");

+        }

+}

+

+// static

+void LLPanelEstateInfo::onClickRemoveEstateManager(void* user_data)

+{

+        accessRemoveCore(ESTATE_ACCESS_MANAGER_REMOVE, "EstateManagerRemove", "estate_manager_name_list");

+}

+

+//---------------------------------------------------------------------------

+// Kick from estate methods

+//---------------------------------------------------------------------------

+struct LLKickFromEstateInfo

+{

+        LLPanelEstateInfo *mEstatePanelp;

+        LLUUID      mAgentID;

+};

+

+void LLPanelEstateInfo::onClickKickUser(void *user_data)

+{

+        LLPanelEstateInfo* panelp = (LLPanelEstateInfo*)user_data;

+

+        // this depends on the grandparent view being a floater

+        // in order to set up floater dependency

+        LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);

+        LLFloater* child_floater = LLFloaterAvatarPicker::show(LLPanelEstateInfo::onKickUserCommit, user_data, FALSE, TRUE);

+        parent_floater->addDependentFloater(child_floater);

+}

+

+void LLPanelEstateInfo::onKickUserCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata)

+{

+        if (names.empty() || ids.empty()) return;

+        

+        //check to make sure there is one valid user and id

+        if( (ids[0].isNull()) ||

+                (names[0].length() == 0) )

+        {

+                return;

+        }

+

+        LLPanelEstateInfo* self = (LLPanelEstateInfo*)userdata;

+        if(!self) return;

+

+        //keep track of what user they want to kick and other misc info

+        LLKickFromEstateInfo *kick_info = new LLKickFromEstateInfo();

+        kick_info->mEstatePanelp = self;

+        kick_info->mAgentID     = ids[0];

+

+        //Bring up a confirmation dialog

+        LLSD args;

+        args["EVIL_USER"] = names[0];

+        LLSD payload;

+        payload["agent_id"] = ids[0];

+        LLNotifications::instance().add("EstateKickUser", args, payload, boost::bind(&LLPanelEstateInfo::kickUserConfirm, self, _1, _2));

+

+}

+

+bool LLPanelEstateInfo::kickUserConfirm(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        switch(option)

+        {

+        case 0:

+                {

+                        //Kick User

+                        strings_t strings;

+                        strings.push_back(notification["payload"]["agent_id"].asString());

+

+                        sendEstateOwnerMessage(gMessageSystem, "kickestate", LLFloaterRegionInfo::getLastInvoice(), strings);

+                        break;

+                }

+        default:

+                break;

+        }

+        return false;

+}

+

+//---------------------------------------------------------------------------

+// Core Add/Remove estate access methods

+// TODO: INTERNATIONAL: don't build message text here;

+// instead, create multiple translatable messages and choose

+// one based on the status.

+//---------------------------------------------------------------------------

+std::string all_estates_text()

+{

+        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();

+        if (!panel) return "(error)";

+

+        std::string owner = panel->getOwnerName();

+

+        LLViewerRegion* region = gAgent.getRegion();

+        if (gAgent.isGodlike())

+        {

+                return llformat("all estates\nowned by %s", owner.c_str());

+        }

+        else if (region && region->getOwner() == gAgent.getID())

+        {

+                return "all estates you own";

+        }

+        else if (region && region->isEstateManager())

+        {

+                return llformat("all estates that\nyou manage for %s", owner.c_str());

+        }

+        else

+        {

+                return "(error)";

+        }

+}

+

+// static

+bool LLPanelEstateInfo::isLindenEstate()

+{

+        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();

+        if (!panel) return false;

+

+        U32 estate_id = panel->getEstateID();

+        return (estate_id <= ESTATE_LAST_LINDEN);

+}

+

+typedef std::vector<LLUUID> AgentOrGroupIDsVector;

+struct LLEstateAccessChangeInfo

+{

+        LLEstateAccessChangeInfo(const LLSD& sd)

+        {

+                mDialogName = sd["dialog_name"].asString();

+                mOperationFlag = (U32)sd["operation"].asInteger();

+                LLSD::array_const_iterator end_it = sd["allowed_ids"].endArray();

+                for (LLSD::array_const_iterator id_it = sd["allowed_ids"].beginArray();

+                        id_it != end_it;

+                        ++id_it)

+                {

+                        mAgentOrGroupIDs.push_back(id_it->asUUID());

+                }

+        }

+

+        const LLSD asLLSD() const

+        {

+                LLSD sd;

+                sd["name"] = mDialogName;

+                sd["operation"] = (S32)mOperationFlag;

+                for (AgentOrGroupIDsVector::const_iterator it = mAgentOrGroupIDs.begin();

+                        it != mAgentOrGroupIDs.end();

+                        ++it)

+                {

+                        sd["allowed_ids"].append(*it);

+                }

+                return sd;

+        }

+

+        U32 mOperationFlag;     // ESTATE_ACCESS_BANNED_AGENT_ADD, _REMOVE, etc.

+        std::string mDialogName;

+        AgentOrGroupIDsVector mAgentOrGroupIDs; // List of agent IDs to apply to this change

+};

+

+// Special case callback for groups, since it has different callback format than names

+// static

+void LLPanelEstateInfo::addAllowedGroup2(LLUUID id, void* user_data)

+{

+        LLSD payload;

+        payload["operation"] = (S32)ESTATE_ACCESS_ALLOWED_GROUP_ADD;

+        payload["dialog_name"] = "EstateAllowedGroupAdd";

+        payload["allowed_ids"].append(id);

+

+        LLSD args;

+        args["ALL_ESTATES"] = all_estates_text();

+

+        LLNotification::Params params("EstateAllowedGroupAdd");

+        params.payload(payload)

+                .substitutions(args)

+                .functor(accessCoreConfirm);

+        if (isLindenEstate())

+        {

+                LLNotifications::instance().forceResponse(params, 0);

+        }

+        else

+        {

+                LLNotifications::instance().add(params);

+        }

+}

+

+// static

+void LLPanelEstateInfo::accessAddCore(U32 operation_flag, const std::string& dialog_name)

+{

+        LLSD payload;

+        payload["operation"] = (S32)operation_flag;

+        payload["dialog_name"] = dialog_name;

+        // agent id filled in after avatar picker

+

+        LLNotification::Params params("ChangeLindenAccess");

+        params.payload(payload)

+                .functor(accessAddCore2);

+

+        if (isLindenEstate())

+        {

+                LLNotifications::instance().add(params);

+        }

+        else

+        {

+                // same as clicking "OK"

+                LLNotifications::instance().forceResponse(params, 0);

+        }

+}

+

+// static

+bool LLPanelEstateInfo::accessAddCore2(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        if (option != 0)

+        {

+                // abort change

+                return false;

+        }

+

+        LLEstateAccessChangeInfo* change_info = new LLEstateAccessChangeInfo(notification["payload"]);

+        // avatar picker yes multi-select, yes close-on-select

+        LLFloaterAvatarPicker::show(accessAddCore3, (void*)change_info, TRUE, TRUE);

+        return false;

+}

+

+// static

+void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data)

+{

+        LLEstateAccessChangeInfo* change_info = (LLEstateAccessChangeInfo*)data;

+        if (!change_info) return;

+        if (ids.empty()) 

+        {

+                // User didn't select a name.

+                delete change_info;

+                change_info = NULL;

+                return;

+        }

+        // User did select a name.

+        change_info->mAgentOrGroupIDs = ids;

+        // Can't put estate owner on ban list

+        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();

+        if (!panel) return;

+        LLViewerRegion* region = gAgent.getRegion();

+        if (!region) return;

+        

+        if (change_info->mOperationFlag & ESTATE_ACCESS_ALLOWED_AGENT_ADD)

+        {

+                LLCtrlListInterface *list = panel->childGetListInterface("allowed_avatar_name_list");

+                int currentCount = (list ? list->getItemCount() : 0);

+                if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)

+                {

+                        LLSD args;

+                        args["NUM_ADDED"] = llformat("%d",ids.size());

+                        args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);

+                        args["LIST_TYPE"] = "Allowed Residents";

+                        args["NUM_EXCESS"] = llformat("%d",(ids.size()+currentCount)-ESTATE_MAX_ACCESS_IDS);

+                        LLNotifications::instance().add("MaxAgentOnRegionBatch", args);

+                        delete change_info;

+                        return;

+                }

+        }

+        if (change_info->mOperationFlag & ESTATE_ACCESS_BANNED_AGENT_ADD)

+        {

+                LLCtrlListInterface *list = panel->childGetListInterface("banned_avatar_name_list");

+                int currentCount = (list ? list->getItemCount() : 0);

+                if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)

+                {

+                        LLSD args;

+                        args["NUM_ADDED"] = llformat("%d",ids.size());

+                        args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);

+                        args["LIST_TYPE"] = "Banned Residents";

+                        args["NUM_EXCESS"] = llformat("%d",(ids.size()+currentCount)-ESTATE_MAX_ACCESS_IDS);

+                        LLNotifications::instance().add("MaxAgentOnRegionBatch", args);

+                        delete change_info;

+                        return;

+                }

+        }

+

+        LLSD args;

+        args["ALL_ESTATES"] = all_estates_text();

+

+        LLNotification::Params params(change_info->mDialogName);

+        params.substitutions(args)

+                .payload(change_info->asLLSD())

+                .functor(accessCoreConfirm);

+

+        if (isLindenEstate())

+        {

+                // just apply to this estate

+                LLNotifications::instance().forceResponse(params, 0);

+        }

+        else

+        {

+                // ask if this estate or all estates with this owner

+                LLNotifications::instance().add(params);

+        }

+}

+

+// static

+void LLPanelEstateInfo::accessRemoveCore(U32 operation_flag, const std::string& dialog_name, const std::string& list_ctrl_name)

+{

+        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();

+        if (!panel) return;

+        LLNameListCtrl* name_list = panel->getChild<LLNameListCtrl>(list_ctrl_name);

+        if (!name_list) return;

+

+        std::vector<LLScrollListItem*> list_vector = name_list->getAllSelected();

+        if (list_vector.size() == 0)

+                return;

+

+        LLSD payload;

+        payload["operation"] = (S32)operation_flag;

+        payload["dialog_name"] = dialog_name;

+        

+        for (std::vector<LLScrollListItem*>::const_iterator iter = list_vector.begin();

+             iter != list_vector.end();

+             iter++)

+        {

+                LLScrollListItem *item = (*iter);

+                payload["allowed_ids"].append(item->getUUID());

+        }

+        

+        LLNotification::Params params("ChangeLindenAccess");

+        params.payload(payload)

+                .functor(accessRemoveCore2);

+

+        if (isLindenEstate())

+        {

+                // warn on change linden estate

+                LLNotifications::instance().add(params);

+        }

+        else

+        {

+                // just proceed, as if clicking OK

+                LLNotifications::instance().forceResponse(params, 0);

+        }

+}

+

+// static

+bool LLPanelEstateInfo::accessRemoveCore2(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        if (option != 0)

+        {

+                // abort

+                return false;

+        }

+

+        // If Linden estate, can only apply to "this" estate, not all estates

+        // owned by NULL.

+        if (isLindenEstate())

+        {

+                accessCoreConfirm(notification, response);

+        }

+        else

+        {

+                LLSD args;

+                args["ALL_ESTATES"] = all_estates_text();

+                LLNotifications::instance().add(notification["payload"]["dialog_name"], 

+                                                                                args,

+                                                                                notification["payload"],

+                                                                                accessCoreConfirm);

+        }

+        return false;

+}

+

+// Used for both access add and remove operations, depending on the mOperationFlag

+// passed in (ESTATE_ACCESS_BANNED_AGENT_ADD, ESTATE_ACCESS_ALLOWED_AGENT_REMOVE, etc.)

+// static

+bool LLPanelEstateInfo::accessCoreConfirm(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        const U32 originalFlags = (U32)notification["payload"]["operation"].asInteger();

+

+        LLViewerRegion* region = gAgent.getRegion();

+        

+        LLSD::array_const_iterator end_it = notification["payload"]["allowed_ids"].endArray();

+

+        for (LLSD::array_const_iterator iter = notification["payload"]["allowed_ids"].beginArray();

+                iter != end_it;

+             iter++)

+        {

+                U32 flags = originalFlags;

+                if (iter + 1 != end_it)

+                        flags |= ESTATE_ACCESS_NO_REPLY;

+

+                const LLUUID id = iter->asUUID();

+                if (((U32)notification["payload"]["operation"].asInteger() & ESTATE_ACCESS_BANNED_AGENT_ADD)

+                    && region && (region->getOwner() == id))

+                {

+                        LLNotifications::instance().add("OwnerCanNotBeDenied");

+                        break;

+                }

+                switch(option)

+                {

+                        case 0:

+                            // This estate

+                            sendEstateAccessDelta(flags, id);

+                            break;

+                        case 1:

+                        {

+                                // All estates, either than I own or manage for this owner.  

+                                // This will be verified on simulator. JC

+                                if (!region) break;

+                                if (region->getOwner() == gAgent.getID()

+                                    || gAgent.isGodlike())

+                                {

+                                        flags |= ESTATE_ACCESS_APPLY_TO_ALL_ESTATES;

+                                        sendEstateAccessDelta(flags, id);

+                                }

+                                else if (region->isEstateManager())

+                                {

+                                        flags |= ESTATE_ACCESS_APPLY_TO_MANAGED_ESTATES;

+                                        sendEstateAccessDelta(flags, id);

+                                }

+                                break;

+                        }

+                        case 2:

+                        default:

+                            break;

+                }

+        }

+        return false;

+}

+

+// key = "estateaccessdelta"

+// str(estate_id) will be added to front of list by forward_EstateOwnerRequest_to_dataserver

+// str[0] = str(agent_id) requesting the change

+// str[1] = str(flags) (ESTATE_ACCESS_DELTA_*)

+// str[2] = str(agent_id) to add or remove

+// static

+void LLPanelEstateInfo::sendEstateAccessDelta(U32 flags, const LLUUID& agent_or_group_id)

+{

+        LLMessageSystem* msg = gMessageSystem;

+        msg->newMessage("EstateOwnerMessage");

+        msg->nextBlockFast(_PREHASH_AgentData);

+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());

+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());

+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used

+

+        msg->nextBlock("MethodData");

+        msg->addString("Method", "estateaccessdelta");

+        msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());

+

+        std::string buf;

+        gAgent.getID().toString(buf);

+        msg->nextBlock("ParamList");

+        msg->addString("Parameter", buf);

+

+        buf = llformat("%u", flags);

+        msg->nextBlock("ParamList");

+        msg->addString("Parameter", buf);

+

+        agent_or_group_id.toString(buf);

+        msg->nextBlock("ParamList");

+        msg->addString("Parameter", buf);

+

+

+        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();

+

+        if (flags & (ESTATE_ACCESS_ALLOWED_AGENT_ADD | ESTATE_ACCESS_ALLOWED_AGENT_REMOVE |

+                         ESTATE_ACCESS_BANNED_AGENT_ADD | ESTATE_ACCESS_BANNED_AGENT_REMOVE))

+        {

+                

+                panel->clearAccessLists();

+        }

+

+        gAgent.sendReliableMessage();

+}

+

+void LLPanelEstateInfo::updateControls(LLViewerRegion* region)

+{

+        BOOL god = gAgent.isGodlike();

+        BOOL owner = (region && (region->getOwner() == gAgent.getID()));

+        BOOL manager = (region && region->isEstateManager());

+        setCtrlsEnabled(god || owner || manager);

+        

+        childDisable("apply_btn");

+        childSetEnabled("add_allowed_avatar_btn",               god || owner || manager);

+        childSetEnabled("remove_allowed_avatar_btn",    god || owner || manager);

+        childSetEnabled("add_allowed_group_btn",                god || owner || manager);

+        childSetEnabled("remove_allowed_group_btn",             god || owner || manager);

+        childSetEnabled("add_banned_avatar_btn",                god || owner || manager);

+        childSetEnabled("remove_banned_avatar_btn",             god || owner || manager);

+        childSetEnabled("message_estate_btn",                   god || owner || manager);

+        childSetEnabled("kick_user_from_estate_btn",    god || owner || manager);

+        childSetEnabled("abuse_email_address",                  god || owner || manager);

+

+        // estate managers can't add estate managers

+        childSetEnabled("add_estate_manager_btn",               god || owner);

+        childSetEnabled("remove_estate_manager_btn",    god || owner);

+        childSetEnabled("estate_manager_name_list",             god || owner);

+}

+

+bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region)

+{

+        updateControls(region);

+        

+        // let the parent class handle the general data collection. 

+        bool rv = LLPanelRegionInfo::refreshFromRegion(region);

+

+        // We want estate info. To make sure it works across region

+        // boundaries and multiple packets, we add a serial number to the

+        // integers and track against that on update.

+        strings_t strings;

+        //integers_t integers;

+        //LLFloaterRegionInfo::incrementSerial();

+        LLFloaterRegionInfo::nextInvoice();

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        //integers.push_back(LLFloaterRegionInfo::());::getPanelEstate();

+

+        

+        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();

+        panel->clearAccessLists();

+        

+

+        sendEstateOwnerMessage(gMessageSystem, "getinfo", invoice, strings);

+

+        refresh();

+

+        return rv;

+}

+

+void LLPanelEstateInfo::updateChild(LLUICtrl* child_ctrl)

+{

+        if (checkRemovalButton(child_ctrl->getName()))

+        {

+                // do nothing

+        }

+        else if (checkSunHourSlider(child_ctrl))

+        {

+                // do nothing

+        }

+}

+

+bool LLPanelEstateInfo::estateUpdate(LLMessageSystem* msg)

+{

+        llinfos << "LLPanelEstateInfo::estateUpdate()" << llendl;

+        return false;

+}

+

+

+BOOL LLPanelEstateInfo::postBuild()

+{

+        // set up the callbacks for the generic controls

+        initCtrl("externally_visible_check");

+        initCtrl("use_global_time_check");

+        initCtrl("fixed_sun_check");

+        initCtrl("allow_direct_teleport");

+        initCtrl("limit_payment");

+        initCtrl("limit_age_verified");

+        initCtrl("voice_chat_check");

+        childSetCommitCallback("abuse_email_address", onChangeAnything, this);

+        childSetKeystrokeCallback("abuse_email_address", onChangeText, this);

+

+        initHelpBtn("estate_manager_help",                      "HelpEstateEstateManager");

+        initHelpBtn("use_global_time_help",                     "HelpEstateUseGlobalTime");

+        initHelpBtn("fixed_sun_help",                           "HelpEstateFixedSun");

+        initHelpBtn("WLEditSkyHelp",                            "HelpEditSky");

+        initHelpBtn("WLEditDayCycleHelp",                       "HelpEditDayCycle");

+

+        initHelpBtn("externally_visible_help",          "HelpEstateExternallyVisible");

+        initHelpBtn("allow_direct_teleport_help",       "HelpEstateAllowDirectTeleport");

+        initHelpBtn("allow_resident_help",                      "HelpEstateAllowResident");

+        initHelpBtn("allow_group_help",                         "HelpEstateAllowGroup");

+        initHelpBtn("ban_resident_help",                        "HelpEstateBanResident");

+        initHelpBtn("abuse_email_address_help",         "HelpEstateAbuseEmailAddress");

+        initHelpBtn("voice_chat_help",                  "HelpEstateVoiceChat");

+

+        // set up the use global time checkbox

+        childSetCommitCallback("use_global_time_check", onChangeUseGlobalTime, this);

+        childSetCommitCallback("fixed_sun_check", onChangeFixedSun, this);

+        childSetCommitCallback("sun_hour_slider", onChangeChildCtrl, this);

+

+        childSetCommitCallback("allowed_avatar_name_list", onChangeChildCtrl, this);

+        LLNameListCtrl *avatar_name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");

+        if (avatar_name_list)

+        {

+                avatar_name_list->setCommitOnSelectionChange(TRUE);

+                avatar_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);

+        }

+

+        childSetAction("add_allowed_avatar_btn", onClickAddAllowedAgent, this);

+        childSetAction("remove_allowed_avatar_btn", onClickRemoveAllowedAgent, this);

+

+        childSetCommitCallback("allowed_group_name_list", onChangeChildCtrl, this);

+        LLNameListCtrl* group_name_list = getChild<LLNameListCtrl>("allowed_group_name_list");

+        if (group_name_list)

+        {

+                group_name_list->setCommitOnSelectionChange(TRUE);

+                group_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);

+        }

+

+        childSetAction("add_allowed_group_btn", onClickAddAllowedGroup, this);

+        childSetAction("remove_allowed_group_btn", onClickRemoveAllowedGroup, this);

+

+        childSetCommitCallback("banned_avatar_name_list", onChangeChildCtrl, this);

+        LLNameListCtrl* banned_name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");

+        if (banned_name_list)

+        {

+                banned_name_list->setCommitOnSelectionChange(TRUE);

+                banned_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);

+        }

+

+        childSetAction("add_banned_avatar_btn", onClickAddBannedAgent, this);

+        childSetAction("remove_banned_avatar_btn", onClickRemoveBannedAgent, this);

+

+        childSetCommitCallback("estate_manager_name_list", onChangeChildCtrl, this);

+        LLNameListCtrl* manager_name_list = getChild<LLNameListCtrl>("estate_manager_name_list");

+        if (manager_name_list)

+        {

+                manager_name_list->setCommitOnSelectionChange(TRUE);

+                manager_name_list->setMaxItemCount(ESTATE_MAX_MANAGERS * 4);    // Allow extras for dupe issue

+        }

+

+        childSetAction("add_estate_manager_btn", onClickAddEstateManager, this);

+        childSetAction("remove_estate_manager_btn", onClickRemoveEstateManager, this);

+        childSetAction("message_estate_btn", onClickMessageEstate, this);

+        childSetAction("kick_user_from_estate_btn", onClickKickUser, this);

+

+        childSetAction("WLEditSky", onClickEditSky, this);

+        childSetAction("WLEditDayCycle", onClickEditDayCycle, this);

+

+        return LLPanelRegionInfo::postBuild();

+}

+

+void LLPanelEstateInfo::refresh()

+{

+        bool public_access = childGetValue("externally_visible_check").asBoolean();

+        childSetEnabled("Only Allow", public_access);

+        childSetEnabled("limit_payment", public_access);

+        childSetEnabled("limit_age_verified", public_access);

+        // if this is set to false, then the limit fields are meaningless and should be turned off

+        if (public_access == false)

+        {

+                childSetValue("limit_payment", false);

+                childSetValue("limit_age_verified", false);

+        }

+}

+

+BOOL LLPanelEstateInfo::sendUpdate()

+{

+        llinfos << "LLPanelEsateInfo::sendUpdate()" << llendl;

+

+        LLNotification::Params params("ChangeLindenEstate");

+        params.functor(boost::bind(&LLPanelEstateInfo::callbackChangeLindenEstate, this, _1, _2));

+

+        if (getEstateID() <= ESTATE_LAST_LINDEN)

+        {

+                // trying to change reserved estate, warn

+                LLNotifications::instance().add(params);

+        }

+        else

+        {

+                // for normal estates, just make the change

+                LLNotifications::instance().forceResponse(params, 0);

+        }

+        return TRUE;

+}

+

+bool LLPanelEstateInfo::callbackChangeLindenEstate(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        switch(option)

+        {

+        case 0:

+                // send the update

+                if (!commitEstateInfoCaps())

+                {

+                        // the caps method failed, try the old way

+                        LLFloaterRegionInfo::nextInvoice();

+                        commitEstateInfoDataserver();

+                }

+                // we don't want to do this because we'll get it automatically from the sim

+                // after the spaceserver processes it

+//              else

+//              {

+//                      // caps method does not automatically send this info

+//                      LLFloaterRegionInfo::requestRegionInfo();

+//              }

+                break;

+        case 1:

+        default:

+                // do nothing

+                break;

+        }

+        return false;

+}

+

+

+/*

+// Request = "getowner"

+// SParam[0] = "" (empty string)

+// IParam[0] = serial

+void LLPanelEstateInfo::getEstateOwner()

+{

+        // TODO -- disable the panel

+        // and call this function whenever we cross a region boundary

+        // re-enable when owner matches, and get new estate info

+        LLMessageSystem* msg = gMessageSystem;

+        msg->newMessageFast(_PREHASH_EstateOwnerRequest);

+        msg->nextBlockFast(_PREHASH_AgentData);

+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());

+

+        msg->nextBlockFast(_PREHASH_RequestData);

+        msg->addStringFast(_PREHASH_Request, "getowner");

+

+        // we send an empty string so that the variable block is not empty

+        msg->nextBlockFast(_PREHASH_StringData);

+        msg->addStringFast(_PREHASH_SParam, "");

+

+        msg->nextBlockFast(_PREHASH_IntegerData);

+        msg->addS32Fast(_PREHASH_IParam, LLFloaterRegionInfo::getSerial());

+

+        gAgent.sendMessage();

+}

+*/

+

+class LLEstateChangeInfoResponder : public LLHTTPClient::Responder

+{

+public:

+        LLEstateChangeInfoResponder(void* userdata) : mpPanel((LLPanelEstateInfo*)userdata) {};

+        

+        // if we get a normal response, handle it here

+        virtual void result(const LLSD& content)

+        {

+            // refresh the panel from the database

+                mpPanel->refresh();

+        }

+        

+        // if we get an error response

+        virtual void error(U32 status, const std::string& reason)

+        {

+                llinfos << "LLEstateChangeInfoResponder::error "

+                        << status << ": " << reason << llendl;

+        }

+private:

+        LLPanelEstateInfo* mpPanel;

+};

+

+// tries to send estate info using a cap; returns true if it succeeded

+bool LLPanelEstateInfo::commitEstateInfoCaps()

+{

+        std::string url = gAgent.getRegion()->getCapability("EstateChangeInfo");

+        

+        if (url.empty())

+        {

+                // whoops, couldn't find the cap, so bail out

+                return false;

+        }

+        

+        LLSD body;

+        body["estate_name"] = getEstateName();

+

+        body["is_externally_visible"] = childGetValue("externally_visible_check").asBoolean();

+        body["allow_direct_teleport"] = childGetValue("allow_direct_teleport").asBoolean();

+        body["is_sun_fixed"         ] = childGetValue("fixed_sun_check").asBoolean();

+        body["deny_anonymous"       ] = childGetValue("limit_payment").asBoolean();

+        body["deny_age_unverified"  ] = childGetValue("limit_age_verified").asBoolean();

+        body["allow_voice_chat"     ] = childGetValue("voice_chat_check").asBoolean();

+        body["invoice"              ] = LLFloaterRegionInfo::getLastInvoice();

+

+        // block fly is in estate database but not in estate UI, so we're not supporting it

+        //body["block_fly"            ] = childGetValue("").asBoolean();

+

+        F32 sun_hour = getSunHour();

+        if (childGetValue("use_global_time_check").asBoolean())

+        {

+                sun_hour = 0.f;                 // 0 = global time

+        }

+        body["sun_hour"] = sun_hour;

+

+        body["owner_abuse_email"] = childGetValue("abuse_email_address").asString();

+

+        // we use a responder so that we can re-get the data after committing to the database

+        LLHTTPClient::post(url, body, new LLEstateChangeInfoResponder((void*)this));

+    return true;

+}

+

+/* This is the old way of doing things, is deprecated, and should be 

+   deleted when the dataserver model can be removed */

+// key = "estatechangeinfo"

+// strings[0] = str(estate_id) (added by simulator before relay - not here)

+// strings[1] = estate_name

+// strings[2] = str(estate_flags)

+// strings[3] = str((S32)(sun_hour * 1024.f))

+void LLPanelEstateInfo::commitEstateInfoDataserver()

+{

+        LLMessageSystem* msg = gMessageSystem;

+        msg->newMessage("EstateOwnerMessage");

+        msg->nextBlockFast(_PREHASH_AgentData);

+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());

+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());

+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used

+

+        msg->nextBlock("MethodData");

+        msg->addString("Method", "estatechangeinfo");

+        msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());

+

+        msg->nextBlock("ParamList");

+        msg->addString("Parameter", getEstateName());

+

+        std::string buffer;

+        buffer = llformat("%u", computeEstateFlags());

+        msg->nextBlock("ParamList");

+        msg->addString("Parameter", buffer);

+

+        F32 sun_hour = getSunHour();

+        if (childGetValue("use_global_time_check").asBoolean())

+        {

+                sun_hour = 0.f; // 0 = global time

+        }

+

+        buffer = llformat("%d", (S32)(sun_hour*1024.0f));

+        msg->nextBlock("ParamList");

+        msg->addString("Parameter", buffer);

+

+        gAgent.sendMessage();

+}

+

+void LLPanelEstateInfo::setEstateFlags(U32 flags)

+{

+        childSetValue("externally_visible_check", LLSD(flags & REGION_FLAGS_EXTERNALLY_VISIBLE ? TRUE : FALSE) );

+        childSetValue("fixed_sun_check", LLSD(flags & REGION_FLAGS_SUN_FIXED ? TRUE : FALSE) );

+        childSetValue(

+                "voice_chat_check",

+                LLSD(flags & REGION_FLAGS_ALLOW_VOICE ? TRUE : FALSE));

+        childSetValue("allow_direct_teleport", LLSD(flags & REGION_FLAGS_ALLOW_DIRECT_TELEPORT ? TRUE : FALSE) );

+        childSetValue("limit_payment", LLSD(flags & REGION_FLAGS_DENY_ANONYMOUS ? TRUE : FALSE) );

+        childSetValue("limit_age_verified", LLSD(flags & REGION_FLAGS_DENY_AGEUNVERIFIED ? TRUE : FALSE) );

+

+        refresh();

+}

+

+U32 LLPanelEstateInfo::computeEstateFlags()

+{

+        U32 flags = 0;

+

+        if (childGetValue("externally_visible_check").asBoolean())

+        {

+                flags |= REGION_FLAGS_EXTERNALLY_VISIBLE;

+        }

+

+        if ( childGetValue("voice_chat_check").asBoolean() )

+        {

+                flags |= REGION_FLAGS_ALLOW_VOICE;

+        }

+        

+        if (childGetValue("allow_direct_teleport").asBoolean())

+        {

+                flags |= REGION_FLAGS_ALLOW_DIRECT_TELEPORT;

+        }

+

+        if (childGetValue("fixed_sun_check").asBoolean())

+        {

+                flags |= REGION_FLAGS_SUN_FIXED;

+        }

+        

+        if (childGetValue("limit_payment").asBoolean())

+        {

+                flags |= REGION_FLAGS_DENY_ANONYMOUS;

+        }

+        

+        if (childGetValue("limit_age_verified").asBoolean())

+        {

+                flags |= REGION_FLAGS_DENY_AGEUNVERIFIED;

+        }

+

+        

+        return flags;

+}

+

+BOOL LLPanelEstateInfo::getGlobalTime()

+{

+        return childGetValue("use_global_time_check").asBoolean();

+}

+

+void LLPanelEstateInfo::setGlobalTime(bool b)

+{

+        childSetValue("use_global_time_check", LLSD(b));

+        childSetEnabled("fixed_sun_check", LLSD(!b));

+        childSetEnabled("sun_hour_slider", LLSD(!b));

+        if (b)

+        {

+                childSetValue("sun_hour_slider", LLSD(0.f));

+        }

+}

+

+

+BOOL LLPanelEstateInfo::getFixedSun()

+{

+        return childGetValue("fixed_sun_check").asBoolean();

+}

+

+void LLPanelEstateInfo::setSunHour(F32 sun_hour)

+{

+        if(sun_hour < 6.0f)

+        {

+                sun_hour = 24.0f + sun_hour;

+        }

+        childSetValue("sun_hour_slider", LLSD(sun_hour));

+}

+

+F32 LLPanelEstateInfo::getSunHour()

+{

+        if (childIsEnabled("sun_hour_slider"))

+        {

+                return (F32)childGetValue("sun_hour_slider").asReal();

+        }

+        return 0.f;

+}

+

+const std::string LLPanelEstateInfo::getEstateName() const

+{

+        return childGetValue("estate_name").asString();

+}

+

+void LLPanelEstateInfo::setEstateName(const std::string& name)

+{

+        childSetValue("estate_name", LLSD(name));

+}

+

+const std::string LLPanelEstateInfo::getOwnerName() const

+{

+        return childGetValue("estate_owner").asString();

+}

+

+void LLPanelEstateInfo::setOwnerName(const std::string& name)

+{

+        childSetValue("estate_owner", LLSD(name));

+}

+

+const std::string LLPanelEstateInfo::getAbuseEmailAddress() const

+{

+        return childGetValue("abuse_email_address").asString();

+}

+

+void LLPanelEstateInfo::setAbuseEmailAddress(const std::string& address)

+{

+        childSetValue("abuse_email_address", LLSD(address));

+}

+

+void LLPanelEstateInfo::setAccessAllowedEnabled(bool enable_agent,

+                                                                                                bool enable_group,

+                                                                                                bool enable_ban)

+{

+        childSetEnabled("allow_resident_label", enable_agent);

+        childSetEnabled("allowed_avatar_name_list", enable_agent);

+        childSetVisible("allowed_avatar_name_list", enable_agent);

+        childSetEnabled("add_allowed_avatar_btn", enable_agent);

+        childSetEnabled("remove_allowed_avatar_btn", enable_agent);

+

+        // Groups

+        childSetEnabled("allow_group_label", enable_group);

+        childSetEnabled("allowed_group_name_list", enable_group);

+        childSetVisible("allowed_group_name_list", enable_group);

+        childSetEnabled("add_allowed_group_btn", enable_group);

+        childSetEnabled("remove_allowed_group_btn", enable_group);

+

+        // Ban

+        childSetEnabled("ban_resident_label", enable_ban);

+        childSetEnabled("banned_avatar_name_list", enable_ban);

+        childSetVisible("banned_avatar_name_list", enable_ban);

+        childSetEnabled("add_banned_avatar_btn", enable_ban);

+        childSetEnabled("remove_banned_avatar_btn", enable_ban);

+

+        // Update removal buttons if needed

+        if (enable_agent)

+        {

+                checkRemovalButton("allowed_avatar_name_list");

+        }

+

+        if (enable_group)

+        {

+                checkRemovalButton("allowed_group_name_list");

+        }

+

+        if (enable_ban)

+        {

+                checkRemovalButton("banned_avatar_name_list");

+        }

+}

+

+// static

+void LLPanelEstateInfo::callbackCacheName(

+        const LLUUID& id,

+        const std::string& first,

+        const std::string& last,

+        BOOL is_group,

+        void*)

+{

+        LLPanelEstateInfo* self = LLFloaterRegionInfo::getPanelEstate();

+        if (!self) return;

+

+        std::string name;

+        

+        if (id.isNull())

+        {

+                name = "(none)";

+        }

+        else

+        {

+                name = first + " " + last;

+        }

+

+        self->setOwnerName(name);

+}

+

+void LLPanelEstateInfo::clearAccessLists() 

+{

+        LLNameListCtrl* name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");

+        if (name_list)

+        {

+                name_list->deleteAllItems();

+        }

+

+        name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");

+        if (name_list)

+        {

+                name_list->deleteAllItems();

+        }

+}

+

+// enables/disables the "remove" button for the various allow/ban lists

+BOOL LLPanelEstateInfo::checkRemovalButton(std::string name)

+{

+        std::string btn_name = "";

+        if (name == "allowed_avatar_name_list")

+        {

+                btn_name = "remove_allowed_avatar_btn";

+        }

+        else if (name == "allowed_group_name_list")

+        {

+                btn_name = "remove_allowed_group_btn";

+        }

+        else if (name == "banned_avatar_name_list")

+        {

+                btn_name = "remove_banned_avatar_btn";

+        }

+        else if (name == "estate_manager_name_list")

+        {

+                //ONLY OWNER CAN ADD /DELET ESTATE MANAGER

+                LLViewerRegion* region = gAgent.getRegion();

+                if (region && (region->getOwner() == gAgent.getID()))

+                {

+                        btn_name = "remove_estate_manager_btn";

+                }

+        }

+

+        // enable the remove button if something is selected

+        LLNameListCtrl* name_list = getChild<LLNameListCtrl>(name);

+        childSetEnabled(btn_name, name_list && name_list->getFirstSelected() ? TRUE : FALSE);

+

+        return (btn_name != "");

+}

+

+BOOL LLPanelEstateInfo::checkSunHourSlider(LLUICtrl* child_ctrl)

+{

+        BOOL found_child_ctrl = FALSE;

+        if (child_ctrl->getName() == "sun_hour_slider")

+        {

+                enableButton("apply_btn");

+                found_child_ctrl = TRUE;

+        }

+        return found_child_ctrl;

+}

+

+// static

+void LLPanelEstateInfo::onClickMessageEstate(void* userdata)

+{

+        llinfos << "LLPanelEstateInfo::onClickMessageEstate" << llendl;

+        LLNotifications::instance().add("MessageEstate", LLSD(), LLSD(), boost::bind(&LLPanelEstateInfo::onMessageCommit, (LLPanelEstateInfo*)userdata, _1, _2));

+}

+

+bool LLPanelEstateInfo::onMessageCommit(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        std::string text = response["message"].asString();

+        if(option != 0) return false;

+        if(text.empty()) return false;

+        llinfos << "Message to everyone: " << text << llendl;

+        strings_t strings;

+        //integers_t integers;

+        std::string name;

+        gAgent.buildFullname(name);

+        strings.push_back(strings_t::value_type(name));

+        strings.push_back(strings_t::value_type(text));

+        LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());

+        sendEstateOwnerMessage(gMessageSystem, "instantmessage", invoice, strings);

+        return false;

+}

+

+LLPanelEstateCovenant::LLPanelEstateCovenant()

+: mCovenantID(LLUUID::null)

+{

+}

+

+// virtual 

+bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region)

+{

+        LLTextBox* region_name = getChild<LLTextBox>("region_name_text");

+        if (region_name)

+        {

+                region_name->setText(region->getName());

+        }

+

+        LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause");

+        if (resellable_clause)

+        {

+                if (region->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL)

+                {

+                        resellable_clause->setText(getString("can_not_resell"));

+                }

+                else

+                {

+                        resellable_clause->setText(getString("can_resell"));

+                }

+        }

+        

+        LLTextBox* changeable_clause = getChild<LLTextBox>("changeable_clause");

+        if (changeable_clause)

+        {

+                if (region->getRegionFlags() & REGION_FLAGS_ALLOW_PARCEL_CHANGES)

+                {

+                        changeable_clause->setText(getString("can_change"));

+                }

+                else

+                {

+                        changeable_clause->setText(getString("can_not_change"));

+                }

+        }

+

+        LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text");

+        if (region_maturity)

+        {

+                region_maturity->setText(region->getSimAccessString());

+        }

+        

+        LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text");

+        if (region_landtype)

+        {

+                region_landtype->setText(region->getSimProductName());

+        }

+        

+        

+        // let the parent class handle the general data collection. 

+        bool rv = LLPanelRegionInfo::refreshFromRegion(region);

+        LLMessageSystem *msg = gMessageSystem;

+        msg->newMessage("EstateCovenantRequest");

+        msg->nextBlockFast(_PREHASH_AgentData);

+        msg->addUUIDFast(_PREHASH_AgentID,      gAgent.getID());

+        msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());

+        msg->sendReliable(region->getHost());

+        return rv;

+}

+

+// virtual 

+bool LLPanelEstateCovenant::estateUpdate(LLMessageSystem* msg)

+{

+        llinfos << "LLPanelEstateCovenant::estateUpdate()" << llendl;

+        return true;

+}

+        

+// virtual 

+BOOL LLPanelEstateCovenant::postBuild()

+{

+        initHelpBtn("covenant_help",            "HelpEstateCovenant");

+        mEstateNameText = getChild<LLTextBox>("estate_name_text");

+        mEstateOwnerText = getChild<LLTextBox>("estate_owner_text");

+        mLastModifiedText = getChild<LLTextBox>("covenant_timestamp_text");

+        mEditor = getChild<LLViewerTextEditor>("covenant_editor");

+        if (mEditor) mEditor->setHandleEditKeysDirectly(TRUE);

+        LLButton* reset_button = getChild<LLButton>("reset_covenant");

+        reset_button->setEnabled(gAgent.canManageEstate());

+        reset_button->setClickedCallback(LLPanelEstateCovenant::resetCovenantID, NULL);

+

+        return LLPanelRegionInfo::postBuild();

+}

+

+// virtual 

+void LLPanelEstateCovenant::updateChild(LLUICtrl* child_ctrl)

+{

+}

+

+// virtual

+BOOL LLPanelEstateCovenant::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,

+                                                                  EDragAndDropType cargo_type,

+                                                                  void* cargo_data,

+                                                                  EAcceptance* accept,

+                                                                  std::string& tooltip_msg)

+{

+        LLInventoryItem* item = (LLInventoryItem*)cargo_data;

+

+        if (!gAgent.canManageEstate())

+        {

+                *accept = ACCEPT_NO;

+                return TRUE;

+        }

+

+        switch(cargo_type)

+        {

+        case DAD_NOTECARD:

+                *accept = ACCEPT_YES_COPY_SINGLE;

+                if (item && drop)

+                {

+                        LLSD payload;

+                        payload["item_id"] = item->getUUID();

+                        LLNotifications::instance().add("EstateChangeCovenant", LLSD(), payload,

+                                                                        LLPanelEstateCovenant::confirmChangeCovenantCallback);

+                }

+                break;

+        default:

+                *accept = ACCEPT_NO;

+                break;

+        }

+

+        return TRUE;

+} 

+

+// static 

+bool LLPanelEstateCovenant::confirmChangeCovenantCallback(const LLSD& notification, const LLSD& response)

+{

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        LLInventoryItem* item = gInventory.getItem(notification["payload"]["item_id"].asUUID());

+        LLPanelEstateCovenant* self = LLFloaterRegionInfo::getPanelCovenant();

+

+        if (!item || !self) return false;

+

+        switch(option)

+        {

+        case 0:

+                self->loadInvItem(item);

+                break;

+        default:

+                break;

+        }

+        return false;

+}

+

+// static

+void LLPanelEstateCovenant::resetCovenantID(void* userdata)

+{

+        LLNotifications::instance().add("EstateChangeCovenant", LLSD(), LLSD(), confirmResetCovenantCallback);

+}

+

+// static

+bool LLPanelEstateCovenant::confirmResetCovenantCallback(const LLSD& notification, const LLSD& response)

+{

+        LLPanelEstateCovenant* self = LLFloaterRegionInfo::getPanelCovenant();

+        if (!self) return false;

+

+        S32 option = LLNotification::getSelectedOption(notification, response);

+        switch(option)

+        {

+        case 0:         

+                self->loadInvItem(NULL);

+                break;

+        default:

+                break;

+        }

+        return false;

+}

+

+void LLPanelEstateCovenant::loadInvItem(LLInventoryItem *itemp)

+{

+        const BOOL high_priority = TRUE;        

+        if (itemp)

+        {

+                gAssetStorage->getInvItemAsset(gAgent.getRegionHost(),

+                                                                        gAgent.getID(),

+                                                                        gAgent.getSessionID(),

+                                                                        itemp->getPermissions().getOwner(),

+                                                                        LLUUID::null,

+                                                                        itemp->getUUID(),

+                                                                        itemp->getAssetUUID(),

+                                                                        itemp->getType(),

+                                    onLoadComplete,

+                                                                        (void*)this,

+                                                                        high_priority);

+                mAssetStatus = ASSET_LOADING;

+        }

+        else

+        {

+                mAssetStatus = ASSET_LOADED;

+                setCovenantTextEditor("There is no Covenant provided for this Estate.");

+                sendChangeCovenantID(LLUUID::null);

+        }

+}

+

+// static

+void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs,

+                                                                           const LLUUID& asset_uuid,

+                                                                           LLAssetType::EType type,

+                                                                           void* user_data, S32 status, LLExtStat ext_status)

+{

+        llinfos << "LLPanelEstateCovenant::onLoadComplete()" << llendl;

+        LLPanelEstateCovenant* panelp = (LLPanelEstateCovenant*)user_data;

+        if( panelp )

+        {

+                if(0 == status)

+                {

+                        LLVFile file(vfs, asset_uuid, type, LLVFile::READ);

+

+                        S32 file_length = file.getSize();

+

+                        char* buffer = new char[file_length+1];

+                        if (buffer == NULL)

+                        {

+                                llerrs << "Memory Allocation Failed" << llendl;

+                                return;

+                        }

+

+                        file.read((U8*)buffer, file_length);            /* Flawfinder: ignore */

+                        // put a EOS at the end

+                        buffer[file_length] = 0;

+

+                        if( (file_length > 19) && !strncmp( buffer, "Linden text version", 19 ) )

+                        {

+                                if( !panelp->mEditor->importBuffer( buffer, file_length+1 ) )

+                                {

+                                        llwarns << "Problem importing estate covenant." << llendl;

+                                        LLNotifications::instance().add("ProblemImportingEstateCovenant");

+                                }

+                                else

+                                {

+                                        panelp->sendChangeCovenantID(asset_uuid);       

+                                }

+                        }

+                        else

+                        {

+                                // Version 0 (just text, doesn't include version number)

+                                panelp->sendChangeCovenantID(asset_uuid);

+                        }

+                        delete[] buffer;

+                }

+                else

+                {

+                        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );

+

+                        if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||

+                                LL_ERR_FILE_EMPTY == status)

+                        {

+                                LLNotifications::instance().add("MissingNotecardAssetID");

+                        }

+                        else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)

+                        {

+                                LLNotifications::instance().add("NotAllowedToViewNotecard");

+                        }

+                        else

+                        {

+                                LLNotifications::instance().add("UnableToLoadNotecardAsset");

+                        }

+

+                        llwarns << "Problem loading notecard: " << status << llendl;

+                }

+                panelp->mAssetStatus = ASSET_LOADED;

+                panelp->setCovenantID(asset_uuid);

+        }

+}

+

+// key = "estatechangecovenantid"

+// strings[0] = str(estate_id) (added by simulator before relay - not here)

+// strings[1] = str(covenant_id)

+void LLPanelEstateCovenant::sendChangeCovenantID(const LLUUID &asset_id)

+{

+        if (asset_id != getCovenantID())

+        {

+        setCovenantID(asset_id);

+

+                LLMessageSystem* msg = gMessageSystem;

+                msg->newMessage("EstateOwnerMessage");

+                msg->nextBlockFast(_PREHASH_AgentData);

+                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());

+                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());

+                msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used

+

+                msg->nextBlock("MethodData");

+                msg->addString("Method", "estatechangecovenantid");

+                msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());

+

+                msg->nextBlock("ParamList");

+                msg->addString("Parameter", getCovenantID().asString());

+                gAgent.sendReliableMessage();

+        }

+}

+

+// virtual 

+BOOL LLPanelEstateCovenant::sendUpdate()

+{

+        return TRUE;

+}

+

+const std::string& LLPanelEstateCovenant::getEstateName() const

+{

+        return mEstateNameText->getText();

+}

+

+void LLPanelEstateCovenant::setEstateName(const std::string& name)

+{

+        mEstateNameText->setText(name);

+}

+

+// static

+void LLPanelEstateCovenant::updateCovenantText(const std::string& string, const LLUUID& asset_id)

+{

+        LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();

+        if( panelp )

+        {

+                panelp->mEditor->setText(string);

+                panelp->setCovenantID(asset_id);

+        }

+}

+

+// static

+void LLPanelEstateCovenant::updateEstateName(const std::string& name)

+{

+        LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();

+        if( panelp )

+        {

+                panelp->mEstateNameText->setText(name);

+        }

+}

+

+// static

+void LLPanelEstateCovenant::updateLastModified(const std::string& text)

+{

+        LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();

+        if( panelp )

+        {

+                panelp->mLastModifiedText->setText(text);

+        }

+}

+

+// static

+void LLPanelEstateCovenant::updateEstateOwnerName(const std::string& name)

+{

+        LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();

+        if( panelp )

+        {

+                panelp->mEstateOwnerText->setText(name);

+        }

+}

+

+const std::string& LLPanelEstateCovenant::getOwnerName() const

+{

+        return mEstateOwnerText->getText();

+}

+

+void LLPanelEstateCovenant::setOwnerName(const std::string& name)

+{

+        mEstateOwnerText->setText(name);

+}

+

+void LLPanelEstateCovenant::setCovenantTextEditor(const std::string& text)

+{

+        mEditor->setText(text);

+}

+

+// key = "estateupdateinfo"

+// strings[0] = estate name

+// strings[1] = str(owner_id)

+// strings[2] = str(estate_id)

+// strings[3] = str(estate_flags)

+// strings[4] = str((S32)(sun_hour * 1024))

+// strings[5] = str(parent_estate_id)

+// strings[6] = str(covenant_id)

+// strings[7] = str(covenant_timestamp)

+// strings[8] = str(send_to_agent_only)

+// strings[9] = str(abuse_email_addr)

+bool LLDispatchEstateUpdateInfo::operator()(

+                const LLDispatcher* dispatcher,

+                const std::string& key,

+                const LLUUID& invoice,

+                const sparam_t& strings)

+{

+        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();

+        if (!panel) return true;

+

+        // NOTE: LLDispatcher extracts strings with an extra \0 at the

+        // end.  If we pass the std::string direct to the UI/renderer

+        // it draws with a weird character at the end of the string.

+        std::string estate_name = strings[0].c_str(); // preserve c_str() call!

+        panel->setEstateName(estate_name);

+        

+        if (strings.size() > 3)

+        {

+                std::string abuse_email = strings[9].c_str(); // preserve c_str() call!

+                panel->setAbuseEmailAddress(abuse_email);

+        }

+        else

+        {

+                panel->setAbuseEmailAddress(panel->getString("email_unsupported"));

+        }

+

+        LLViewerRegion* regionp = gAgent.getRegion();

+

+        LLUUID owner_id(strings[1]);

+        regionp->setOwner(owner_id);

+        // Update estate owner name in UI

+        const BOOL is_group = FALSE;

+        gCacheName->get(owner_id, is_group, LLPanelEstateInfo::callbackCacheName);

+

+        U32 estate_id = strtoul(strings[2].c_str(), NULL, 10);

+        panel->setEstateID(estate_id);

+

+        U32 flags = strtoul(strings[3].c_str(), NULL, 10);

+        panel->setEstateFlags(flags);

+

+        F32 sun_hour = ((F32)(strtod(strings[4].c_str(), NULL)))/1024.0f;

+        if(sun_hour == 0 && (flags & REGION_FLAGS_SUN_FIXED ? FALSE : TRUE))

+        {

+                panel->setGlobalTime(TRUE);

+        } 

+        else

+        {

+                panel->setGlobalTime(FALSE);

+                panel->setSunHour(sun_hour);

+        }

+

+        bool visible_from_mainland = (bool)(flags & REGION_FLAGS_EXTERNALLY_VISIBLE);

+        bool god = gAgent.isGodlike();

+        bool linden_estate = (estate_id <= ESTATE_LAST_LINDEN);

+

+        // If visible from mainland, disable the access allowed

+        // UI, as anyone can teleport there.

+        // However, gods need to be able to edit the access list for

+        // linden estates, regardless of visibility, to allow object

+        // and L$ transfers.

+        bool enable_agent = (!visible_from_mainland || (god && linden_estate));

+        bool enable_group = enable_agent;

+        bool enable_ban = !linden_estate;

+        panel->setAccessAllowedEnabled(enable_agent, enable_group, enable_ban);

+

+        return true;

+}

+

+

+// key = "setaccess"

+// strings[0] = str(estate_id)

+// strings[1] = str(packed_access_lists)

+// strings[2] = str(num allowed agent ids)

+// strings[3] = str(num allowed group ids)

+// strings[4] = str(num banned agent ids)

+// strings[5] = str(num estate manager agent ids)

+// strings[6] = bin(uuid)

+// strings[7] = bin(uuid)

+// strings[8] = bin(uuid)

+// ...

+bool LLDispatchSetEstateAccess::operator()(

+                const LLDispatcher* dispatcher,

+                const std::string& key,

+                const LLUUID& invoice,

+                const sparam_t& strings)

+{

+        LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();

+        if (!panel) return true;

+

+        S32 index = 1;  // skip estate_id

+        U32 access_flags = strtoul(strings[index++].c_str(), NULL,10);

+        S32 num_allowed_agents = strtol(strings[index++].c_str(), NULL, 10);

+        S32 num_allowed_groups = strtol(strings[index++].c_str(), NULL, 10);

+        S32 num_banned_agents = strtol(strings[index++].c_str(), NULL, 10);

+        S32 num_estate_managers = strtol(strings[index++].c_str(), NULL, 10);

+

+        // sanity ckecks

+        if (num_allowed_agents > 0

+                && !(access_flags & ESTATE_ACCESS_ALLOWED_AGENTS))

+        {

+                llwarns << "non-zero count for allowed agents, but no corresponding flag" << llendl;

+        }

+        if (num_allowed_groups > 0

+                && !(access_flags & ESTATE_ACCESS_ALLOWED_GROUPS))

+        {

+                llwarns << "non-zero count for allowed groups, but no corresponding flag" << llendl;

+        }

+        if (num_banned_agents > 0

+                && !(access_flags & ESTATE_ACCESS_BANNED_AGENTS))

+        {

+                llwarns << "non-zero count for banned agents, but no corresponding flag" << llendl;

+        }

+        if (num_estate_managers > 0

+                && !(access_flags & ESTATE_ACCESS_MANAGERS))

+        {

+                llwarns << "non-zero count for managers, but no corresponding flag" << llendl;

+        }

+

+        // grab the UUID's out of the string fields

+        if (access_flags & ESTATE_ACCESS_ALLOWED_AGENTS)

+        {

+                LLNameListCtrl* allowed_agent_name_list;

+                allowed_agent_name_list = panel->getChild<LLNameListCtrl>("allowed_avatar_name_list");

+

+                int totalAllowedAgents = num_allowed_agents;

+                

+                if (allowed_agent_name_list) 

+                {

+                        totalAllowedAgents += allowed_agent_name_list->getItemCount();

+                }

+

+                std::string msg = llformat("Allowed residents: (%d, max %d)",

+                                                                        totalAllowedAgents,

+                                                                        ESTATE_MAX_ACCESS_IDS);

+                panel->childSetValue("allow_resident_label", LLSD(msg));

+

+                if (allowed_agent_name_list)

+                {

+                        //allowed_agent_name_list->deleteAllItems();

+                        for (S32 i = 0; i < num_allowed_agents && i < ESTATE_MAX_ACCESS_IDS; i++)

+                        {

+                                LLUUID id;

+                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */

+                                allowed_agent_name_list->addNameItem(id);

+                        }

+                        panel->childSetEnabled("remove_allowed_avatar_btn", allowed_agent_name_list->getFirstSelected() ? TRUE : FALSE);

+                        allowed_agent_name_list->sortByColumnIndex(0, TRUE);

+                }

+        }

+

+        if (access_flags & ESTATE_ACCESS_ALLOWED_GROUPS)

+        {

+                LLNameListCtrl* allowed_group_name_list;

+                allowed_group_name_list = panel->getChild<LLNameListCtrl>("allowed_group_name_list");

+

+                std::string msg = llformat("Allowed groups: (%d, max %d)",

+                                                                        num_allowed_groups,

+                                                                        (S32) ESTATE_MAX_GROUP_IDS);

+                panel->childSetValue("allow_group_label", LLSD(msg));

+

+                if (allowed_group_name_list)

+                {

+                        allowed_group_name_list->deleteAllItems();

+                        for (S32 i = 0; i < num_allowed_groups && i < ESTATE_MAX_GROUP_IDS; i++)

+                        {

+                                LLUUID id;

+                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */

+                                allowed_group_name_list->addGroupNameItem(id);

+                        }

+                        panel->childSetEnabled("remove_allowed_group_btn", allowed_group_name_list->getFirstSelected() ? TRUE : FALSE);

+                        allowed_group_name_list->sortByColumnIndex(0, TRUE);

+                }

+        }

+

+        if (access_flags & ESTATE_ACCESS_BANNED_AGENTS)

+        {

+                LLNameListCtrl* banned_agent_name_list;

+                banned_agent_name_list = panel->getChild<LLNameListCtrl>("banned_avatar_name_list");

+

+                int totalBannedAgents = num_banned_agents;

+                

+                if (banned_agent_name_list) 

+                {

+                        totalBannedAgents += banned_agent_name_list->getItemCount();

+                }

+

+

+                std::string msg = llformat("Banned residents: (%d, max %d)",

+                                                                        totalBannedAgents,

+                                                                        ESTATE_MAX_ACCESS_IDS);

+                panel->childSetValue("ban_resident_label", LLSD(msg));

+

+                if (banned_agent_name_list)

+                {

+                        //banned_agent_name_list->deleteAllItems();

+                        for (S32 i = 0; i < num_banned_agents && i < ESTATE_MAX_ACCESS_IDS; i++)

+                        {

+                                LLUUID id;

+                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */

+                                banned_agent_name_list->addNameItem(id);

+                        }

+                        panel->childSetEnabled("remove_banned_avatar_btn", banned_agent_name_list->getFirstSelected() ? TRUE : FALSE);

+                        banned_agent_name_list->sortByColumnIndex(0, TRUE);

+                }

+        }

+

+        if (access_flags & ESTATE_ACCESS_MANAGERS)

+        {

+                std::string msg = llformat("Estate Managers: (%d, max %d)",

+                                                                        num_estate_managers,

+                                                                        ESTATE_MAX_MANAGERS);

+                panel->childSetValue("estate_manager_label", LLSD(msg));

+

+                LLNameListCtrl* estate_manager_name_list =

+                        panel->getChild<LLNameListCtrl>("estate_manager_name_list");

+                if (estate_manager_name_list)

+                {       

+                        estate_manager_name_list->deleteAllItems();             // Clear existing entries

+

+                        // There should be only ESTATE_MAX_MANAGERS people in the list, but if the database gets more (SL-46107) don't 

+                        // truncate the list unless it's really big.  Go ahead and show the extras so the user doesn't get confused, 

+                        // and they can still remove them.

+                        for (S32 i = 0; i < num_estate_managers && i < (ESTATE_MAX_MANAGERS * 4); i++)

+                        {

+                                LLUUID id;

+                                memcpy(id.mData, strings[index++].data(), UUID_BYTES);          /* Flawfinder: ignore */

+                                estate_manager_name_list->addNameItem(id);

+                        }

+                        panel->childSetEnabled("remove_estate_manager_btn", estate_manager_name_list->getFirstSelected() ? TRUE : FALSE);

+                        estate_manager_name_list->sortByColumnIndex(0, TRUE);

+                }

+        }

+

+        return true;

+}

+

+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)

+void LLFloaterRegionInfo::open()

+{

+        // We'll allow access to the estate tools for estate managers (and for the sim owner)

+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))

+        {

+                LLViewerRegion* pRegion = gAgent.getRegion();

+                if (!pRegion)

+                        return;

+

+                // Should be able to call LLRegion::canManageEstate() but then we can fake god like

+                if ( (!pRegion->isEstateManager()) && (pRegion->getOwner() != gAgent.getID()) )

+                        return;

+        }

+

+        LLFloater::open();

+}

+// [/RLVa:KB]

diff --git a/linden/indra/newview/llfloaterregioninfo.h b/linden/indra/newview/llfloaterregioninfo.h
index fd0d9ce..ee01c7c 100644
--- a/linden/indra/newview/llfloaterregioninfo.h
+++ b/linden/indra/newview/llfloaterregioninfo.h
@@ -53,6 +53,7 @@ class LLSpinCtrl;
 class LLTextBox;
 
 class LLPanelRegionGeneralInfo;
+class LLPanelRegionOpenSettingsInfo;
 class LLPanelRegionDebugInfo;
 class LLPanelRegionTextureInfo;
 class LLPanelRegionTerrainInfo;
@@ -83,6 +84,7 @@ public:
 
         static LLPanelEstateInfo* getPanelEstate();
         static LLPanelEstateCovenant* getPanelCovenant();
+        static LLPanelRegionOpenSettingsInfo* getPanelOpenSettings();
 
         // from LLPanel
         virtual void refresh();
@@ -173,6 +175,24 @@ protected:
 
 /////////////////////////////////////////////////////////////////////////////
 
+class LLPanelRegionOpenSettingsInfo : public LLPanelRegionInfo
+{
+public:
+        LLPanelRegionOpenSettingsInfo()
+                :       LLPanelRegionInfo()     {}
+        ~LLPanelRegionOpenSettingsInfo() {}
+        
+        virtual bool refreshFromRegion(LLViewerRegion* region);
+        
+        // LLPanel
+        virtual BOOL postBuild();
+
+protected:
+        static void sendUpdate(void* userdata);
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
 class LLPanelRegionDebugInfo : public LLPanelRegionInfo
 {
 public:
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 6744faf..2f02f1e 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -181,26 +181,23 @@ void*	LLFloaterTools::createPanelLandInfo(void* data)
 
 void LLFloaterTools::updateToolsSizeLimits()
 {
-        if (gSavedSettings.getBOOL("DisableMaxBuildConstraints"))
-        {
-                getChild<LLSpinCtrl>("Scale X")->setMaxValue(F32_MAX);
-                getChild<LLSpinCtrl>("Scale Y")->setMaxValue(F32_MAX);
-                getChild<LLSpinCtrl>("Scale Z")->setMaxValue(F32_MAX);
+        getChild<LLSpinCtrl>("Scale X")->setMinValue(gHippoLimits->getMinPrimScale());
+        getChild<LLSpinCtrl>("Scale Y")->setMinValue(gHippoLimits->getMinPrimScale());
+        getChild<LLSpinCtrl>("Scale Z")->setMinValue(gHippoLimits->getMinPrimScale());
 
-                getChild<LLSpinCtrl>("Pos X")->setMaxValue(F32_MAX);
-                getChild<LLSpinCtrl>("Pos Y")->setMaxValue(F32_MAX);
-                getChild<LLSpinCtrl>("Pos Z")->setMaxValue(F32_MAX);
-        }
-        else
-        {
-                getChild<LLSpinCtrl>("Scale X")->setMaxValue(gHippoLimits->getMaxPrimScale());
-                getChild<LLSpinCtrl>("Scale Y")->setMaxValue(gHippoLimits->getMaxPrimScale());
-                getChild<LLSpinCtrl>("Scale Z")->setMaxValue(gHippoLimits->getMaxPrimScale());
+        getChild<LLSpinCtrl>("Scale X")->setMaxValue(gHippoLimits->getMaxPrimScale());
+        getChild<LLSpinCtrl>("Scale Y")->setMaxValue(gHippoLimits->getMaxPrimScale());
+        getChild<LLSpinCtrl>("Scale Z")->setMaxValue(gHippoLimits->getMaxPrimScale());
 
-                getChild<LLSpinCtrl>("Scale X")->setMinValue(gHippoLimits->getMinPrimScale());
-                getChild<LLSpinCtrl>("Scale Y")->setMinValue(gHippoLimits->getMinPrimScale());
-                getChild<LLSpinCtrl>("Scale Z")->setMinValue(gHippoLimits->getMinPrimScale());
-        }
+        getChild<LLSpinCtrl>("Pos X")->setMinValue(gHippoLimits->getMinPrimXPos());
+        getChild<LLSpinCtrl>("Pos Y")->setMinValue(gHippoLimits->getMinPrimYPos());
+        getChild<LLSpinCtrl>("Pos Z")->setMinValue(gHippoLimits->getMinPrimZPos());
+
+        getChild<LLSpinCtrl>("Pos X")->setMaxValue(gHippoLimits->getMaxPrimXPos());
+        getChild<LLSpinCtrl>("Pos Y")->setMaxValue(gHippoLimits->getMaxPrimYPos());
+        getChild<LLSpinCtrl>("Pos Z")->setMaxValue(gHippoLimits->getMaxPrimZPos());
+
+        getChild<LLCheckBoxCtrl>("Physical Checkbox Ctrl")->setEnabled(gHippoLimits->mAllowPhysicalPrims);
 }
 
 void LLFloaterTools::updateToolsPrecision()
@@ -1258,8 +1255,18 @@ void LLFloaterTools::onClickLink(void* data)
                 return;
         }
 
-        S32 max_linked_prims = gHippoLimits->getMaxLinkedPrims();
-        if (max_linked_prims > -1)
+        S32 max_linked_prims = 0;
+        if(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->usePhysics())
+        {
+                //Physical - use phys prim limit
+                max_linked_prims = gHippoLimits->getMaxPhysLinkedPrims();
+        }
+        else
+        {
+                //Non phys limit
+                max_linked_prims = gHippoLimits->getMaxLinkedPrims();
+        }
+        if (max_linked_prims > -1) //-1 : no limits
         {
                 S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
                 if (object_count > max_linked_prims + 1)
@@ -1271,7 +1278,7 @@ void LLFloaterTools::onClickLink(void* data)
                         return;
                 }
         }
-
+        
         if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() < 2)
         {
                 LLNotifications::instance().add("CannotLinkIncompleteSet");
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index 52d7b1f..2684e10 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -1,284 +1,310 @@
-/** 
- * @file llfloatertos.cpp
- * @brief Terms of Service Agreement dialog
- *
- * $LicenseInfo:firstyear=2003&license=viewergpl$
- * 
- * Copyright (c) 2003-2009, 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
- * ("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
- * 
- * 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
- * 
- * 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.
- * 
- * 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"
-
-#include "llfloatertos.h"
-
-// viewer includes
-#include "llagent.h"
-#include "llappviewer.h"
-#include "llstartup.h"
-#include "llviewerstats.h"
-#include "llviewertexteditor.h"
-#include "llviewerwindow.h"
-
-// linden library includes
-#include "llbutton.h"
-#include "llhttpclient.h"
-#include "llhttpstatuscodes.h"  // for HTTP_FOUND
-#include "llradiogroup.h"
-#include "lltextbox.h"
-#include "llui.h"
-#include "lluictrlfactory.h"
-#include "llvfile.h"
-#include "message.h"
-
-
-// static 
-LLFloaterTOS* LLFloaterTOS::sInstance = NULL;
-
-// static
-LLFloaterTOS* LLFloaterTOS::show(ETOSType type, const std::string & message)
-{
-        if( !LLFloaterTOS::sInstance )
-        {
-                LLFloaterTOS::sInstance = new LLFloaterTOS(type, message);
-        }
-
-        if (type == TOS_TOS)
-        {
-                LLUICtrlFactory::getInstance()->buildFloater(LLFloaterTOS::sInstance, "floater_tos.xml");
-        }
-        else
-        {
-                LLUICtrlFactory::getInstance()->buildFloater(LLFloaterTOS::sInstance, "floater_critical.xml");
-        }
-
-        return LLFloaterTOS::sInstance;
-}
-
-
-LLFloaterTOS::LLFloaterTOS(ETOSType type, const std::string & message)
-:       LLModalDialog( std::string(" "), 100, 100 ),
-        mType(type),
-        mMessage(message),
-        mWebBrowserWindowId( 0 ),
-        mLoadCompleteCount( 0 )
-{
-}
-
-// helper class that trys to download a URL from a web site and calls a method 
-// on parent class indicating if the web server is working or not
-class LLIamHereTOS : public LLHTTPClient::Responder
-{
-        private:
-                LLIamHereTOS( LLFloaterTOS* parent ) :
-                   mParent( parent )
-                {}
-
-                LLFloaterTOS* mParent;
-
-        public:
-
-                static boost::intrusive_ptr< LLIamHereTOS > build( LLFloaterTOS* parent )
-                {
-                        return boost::intrusive_ptr< LLIamHereTOS >( new LLIamHereTOS( parent ) );
-                };
-                
-                virtual void  setParent( LLFloaterTOS* parentIn )
-                {
-                        mParent = parentIn;
-                };
-                
-                virtual void result( const LLSD& content )
-                {
-                        if ( mParent )
-                                mParent->setSiteIsAlive( true );
-                };
-
-                virtual void error( U32 status, const std::string& reason )
-                {
-                        if ( mParent )
-                        {
-                                // *HACK: For purposes of this alive check, 302 Found
-                                // (aka Moved Temporarily) is considered alive.  The web site
-                                // redirects this link to a "cache busting" temporary URL. JC
-                                bool alive = (status == HTTP_FOUND);
-                                mParent->setSiteIsAlive( alive );
-                        }
-                };
-};
-
-// this is global and not a class member to keep crud out of the header file
-namespace {
-        boost::intrusive_ptr< LLIamHereTOS > gResponsePtr = 0;
-};
-
-BOOL LLFloaterTOS::postBuild()
-{       
-        childSetAction("Continue", onContinue, this);
-        childSetAction("Cancel", onCancel, this);
-        childSetCommitCallback("agree_chk", updateAgree, this);
-
-        if ( mType != TOS_TOS )
-        {
-                llinfos << "tos_type != TOS_TOS" << llendl;
-                // this displays the critical message
-                LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
-                editor->setHandleEditKeysDirectly( TRUE );
-                editor->setEnabled( FALSE );
-                editor->setWordWrap(TRUE);
-                editor->setFocus(TRUE);
-                // editor->setValue(LLSD(mMessage));
-                editor->setValue(mMessage);
-
-                return TRUE;
-        }
-
-        // disable Agree to TOS radio button until the page has fully loaded
-        LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-        tos_agreement->setEnabled( false );
-
-        // hide the SL text widget if we're displaying TOS with using a browser widget.
-        LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
-        editor->setVisible(FALSE);
-
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
-        if ( web_browser )
-        {
-                // start to observe it so we see navigate complete events
-                web_browser->addObserver( this );
-
-                gResponsePtr = LLIamHereTOS::build( this );
-                LLHTTPClient::head( getString( "real_url" ), gResponsePtr );
-        }
-
-        return TRUE;
-}
-
-void LLFloaterTOS::setSiteIsAlive( bool alive )
-{
-        // only do this for TOS pages
-        if ( mType == TOS_TOS )
-        {
-                LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
-                // if the contents of the site was retrieved
-                if ( alive )
-                {
-                        if ( web_browser )
-                        {
-                                // navigate to the "real" page 
-                                web_browser->navigateTo( getString( "real_url" ) );
-                        };
-                }
-                else
-                {
-                        // normally this is set when navigation to TOS page navigation completes (so you can't accept before TOS loads)
-                        // but if the page is unavailable, we need to do this now
-                        LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-                        tos_agreement->setEnabled( true );
-                };
-        };
-}
-
-LLFloaterTOS::~LLFloaterTOS()
-{
-        // stop obsaerving events
-        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");
-        if ( web_browser )
-        {
-                web_browser->remObserver( this );               
-        };
-
-        // tell the responder we're not here anymore
-        if ( gResponsePtr )
-                gResponsePtr->setParent( 0 );
-
-        LLFloaterTOS::sInstance = NULL;
-}
-
-// virtual
-void LLFloaterTOS::draw()
-{
-        // draw children
-        LLModalDialog::draw();
-}
-
-// static
-void LLFloaterTOS::updateAgree(LLUICtrl*, void* userdata )
-{
-        LLFloaterTOS* self = (LLFloaterTOS*) userdata;
-        bool agree = self->childGetValue("agree_chk").asBoolean(); 
-        self->childSetEnabled("Continue", agree);
-}
-
-// static
-void LLFloaterTOS::onContinue( void* userdata )
-{
-        LLFloaterTOS* self = (LLFloaterTOS*) userdata;
-        llinfos << "User agrees with TOS." << llendl;
-        if (self->mType == TOS_TOS)
-        {
-                gAcceptTOS = TRUE;
-        }
-        else
-        {
-                gAcceptCriticalMessage = TRUE;
-        }
-
-        // Testing TOS dialog
-        #if ! LL_RELEASE_FOR_DOWNLOAD           
-        if ( LLStartUp::getStartupState() == STATE_LOGIN_WAIT )
-        {
-                LLStartUp::setStartupState( STATE_LOGIN_SHOW );
-        }
-        else 
-        #endif
-
-        LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );                    // Go back and finish authentication
-        self->close(); // destroys this object
-}
-
-// static
-void LLFloaterTOS::onCancel( void* userdata )
-{
-        LLFloaterTOS* self = (LLFloaterTOS*) userdata;
-        llinfos << "User disagrees with TOS." << llendl;
-        LLNotifications::instance().add("MustAgreeToLogIn", LLSD(), LLSD(), login_alert_done);
-        LLStartUp::setStartupState( STATE_LOGIN_SHOW );
-        self->mLoadCompleteCount = 0;  // reset counter for next time we come to TOS
-        self->close(); // destroys this object
-}
-
-//virtual 
-void LLFloaterTOS::onNavigateComplete( const EventType& eventIn )
-{
-        // skip past the loading screen navigate complete
-        if ( ++mLoadCompleteCount == 2 )
-        {
-                llinfos << "NAVIGATE COMPLETE" << llendl;
-                // enable Agree to TOS radio button now that page has loaded
-                LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-                tos_agreement->setEnabled( true );
-        };
-}
+/** 

+ * @file llfloatertos.cpp

+ * @brief Terms of Service Agreement dialog

+ *

+ * $LicenseInfo:firstyear=2003&license=viewergpl$

+ * 

+ * Copyright (c) 2003-2009, 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

+ * ("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

+ * 

+ * 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

+ * 

+ * 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.

+ * 

+ * 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"

+

+#include "llfloatertos.h"

+

+// viewer includes

+#include "llagent.h"

+#include "llappviewer.h"

+#include "llstartup.h"

+#include "llviewerstats.h"

+#include "llviewertexteditor.h"

+#include "llviewerwindow.h"

+

+// linden library includes

+#include "llbutton.h"

+#include "llhttpclient.h"

+#include "llhttpstatuscodes.h"  // for HTTP_FOUND

+#include "llradiogroup.h"

+#include "lltextbox.h"

+#include "llui.h"

+#include "lluictrlfactory.h"

+#include "llvfile.h"

+#include "message.h"

+#include "hippoGridManager.h"

+

+

+// static 

+LLFloaterTOS* LLFloaterTOS::sInstance = NULL;

+

+// static

+LLFloaterTOS* LLFloaterTOS::show(ETOSType type, const std::string & message)

+{

+        if( !LLFloaterTOS::sInstance )

+        {

+                LLFloaterTOS::sInstance = new LLFloaterTOS(type, message);

+        }

+

+        if (type == TOS_TOS)

+        {

+                LLUICtrlFactory::getInstance()->buildFloater(LLFloaterTOS::sInstance, "floater_tos.xml");

+        }

+        else

+        {

+                LLUICtrlFactory::getInstance()->buildFloater(LLFloaterTOS::sInstance, "floater_critical.xml");

+        }

+

+        return LLFloaterTOS::sInstance;

+}

+

+

+LLFloaterTOS::LLFloaterTOS(ETOSType type, const std::string & message)

+:       LLModalDialog( std::string(" "), 100, 100 ),

+        mType(type),

+        mMessage(message),

+        mWebBrowserWindowId( 0 ),

+        mLoadCompleteCount( 0 )

+{

+}

+

+// helper class that trys to download a URL from a web site and calls a method 

+// on parent class indicating if the web server is working or not

+class LLIamHereTOS : public LLHTTPClient::Responder

+{

+        private:

+                LLIamHereTOS( LLFloaterTOS* parent ) :

+                   mParent( parent )

+                {}

+

+                LLFloaterTOS* mParent;

+

+        public:

+

+                static boost::intrusive_ptr< LLIamHereTOS > build( LLFloaterTOS* parent )

+                {

+                        return boost::intrusive_ptr< LLIamHereTOS >( new LLIamHereTOS( parent ) );

+                };

+                

+                virtual void  setParent( LLFloaterTOS* parentIn )

+                {

+                        mParent = parentIn;

+                };

+                

+                virtual void result( const LLSD& content )

+                {

+                        if ( mParent )

+                                mParent->setSiteIsAlive( true );

+                };

+

+                virtual void error( U32 status, const std::string& reason )

+                {

+                        if ( mParent )

+                        {

+                                // *HACK: For purposes of this alive check, 302 Found

+                                // (aka Moved Temporarily) is considered alive.  The web site

+                                // redirects this link to a "cache busting" temporary URL. JC

+                                bool alive = (status == HTTP_FOUND);

+                                mParent->setSiteIsAlive( alive );

+                        }

+                };

+};

+

+// this is global and not a class member to keep crud out of the header file

+namespace {

+        boost::intrusive_ptr< LLIamHereTOS > gResponsePtr = 0;

+};

+

+BOOL LLFloaterTOS::postBuild()

+{       

+        childSetAction("Continue", onContinue, this);

+        childSetAction("Cancel", onCancel, this);

+        childSetCommitCallback("agree_chk", updateAgree, this);

+

+        LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");

+        tos_agreement->setEnabled( true );

+        

+        //Always set this so that the TOS is displayed whether the web browser pops up or not.

+        LLTextEditor *editor = getChild<LLTextEditor>("tos_text");

+        editor->setHandleEditKeysDirectly( TRUE );

+        editor->setEnabled( FALSE );

+        editor->setWordWrap(TRUE);

+        editor->setFocus(TRUE);

+        editor->setValue(LLSD(mMessage));

+        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");

+        if (web_browser)

+        {

+                //Disable for critical messages and text messages, it is reenabled later

+                web_browser->setVisible( FALSE );

+        }

+

+        if ( mType != TOS_TOS )

+        {

+                // this displays the critical message only

+                return TRUE;

+        }

+        bool use_web_browser = false;

+

+        //Check to see if the message is a link to display

+        std::string token = "http://";

+        std::string::size_type iIndex = mMessage.rfind(token);

+        //IF it has http:// in it, we use the web browser

+        if(iIndex != std::string::npos && mMessage.length() >= 2)

+        {

+                // it exists

+                use_web_browser = true;

+        }

+        else if (gHippoGridManager->getConnectedGrid()->isSecondLife())

+        {

+                //Its SL, use the browser for it as thats what it should do

+                use_web_browser = true;

+        }

+

+        if ( web_browser && use_web_browser)

+        {

+                // hide the SL text widget if we're displaying TOS with using a browser widget.

+                LLTextEditor *editor = getChild<LLTextEditor>("tos_text");

+                editor->setVisible( FALSE );

+

+                // disable Agree to TOS radio button until the page has fully loaded

+                tos_agreement->setEnabled( false );

+

+                // Reenable the web browser

+                web_browser->setVisible( TRUE );

+

+                // start to observe it so we see navigate complete events

+                web_browser->addObserver( this );

+

+                gResponsePtr = LLIamHereTOS::build( this );

+                LLHTTPClient::head( getString( "real_url" ), gResponsePtr );

+        }

+

+        return TRUE;

+}

+

+void LLFloaterTOS::setSiteIsAlive( bool alive )

+{

+        // only do this for TOS pages

+        if ( mType == TOS_TOS )

+        {

+                LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");

+                // if the contents of the site was retrieved

+                if ( alive )

+                {

+                        if ( web_browser )

+                        {

+                                // navigate to the "real" page 

+                                web_browser->navigateTo( getString( "real_url" ) );

+                        };

+                }

+                else

+                {

+                        // normally this is set when navigation to TOS page navigation completes (so you can't accept before TOS loads)

+                        // but if the page is unavailable, we need to do this now

+                        LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");

+                        tos_agreement->setEnabled( true );

+                };

+        };

+}

+

+LLFloaterTOS::~LLFloaterTOS()

+{

+        // stop obsaerving events

+        LLWebBrowserCtrl* web_browser = getChild<LLWebBrowserCtrl>("tos_html");

+        if ( web_browser )

+        {

+                web_browser->remObserver( this );               

+        };

+

+        // tell the responder we're not here anymore

+        if ( gResponsePtr )

+                gResponsePtr->setParent( 0 );

+

+        LLFloaterTOS::sInstance = NULL;

+}

+

+// virtual

+void LLFloaterTOS::draw()

+{

+        // draw children

+        LLModalDialog::draw();

+}

+

+// static

+void LLFloaterTOS::updateAgree(LLUICtrl*, void* userdata )

+{

+        LLFloaterTOS* self = (LLFloaterTOS*) userdata;

+        bool agree = self->childGetValue("agree_chk").asBoolean(); 

+        self->childSetEnabled("Continue", agree);

+}

+

+// static

+void LLFloaterTOS::onContinue( void* userdata )

+{

+        LLFloaterTOS* self = (LLFloaterTOS*) userdata;

+        llinfos << "User agrees with TOS." << llendl;

+        if (self->mType == TOS_TOS)

+        {

+                gAcceptTOS = TRUE;

+        }

+        else

+        {

+                gAcceptCriticalMessage = TRUE;

+        }

+

+        // Testing TOS dialog

+        #if ! LL_RELEASE_FOR_DOWNLOAD           

+        if ( LLStartUp::getStartupState() == STATE_LOGIN_WAIT )

+        {

+                LLStartUp::setStartupState( STATE_LOGIN_SHOW );

+        }

+        else 

+        #endif

+

+        LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );                    // Go back and finish authentication

+        self->close(); // destroys this object

+}

+

+// static

+void LLFloaterTOS::onCancel( void* userdata )

+{

+        LLFloaterTOS* self = (LLFloaterTOS*) userdata;

+        llinfos << "User disagrees with TOS." << llendl;

+        LLNotifications::instance().add("MustAgreeToLogIn", LLSD(), LLSD(), login_alert_done);

+        LLStartUp::setStartupState( STATE_LOGIN_SHOW );

+        self->mLoadCompleteCount = 0;  // reset counter for next time we come to TOS

+        self->close(); // destroys this object

+}

+

+//virtual 

+void LLFloaterTOS::onNavigateComplete( const EventType& eventIn )

+{

+        // skip past the loading screen navigate complete

+        if ( ++mLoadCompleteCount == 2 )

+        {

+                llinfos << "NAVIGATE COMPLETE" << llendl;

+                // enable Agree to TOS radio button now that page has loaded

+                LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");

+                tos_agreement->setEnabled( true );

+        };

+}

diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index c4b6d0d..782c56e 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -64,6 +64,8 @@
 #include "llwaterparammanager.h"
 #include "llpostprocess.h"
 
+#include "wlfloaterwindlightsend.h"
+
 #undef max
 
 LLFloaterWater* LLFloaterWater::sWaterMenu = NULL;
@@ -680,6 +682,12 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
                         
                 }
         }
+        else if (ctrl->getValue().asString() == "send_to_server_item")
+        {
+                //Open the other box
+                WLFloaterWindLightSend::instance();
+                WLFloaterWindLightSend::instance()->open();
+        }
         else
         {
                 LLWaterParamManager::instance()->mCurParams.mName = 
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index be3c1fd..4937232 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -63,6 +63,9 @@
 #include "llwlparamset.h"
 #include "llwlparammanager.h"
 #include "llpostprocess.h"
+#include "wlfloaterwindlightsend.h"
+#include "llworld.h"
+#include "hippolimits.h"
 
 #undef max
 
@@ -216,7 +219,9 @@ void LLFloaterWindLight::initCallbacks(void) {
         childSetCommitCallback("WLCloudScrollX", onCloudScrollXMoved, NULL);
         childSetCommitCallback("WLCloudScrollY", onCloudScrollYMoved, NULL);
         childSetCommitCallback("WLDistanceMult", onFloatControlMoved, &param_mgr->mDistanceMult);
-        childSetCommitCallback("DrawClassicClouds", LLSavedSettingsGlue::setBOOL, (void*)"SkyUseClassicClouds");
+        childSetCommitCallback("DrawClassicClouds", onCloudDrawToggled, NULL);
+        childSetCommitCallback("WLCloudHeight", onCloudHeightMoved, NULL);
+        childSetCommitCallback("WLCloudRange", onCloudRangeMoved, NULL);
 
         // WL Top
         childSetAction("WLDayCycleMenuButton", onOpenDayCycle, NULL);
@@ -425,7 +430,21 @@ void LLFloaterWindLight::syncMenu()
         bool lockY = !param_mgr->mCurParams.getEnableCloudScrollY();
         childSetValue("WLCloudLockX", lockX);
         childSetValue("WLCloudLockY", lockY);
-        childSetValue("DrawClassicClouds", gSavedSettings.getBOOL("SkyUseClassicClouds"));
+        childSetValue("DrawClassicClouds", gHippoLimits->skyUseClassicClouds);
+
+        childSetValue("WLCloudHeight", gSavedSettings.getF32("ClassicCloudHeight"));
+        childSetValue("WLCloudRange", gSavedSettings.getF32("ClassicCloudRange"));
+
+        if(!gHippoLimits->skyUseClassicClouds)
+        {
+                childDisable("WLCloudHeight");
+                childDisable("WLCloudRange");
+        }
+        else
+        {
+                childEnable("WLCloudHeight");
+                childEnable("WLCloudRange");
+        }
         
         // disable if locked, enable if not
         if(lockX) 
@@ -874,6 +893,12 @@ void LLFloaterWindLight::onSavePreset(LLUICtrl* ctrl, void* userData)
                         
                 }
         }
+        else if (ctrl->getValue().asString() == "send_to_server_item")
+        {
+                //Open the other box
+                WLFloaterWindLightSend::instance();
+                WLFloaterWindLightSend::instance()->open();
+        }
         else
         {
                 // check to see if it's a default and shouldn't be overwritten
@@ -1046,6 +1071,35 @@ void LLFloaterWindLight::onCloudScrollYMoved(LLUICtrl* ctrl, void* userData)
         // *HACK  all cloud scrolling is off by an additive of 10. 
         LLWLParamManager::instance()->mCurParams.setCloudScrollY(sldrCtrl->getValueF32() + 10.0f);
 }
+void LLFloaterWindLight::onCloudDrawToggled(LLUICtrl* ctrl, void* userData)
+{
+        LLCheckBoxCtrl* cbCtrl = static_cast<LLCheckBoxCtrl*>(ctrl);
+
+        bool lock = cbCtrl->get();
+        gHippoLimits->skyUseClassicClouds = lock;
+
+        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
+}
+
+void LLFloaterWindLight::onCloudHeightMoved(LLUICtrl* ctrl, void* userData)
+{
+        deactivateAnimator();
+
+        LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
+
+        gSavedSettings.setF32("ClassicCloudHeight", sldrCtrl->getValueF32());
+
+        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
+}
+
+void LLFloaterWindLight::onCloudRangeMoved(LLUICtrl* ctrl, void* userData)
+{
+        deactivateAnimator();
+
+        LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
+
+        gSavedSettings.setF32("ClassicCloudRange", sldrCtrl->getValueF32());
+}
 
 void LLFloaterWindLight::onCloudScrollXToggled(LLUICtrl* ctrl, void* userData)
 {
diff --git a/linden/indra/newview/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h
index b9e5311..24b0e87 100644
--- a/linden/indra/newview/llfloaterwindlight.h
+++ b/linden/indra/newview/llfloaterwindlight.h
@@ -118,6 +118,10 @@ public:
         static void onCloudScrollXToggled(LLUICtrl* ctrl, void* userData);
         static void onCloudScrollYToggled(LLUICtrl* ctrl, void* userData);
 
+        static void onCloudDrawToggled(LLUICtrl* ctrl, void* userData);
+        static void onCloudHeightMoved(LLUICtrl* ctrl, void* userData);
+        static void onCloudRangeMoved(LLUICtrl* ctrl, void* userData);
+
         //// menu management
 
         /// show off our menu
diff --git a/linden/indra/newview/llhomelocationresponder.cpp b/linden/indra/newview/llhomelocationresponder.cpp
index 3ef58e7..e609237 100644
--- a/linden/indra/newview/llhomelocationresponder.cpp
+++ b/linden/indra/newview/llhomelocationresponder.cpp
@@ -100,6 +100,8 @@ void LLHomeLocationResponder::result( const LLSD& content )
                 
     LLViewerRegion *viewer_region = gAgent.getRegion();
     gAgent.setHomePosRegion( viewer_region->getHandle(), agent_pos );
+    gAgent.takeHomeScreenshot();
+        
   }
 }
 
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index 75e2f30..ccd723f 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -53,6 +53,7 @@
 // [/RLVa:KB]
 
 #include "llxmltree.h"
+#include "hippolimits.h"
 
 
 BOOL LLHUDEffectLookAt::sDebugLookAt = FALSE;
@@ -553,7 +554,7 @@ void LLHUDEffectLookAt::setSourceObject(LLViewerObject* objectp)
 //-----------------------------------------------------------------------------
 void LLHUDEffectLookAt::render()
 {
-        if (sDebugLookAt && mSourceObject.notNull())
+        if (sDebugLookAt && mSourceObject.notNull() && gHippoLimits->mAllowMinimap) //Has to have allow minimap as well, otherwise it defeats the purpose of no minimap
         {
                 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index 7ae96ad..25a4a4b 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -119,6 +119,11 @@ bool doToSelected(LLFolderView* folder, std::string action)
                 LLInventoryClipboard::instance().reset();
         }
 
+        if ("cut" == action)
+        {       
+                LLInventoryClipboard::instance().reset();
+        }
+
         std::set<LLUUID> selected_items;
         folder->getSelectionList(selected_items);
 
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index b1627b5..f71df2d 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -463,6 +463,12 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, std::vector<std::str
 
         items.push_back(std::string("Copy Separator"));
 
+        items.push_back(std::string("Cut"));
+        if (!isItemCopyable())
+        {
+                disabled_items.push_back(std::string("Cut"));
+        }
+
         items.push_back(std::string("Copy"));
         if (!isItemCopyable())
         {
@@ -813,6 +819,11 @@ void LLItemBridge::performAction(LLFolderView* folder, LLInventoryModel* model,
                 copyToClipboard();
                 return;
         }
+        else if ("cut" == action)
+        {
+                cutToClipboard();
+                return;
+        }
         else if ("paste" == action)
         {
                 // Single item only
@@ -1086,6 +1097,15 @@ BOOL LLItemBridge::copyToClipboard() const
         }
         return FALSE;
 }
+BOOL LLItemBridge::cutToClipboard() const
+{
+        if(isItemCopyable())
+        {
+                LLInventoryClipboard::instance().addCut(mUUID);
+                return TRUE;
+        }
+        return FALSE;
+}
 
 LLViewerInventoryItem* LLItemBridge::getItem() const
 {
@@ -1890,6 +1910,35 @@ void LLFolderBridge::pasteFromClipboard()
                                         LLPointer<LLInventoryCallback>(NULL));
                         }
                 }
+                //Do cuts as well
+                LLInventoryClipboard::instance().retrieveCuts(objects);
+                count = objects.count();
+                parent_id = mUUID;
+                for(S32 i = 0; i < count; i++)
+                {
+                        item = model->getItem(objects.get(i));
+                        if (item)
+                        {
+                                copy_inventory_item(
+                                        gAgent.getID(),
+                                        item->getPermissions().getOwner(),
+                                        item->getUUID(),
+                                        parent_id,
+                                        std::string(),
+                                        LLPointer<LLInventoryCallback>(NULL));
+                                LLInventoryCategory* cat = model->getCategory(item->getUUID());
+                                if(cat)
+                                {
+                                        model->purgeDescendentsOf(mUUID);
+                                }
+                                LLInventoryObject* obj = model->getObject(item->getUUID());
+                                if(!obj) return;
+                                obj->removeFromServer();
+                                LLPreview::hide(item->getUUID());
+                                model->deleteObject(item->getUUID());
+                                model->notifyObservers();
+                        }
+                }
         }
 }
 
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index 45486ed..2004678 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -297,6 +297,7 @@ public:
         virtual BOOL removeItem();
         virtual BOOL isItemCopyable() const;
         virtual BOOL copyToClipboard() const;
+        virtual BOOL cutToClipboard() const;
         virtual BOOL hasChildren() const { return FALSE; }
         virtual BOOL isUpToDate() const { return TRUE; }
 
diff --git a/linden/indra/newview/llinventoryclipboard.cpp b/linden/indra/newview/llinventoryclipboard.cpp
index 94ffcbd..95c22aa 100644
--- a/linden/indra/newview/llinventoryclipboard.cpp
+++ b/linden/indra/newview/llinventoryclipboard.cpp
@@ -60,6 +60,11 @@ void LLInventoryClipboard::add(const LLUUID& object)
         mObjects.put(object);
 }
 
+void LLInventoryClipboard::addCut(const LLUUID& object)
+{
+        mCutObjects.put(object);
+}
+
 // this stores a single inventory object
 void LLInventoryClipboard::store(const LLUUID& object)
 {
@@ -87,15 +92,26 @@ void LLInventoryClipboard::retrieve(LLDynamicArray<LLUUID>& inv_objects) const
         }
 }
 
+void LLInventoryClipboard::retrieveCuts(LLDynamicArray<LLUUID>& inv_objects) const
+{
+        inv_objects.reset();
+        S32 count = mCutObjects.count();
+        for(S32 i = 0; i < count; i++)
+        {
+                inv_objects.put(mCutObjects[i]);
+        }
+}
+
 void LLInventoryClipboard::reset()
 {
         mObjects.reset();
+        mCutObjects.reset();
 }
 
 // returns true if the clipboard has something pasteable in it.
 BOOL LLInventoryClipboard::hasContents() const
 {
-        return (mObjects.count() > 0);
+        return (mObjects.count() > 0) || (mCutObjects.count() > 0);
 }
 
 
diff --git a/linden/indra/newview/llinventoryclipboard.h b/linden/indra/newview/llinventoryclipboard.h
index 7a2cf15..99e8450 100644
--- a/linden/indra/newview/llinventoryclipboard.h
+++ b/linden/indra/newview/llinventoryclipboard.h
@@ -54,6 +54,8 @@ public:
         // this method adds to the current list.
         void add(const LLUUID& object);
 
+        void addCut(const LLUUID& object);
+
         // this stores a single inventory object
         void store(const LLUUID& object);
 
@@ -64,6 +66,10 @@ public:
         // into the array provided.
         void retrieve(LLDynamicArray<LLUUID>& inventory_objects) const;
 
+        // this method gets the objects in the clipboard by copying them
+        // into the array provided.
+        void retrieveCuts(LLDynamicArray<LLUUID>& inventory_objects) const;
+
         // this method empties out the clipboard
         void reset();
 
@@ -74,6 +80,7 @@ protected:
         static LLInventoryClipboard sInstance;
 
         LLDynamicArray<LLUUID> mObjects;
+        LLDynamicArray<LLUUID> mCutObjects;
 
 public:
         // please don't actually call these
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 01fe6f8..cc14b27 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -529,16 +529,13 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
         relative_move -= mDragCursorStartGlobal;
 
         // You can't move more than some distance from your original mousedown point.
-        if (gSavedSettings.getBOOL("LimitDragDistance"))
-        {
-                F32 max_drag_distance = gSavedSettings.getF32("MaxDragDistance");
+        F32 max_drag_distance = gHippoLimits->getMaxDragDistance();
 
-                if (relative_move.magVecSquared() > max_drag_distance * max_drag_distance)
-                {
-                        lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl;
-                        gViewerWindow->setCursor(UI_CURSOR_NOLOCKED);
-                        return TRUE;
-                }
+        if (max_drag_distance != FLT_MAX && relative_move.magVecSquared() > max_drag_distance * max_drag_distance)

+        {
+                lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl;
+                gViewerWindow->setCursor(UI_CURSOR_NOLOCKED);
+                return TRUE;
         }
 
         F64 axis_magnitude = relative_move * axis_d;                                    // dot product
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 6ebc880..8d704d5 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -72,6 +72,7 @@ private:
         BOOL mShowTimestamps;
         BOOL mPlayTypingAnim;
         BOOL mChatBubbles;
+        BOOL mLocalChatBubbles;
         BOOL mScriptErrorAsChat;
         BOOL mChatChannel;
         F32     mConsoleOpacity;
@@ -106,6 +107,7 @@ LLPrefsChatImpl::LLPrefsChatImpl()
         childSetValue("script_errors_as_chat", gSavedSettings.getBOOL("ScriptErrorsAsChat"));
  
         childSetValue("bubble_text_chat", gSavedSettings.getBOOL("UseChatBubbles"));
+        childSetValue("local_bubble_text_chat", gSavedSettings.getBOOL("UseLocalChatWithBubbles"));
         childSetValue("chat_full_width_check", gSavedSettings.getBOOL("ChatFullWidth"));
         childSetValue("close_chat_on_return_check", gSavedSettings.getBOOL("CloseChatOnReturn"));
         childSetValue("play_typing_animation", gSavedSettings.getBOOL("PlayTypingAnim"));
@@ -135,6 +137,7 @@ void LLPrefsChatImpl::refreshValues()
         mShowTimestamps = gSavedSettings.getBOOL("ChatShowTimestamps");
         mScriptErrorAsChat = gSavedSettings.getBOOL("ScriptErrorsAsChat");
         mChatBubbles = gSavedSettings.getBOOL("UseChatBubbles");
+        mLocalChatBubbles = gSavedSettings.getBOOL("UseLocalChatWithBubbles");
         mChatFullWidth = gSavedSettings.getBOOL("ChatFullWidth");
         mCloseChatOnReturn = gSavedSettings.getBOOL("CloseChatOnReturn");
         mPlayTypingAnim = gSavedSettings.getBOOL("PlayTypingAnim"); 
@@ -164,6 +167,7 @@ void LLPrefsChatImpl::cancel()
         gSavedSettings.setBOOL("ChatShowTimestamps", mShowTimestamps);
         gSavedSettings.setBOOL("ScriptErrorsAsChat", mScriptErrorAsChat);
         gSavedSettings.setBOOL("UseChatBubbles", mChatBubbles);
+        gSavedSettings.setBOOL("UseLocalChatWithBubbles", mLocalChatBubbles);
         gSavedSettings.setBOOL("ChatFullWidth", mChatFullWidth);
         gSavedSettings.setBOOL("CloseChatOnReturn", mCloseChatOnReturn);
         gSavedSettings.setBOOL("PlayTypingAnim", mPlayTypingAnim); 
@@ -196,6 +200,7 @@ void LLPrefsChatImpl::apply()
         gSavedSettings.setBOOL("ChatShowTimestamps", childGetValue("show_timestamps_check"));
         gSavedSettings.setBOOL("ScriptErrorsAsChat", childGetValue("script_errors_as_chat"));
         gSavedSettings.setBOOL("UseChatBubbles", childGetValue("bubble_text_chat"));
+        gSavedSettings.setBOOL("UseLocalChatWithBubbles", childGetValue("local_bubble_text_chat"));
         gSavedSettings.setBOOL("ChatFullWidth", childGetValue("chat_full_width_check"));
         gSavedSettings.setBOOL("CloseChatOnReturn", childGetValue("close_chat_on_return_check"));
         gSavedSettings.setBOOL("PlayTypingAnim", childGetValue("play_typing_animation"));
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 5a10e98..5a55351 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -1861,7 +1861,7 @@ BOOL LLSelectMgr::selectionAllPCode(LLPCode code)
                 f(const LLPCode& t) : mCode(t) {}
                 virtual bool apply(LLViewerObject* object)
                 {
-                        if (object->getPCode() != mCode)
+                        if (object->getPCode() != mCode && !gSavedSettings.getBOOL("AllowEditingOfTrees"))
                         {
                                 return FALSE;
                         }
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index caaba05..d736fb0 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -59,6 +59,7 @@
 #include "llglheaders.h"
 #include "lldrawpoolterrain.h"
 #include "lldrawable.h"
+#include "hippolimits.h"
 
 extern LLPipeline gPipeline;
 
@@ -295,7 +296,7 @@ void LLSurface::initTextures()
         //
         // Water texture
         //
-        if (gSavedSettings.getBOOL("RenderWater") )
+        if (gSavedSettings.getBOOL("RenderWater") && gHippoLimits->mRenderWater)
         {
                 createWaterTexture();
                 mWaterObjp = (LLVOWater *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_WATER, mRegionp);
@@ -306,6 +307,29 @@ void LLSurface::initTextures()
         }
 }
 
+//static
+void LLSurface::rebuildWater()
+{
+        //lldebugs << "Rebuilding Water...";
+        if(!mWaterObjp.isNull())
+        {
+                //lldebugs << "Removing Water";
+                //Remove the old
+                gObjectList.killObject(mWaterObjp);
+        }
+
+        if (gSavedSettings.getBOOL("RenderWater") && gHippoLimits->mRenderWater)
+        {
+                //lldebugs << "Building Water";
+                createWaterTexture();
+                mWaterObjp = (LLVOWater *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_WATER, mRegionp);
+                gPipeline.createObject(mWaterObjp);
+                LLVector3d water_pos_global = from_region_handle(mRegionp->getHandle());
+                water_pos_global += LLVector3d(128.0, 128.0, DEFAULT_WATER_HEIGHT);
+                mWaterObjp->setPositionGlobal(water_pos_global);
+        }
+        //lldebugs << "Rebuilding Water Complete";
+}
 
 void LLSurface::setOriginGlobal(const LLVector3d &origin_global) 
 {
diff --git a/linden/indra/newview/llsurface.h b/linden/indra/newview/llsurface.h
index 003b2f2..c217b19 100644
--- a/linden/indra/newview/llsurface.h
+++ b/linden/indra/newview/llsurface.h
@@ -91,6 +91,8 @@ public:
         void disconnectNeighbor(LLSurface *neighborp);
         void disconnectAllNeighbors();
 
+        void rebuildWater(); //Destroys (if nesessary) and then rebuilds (if needed)
+
         virtual void decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL b_large_patch);
         virtual void updatePatchVisibilities(LLAgent &agent);
 
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index 5175cbb..c8e1298 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -61,6 +61,8 @@
 
 using namespace LLVOAvatarDefines;
 
+const S32 MAX_BAKE_UPLOAD_ATTEMPTS = 4;
+
 // static
 S32 LLTexLayerSetBuffer::sGLByteCount = 0;
 
@@ -98,6 +100,8 @@ LLTexLayerSetBuffer::LLTexLayerSetBuffer(LLTexLayerSet* owner, S32 width, S32 he
         mNeedsUpdate( TRUE ),
         mNeedsUpload( FALSE ),
         mUploadPending( FALSE ), // Not used for any logic here, just to sync sending of updates
+        mUploadFailCount( 0 ),
+        mUploadAfter( 0 ),
         mTexLayerSet( owner )   
 {
         LLTexLayerSetBuffer::sGLByteCount += getSize();
@@ -151,6 +155,18 @@ void LLTexLayerSetBuffer::requestUpload()
         {
                 mNeedsUpload = TRUE;
                 mUploadPending = TRUE;
+                mUploadAfter = 0;
+        }
+}
+
+// request an upload to start delay_usec microseconds from now
+void LLTexLayerSetBuffer::requestDelayedUpload(U64 delay_usec)
+{
+        if (!mNeedsUpload)
+        {
+                mNeedsUpload = TRUE;
+                mUploadPending = TRUE;
+                mUploadAfter = LLFrameTimer::getTotalTime() + delay_usec;
         }
 }
 
@@ -161,6 +177,14 @@ void LLTexLayerSetBuffer::cancelUpload()
                 mNeedsUpload = FALSE;
         }
         mUploadPending = FALSE;
+        mUploadAfter = 0;
+}
+
+// do we need to upload, and do we have sufficient data to create an uploadable composite?
+BOOL LLTexLayerSetBuffer::needsUploadNow() const
+{
+        BOOL upload = mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal() && (gAgent.mNumPendingQueries == 0);
+        return (upload && (LLFrameTimer::getTotalTime() > mUploadAfter));
 }
 
 void LLTexLayerSetBuffer::pushProjection()
@@ -187,7 +211,7 @@ void LLTexLayerSetBuffer::popProjection()
 BOOL LLTexLayerSetBuffer::needsRender()
 {
         LLVOAvatar* avatar = mTexLayerSet->getAvatar();
-        BOOL upload_now = mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal() && gAgent.mNumPendingQueries == 0;
+        BOOL upload_now = needsUploadNow();
         BOOL needs_update = (mNeedsUpdate || upload_now) && !avatar->mAppearanceAnimating;
         if (needs_update)
         {
@@ -229,9 +253,6 @@ BOOL LLTexLayerSetBuffer::render()
         // Default color mask for tex layer render
         gGL.setColorMask(true, true);
 
-        // do we need to upload, and do we have sufficient data to create an uploadable composite?
-        // When do we upload the texture if gAgent.mNumPendingQueries is non-zero?
-        BOOL upload_now = (gAgent.mNumPendingQueries == 0 && mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal());
         BOOL success = TRUE;
 
         // Composite the color data
@@ -239,7 +260,7 @@ BOOL LLTexLayerSetBuffer::render()
         success &= mTexLayerSet->render( mOrigin.mX, mOrigin.mY, mWidth, mHeight );
         gGL.flush();
 
-        if( upload_now )
+        if( needsUploadNow() )
         {
                 if (!success)
                 {
@@ -387,7 +408,8 @@ void LLTexLayerSetBuffer::readBackAndUpload()
                                 std::string url = gAgent.getRegion()->getCapability("UploadBakedTexture");
 
                                 if(!url.empty()
-                                        && !LLPipeline::sForceOldBakedUpload) // Toggle the debug setting UploadBakedTexOld to change between the new caps method and old method
+                                        && !LLPipeline::sForceOldBakedUpload // Toggle the debug setting UploadBakedTexOld to change between the new caps method and old method
+                                        && (mUploadFailCount < MAX_BAKE_UPLOAD_ATTEMPTS-1)) // allow last ditch attempt via asset store, since capabilty seems prone to transient failures.
                                 {
                                         llinfos << "Baked texture upload via capability of " << mUploadID << " to " << url << llendl;
 
@@ -436,12 +458,14 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* user
 
         LLVOAvatar* avatar = gAgent.getAvatarObject();
 
-        if (0 == result &&
-                avatar && !avatar->isDead() &&
+        if (avatar && !avatar->isDead() &&
+                baked_upload_data &&
                 baked_upload_data->mAvatar == avatar && // Sanity check: only the user's avatar should be uploading textures.
                 baked_upload_data->mLayerSet->hasComposite())
         {
                 LLTexLayerSetBuffer* layerset_buffer = baked_upload_data->mLayerSet->getComposite();
+                S32 failures = layerset_buffer->mUploadFailCount;
+                layerset_buffer->mUploadFailCount = 0;
 
                 if (layerset_buffer->mUploadID.isNull())
                 {
@@ -469,9 +493,20 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* user
                         }
                         else
                         {       
-                                // Avatar appearance is changing, ignore the upload results
-                                llinfos << "Baked upload failed. Reason: " << result << llendl;
-                                // *FIX: retry upload after n seconds, asset server could be busy
+                                ++failures;
+                                llinfos << "Baked upload failed (attempt " << failures << "/" << MAX_BAKE_UPLOAD_ATTEMPTS << "), ";
+                                if (failures >= MAX_BAKE_UPLOAD_ATTEMPTS)
+                                {
+                                        llcont << "giving up.";
+                                }
+                                else
+                                {
+                                        const F32 delay = 5.f;
+                                        llcont << llformat("retrying in %.2f seconds.", delay);
+                                        layerset_buffer->mUploadFailCount = failures;
+                                        layerset_buffer->requestDelayedUpload((U64)(delay * 1000000));
+                                }
+                                llcont << llendl;
                         }
                 }
                 else
diff --git a/linden/indra/newview/lltexlayer.h b/linden/indra/newview/lltexlayer.h
index 020ba86..31b175e 100644
--- a/linden/indra/newview/lltexlayer.h
+++ b/linden/indra/newview/lltexlayer.h
@@ -218,6 +218,7 @@ public:
         BOOL                                    needsRender();
         void                                    requestUpdate();
         void                                    requestUpload();
+        void                                    requestDelayedUpload(U64 delay_usec);
         void                                    cancelUpload();
         BOOL                                    uploadPending() { return mUploadPending; }
         BOOL                                    render( S32 x, S32 y, S32 width, S32 height );
@@ -234,12 +235,15 @@ public:
 private:
         void                                    pushProjection();
         void                                    popProjection();
+        BOOL                                    needsUploadNow() const;
 
 private:
         BOOL                                    mNeedsUpdate;
         BOOL                                    mNeedsUpload;
         BOOL                                    mUploadPending;
         LLUUID                                  mUploadID;              // Identifys the current upload process (null if none).  Used to avoid overlaps (eg, when the user rapidly makes two changes outside of Face Edit)
+        S32                                             mUploadFailCount;
+        U64                                             mUploadAfter;   // delay upload until after this time (in microseconds)
         LLTexLayerSet*                  mTexLayerSet;
 
         static S32                              sGLByteCount;
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index a9b7f81..a1a9a39 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -1172,7 +1172,7 @@ void LLTextureCache::readHeaderCache()
                         U32 empty_entries = 0;
                         typedef std::pair<U32, LLUUID> lru_data_t;
                         std::set<lru_data_t> lru;
-                        std::vector<LLUUID> purge_list;
+                        std::set<LLUUID> purge_list;
                         for (U32 i=0; i<num_entries; i++)
                         {
                                 Entry& entry = entries[i];
@@ -1191,27 +1191,23 @@ void LLTextureCache::readHeaderCache()
                                                 {
                                                         // Shouldn't happen, failsafe only
                                                         llwarns << "Bad entry: " << i << ": " << entry.mID << ": BodySize: " << entry.mBodySize << llendl;
-                                                        purge_list.push_back(id);
+                                                        purge_list.insert(id);
                                                 }
                                         }
                                 }
                         }
-                        if (num_entries > sCacheMaxEntries)
+                        if (num_entries - empty_entries > sCacheMaxEntries)
                         {
                                 // Special case: cache size was reduced, need to remove entries
                                 // Note: After we prune entries, we will call this again and create the LRU
-                                U32 entries_to_purge = (num_entries-empty_entries) - sCacheMaxEntries;
+                                U32 entries_to_purge = (num_entries - empty_entries) - sCacheMaxEntries;
                                 llinfos << "Texture Cache Entries: " << num_entries << " Max: " << sCacheMaxEntries << " Empty: " << empty_entries << " Purging: " << entries_to_purge << llendl;
-                                if (entries_to_purge > 0)
+                                // We can exit the following loop with the given condition, since if we'd reach the end of the lru set we'd have:
+                                // purge_list.size() = lru.size() = num_entries - empty_entries = entries_to_purge + sCacheMaxEntries >= entries_to_purge
+                                for (std::set<lru_data_t>::iterator iter = lru.begin(); purge_list.size() < entries_to_purge; ++iter)
                                 {
-                                        for (std::set<lru_data_t>::iterator iter = lru.begin(); iter != lru.end(); ++iter)
-                                        {
-                                                purge_list.push_back(iter->second);
-                                                if (purge_list.size() >= entries_to_purge)
-                                                        break;
-                                        }
+                                        purge_list.insert(iter->second);
                                 }
-                                llassert_always(purge_list.size() >= entries_to_purge);
                         }
                         else
                         {
@@ -1227,11 +1223,9 @@ void LLTextureCache::readHeaderCache()
                         
                         if (purge_list.size() > 0)
                         {
-                                for (std::vector<LLUUID>::iterator iter = purge_list.begin(); iter != purge_list.end(); ++iter)
+                                for (std::set<LLUUID>::iterator iter = purge_list.begin(); iter != purge_list.end(); ++iter)
                                 {
-                                        mHeaderMutex.unlock(); 
-                                        removeFromCache(*iter);
-                                        mHeaderMutex.lock();
+                                        removeFromCacheLocked(*iter);
                                 }
                                 // If we removed any entries, we need to rebuild the entries list,
                                 // write the header, and call this again
@@ -1250,7 +1244,7 @@ void LLTextureCache::readHeaderCache()
                                 writeEntriesAndClose(new_entries);
                                 mHeaderMutex.unlock(); // unlock the mutex before calling again
                                 readHeaderCache(); // repeat with new entries file
-                                mHeaderMutex.lock();
+                                return;
                         }
                         else
                         {
@@ -1345,7 +1339,7 @@ void LLTextureCache::purgeTextures(bool validate)
         if (validate)
         {
                 validate_idx = gSavedSettings.getU32("CacheValidateCounter");
-                U32 next_idx = (++validate_idx) % 256;
+                U32 next_idx = (validate_idx + 1) % 256;
                 gSavedSettings.setU32("CacheValidateCounter", next_idx);
                 LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Validating: " << validate_idx << LL_ENDL;
         }
@@ -1388,7 +1382,15 @@ void LLTextureCache::purgeTextures(bool validate)
                 {
                         purge_count++;
                         LL_DEBUGS("TextureCache") << "PURGING: " << filename << LL_ENDL;
-                        LLAPRFile::remove(filename);
+                        if (entries[idx].mBodySize > 0)
+                        {
+                                LLAPRFile::remove(filename);
+                        }
+                        else if (LLAPRFile::isExist(filename))  // Sanity check. Shouldn't exist.
+                        {
+                                LL_WARNS("TextureCache") << "Entry has zero body size but existing " << filename << ". Deleting file too..." << LL_ENDL;
+                                LLAPRFile::remove(filename);
+                        }
                         cache_size -= entries[idx].mBodySize;
                         mTexturesSizeTotal -= entries[idx].mBodySize;
                         entries[idx].mBodySize = 0;
@@ -1615,7 +1617,6 @@ bool LLTextureCache::removeHeaderCacheEntry(const LLUUID& id)
 {
         if (!mReadOnly)
         {
-                LLMutexLock lock(&mHeaderMutex);
                 Entry entry;
                 S32 idx = openAndReadEntry(id, entry, false);
                 if (idx >= 0)
@@ -1632,17 +1633,26 @@ bool LLTextureCache::removeHeaderCacheEntry(const LLUUID& id)
         return false;
 }
 
-void LLTextureCache::removeFromCache(const LLUUID& id)
+void LLTextureCache::removeFromCacheLocked(const LLUUID& id)
 {
         //llwarns << "Removing texture from cache: " << id << llendl;
         if (!mReadOnly)
         {
                 removeHeaderCacheEntry(id);
-                LLMutexLock lock(&mHeaderMutex);
                 LLAPRFile::remove(getTextureFileName(id));
         }
 }
 
+void LLTextureCache::removeFromCache(const LLUUID& id)
+{
+        //llwarns << "Removing texture from cache: " << id << llendl;
+        if (!mReadOnly)
+        {
+                LLMutexLock lock(&mHeaderMutex);
+                LLTextureCache::removeFromCacheLocked(id);
+        }
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
 LLTextureCache::ReadResponder::ReadResponder()
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index 45804c2..c859b9a 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -158,6 +158,7 @@ private:
         S32 getHeaderCacheEntry(const LLUUID& id, S32& imagesize);
         S32 setHeaderCacheEntry(const LLUUID& id, S32 imagesize);
         bool removeHeaderCacheEntry(const LLUUID& id);
+        void removeFromCacheLocked(const LLUUID& id);
         
 private:
         // Internal
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 2bc6e3e..4e133de 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -75,6 +75,7 @@
 // [RLVa:KB]
 #include "rlvhandler.h"
 // [/RLVa:KB]
+#include "hippoLimits.h"
 
 // MAX ITEMS is based on (sizeof(uuid)+2) * count must be < MTUBYTES
 // or 18 * count < 1200 => count < 1200/18 => 66. I've cut it down a
@@ -1679,8 +1680,10 @@ void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent,
                 LLNotifications::instance().add("IncompleteInventory");
                 return;
         }
+
         count = items.count() + cats.count();
-        if(count > MAX_ITEMS)
+        if(count > gHippoLimits->getMaxInventoryItemsTransfer() &&
+                gHippoLimits->getMaxInventoryItemsTransfer() != -1) //MAX_ITEMS)
         {
                 LLNotifications::instance().add("TooManyItems");
                 return;
@@ -1776,8 +1779,9 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent,
         // MTUBYTES or 18 * count < 1200 => count < 1200/18 =>
         // 66. I've cut it down a bit from there to give some pad.
         S32 count = items.count() + cats.count();
-        if(count > MAX_ITEMS)
-        {
+        if(count > gHippoLimits->getMaxInventoryItemsTransfer() &&
+                gHippoLimits->getMaxInventoryItemsTransfer() != -1) //MAX_ITEMS)
+        {
                 LLNotifications::instance().add("TooManyItems");
                 return;
         }
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 78940cc..4167464 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -82,6 +82,7 @@
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
 #include "llpostprocess.h"
+#include "hippoLimits.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -181,6 +182,12 @@ void display_update_camera()
         {
                 final_far *= 0.5f;
         }
+        if(gAgent.mLockedDrawDistance)
+        {
+                //Reset the draw distance and do not update with the new val
+                final_far = LLViewerCamera::getInstance()->getFar();
+                gAgent.mDrawDistance = final_far;
+        }
         LLViewerCamera::getInstance()->setFar(final_far);
         gViewerWindow->setup3DRender();
         
@@ -305,13 +312,19 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
         // Update GL Texture statistics (used for discard logic?)
         //
 
+
         LLAppViewer::instance()->pingMainloopTimeout("Display:TextureStats");
         gFrameStats.start(LLFrameStats::UPDATE_TEX_STATS);
         stop_glerror();
 
         LLImageGL::updateStats(gFrameTimeSeconds);
         
-        LLVOAvatar::sRenderName = gSavedSettings.getS32("RenderName");
+        S32 RenderName = gSavedSettings.getS32("RenderName");
+
+        if(RenderName > gHippoLimits->mRenderName)//The most restricted gets set here
+                RenderName = gHippoLimits->mRenderName;
+
+        LLVOAvatar::sRenderName = RenderName;
         LLVOAvatar::sRenderGroupTitles = !gSavedSettings.getBOOL("RenderHideGroupTitleAll");
         
         gPipeline.mBackfaceCull = TRUE;
@@ -835,6 +848,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                 //}
 
                 LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? TRUE : FALSE;
+                
+                //Check for RenderWater
+                if (!gSavedSettings.getBOOL("RenderWater") || !gHippoLimits->mRenderWater)
+                        LLPipeline::sUnderWaterRender = FALSE;
+                
                 LLPipeline::updateRenderDeferred();
                 
                 stop_glerror();
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index 33113f1..0e06353 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -268,7 +268,7 @@ void LLViewerInventoryItem::packMessage(LLMessageSystem* msg) const
         msg->addU32Fast(_PREHASH_Flags, mFlags);
         mSaleInfo.packMessage(msg);
         msg->addStringFast(_PREHASH_Name, mName);
-        msg->addStringFast(_PREHASH_Description, mDescription);
+                msg->addStringFast(_PREHASH_Description, mDescription);
         msg->addS32Fast(_PREHASH_CreationDate, mCreationDate);
         U32 crc = getCRC32();
         msg->addU32Fast(_PREHASH_CRC, crc);
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 524654a..3e502c0 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -121,6 +121,8 @@
 #include "llfloaterland.h"
 #include "llfloaterlandholdings.h"
 #include "llfloatermap.h"
+#include "llfloatermessagebuilder.h"
+#include "llfloatermessagelog.h"
 #include "llfloatermute.h"
 #include "llfloateropenobject.h"
 #include "llfloaterpermissionsmgr.h"
@@ -394,6 +396,8 @@ void handle_god_mode(void*);
 // God menu
 void handle_leave_god_mode(void*);
 
+void handle_open_message_log(void*);
+void handle_open_message_builder(void*);
 BOOL is_inventory_visible( void* user_data );
 void handle_reset_view();
 
@@ -778,6 +782,11 @@ void init_client_menu(LLMenuGL* menu)
 
                 sub->appendSeparator();
 
+                sub->append(new LLMenuItemCallGL(  "Message Log", &handle_open_message_log, NULL));
+                sub->append(new LLMenuItemCallGL(  "Message Builder", &handle_open_message_builder, NULL));     
+
+                sub->appendSeparator();
+
                 sub->append(new LLMenuItemCallGL("Region Info to Debug Console", 
                         &handle_region_dump_settings, NULL));
                 sub->append(new LLMenuItemCallGL("Group Info to Debug Console",
@@ -3280,6 +3289,16 @@ void process_grant_godlike_powers(LLMessageSystem* msg, void**)
         }
 }
 
+
+void handle_open_message_log(void*)
+{
+        LLFloaterMessageLog::show();
+}
+
+void handle_open_message_builder(void*)
+{
+        LLFloaterMessageBuilder::show("");
+}
 /*
 class LLHaveCallingcard : public LLInventoryCollectFunctor
 {
@@ -8672,6 +8691,30 @@ class LLAdvancedDumpInfoToConsole : public view_listener_t
 
 
 
+/////////////////////////
+// MESSAGE LOG/BUILDER //
+/////////////////////////
+
+
+class LLMessageLogBuilder : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string info_type = userdata.asString();
+                if ("MessageLog" == info_type)
+                {
+                        handle_open_message_log(NULL);
+                }
+                else if ("MessageBuilder" == info_type)
+                {
+                        handle_open_message_builder(NULL);
+                }
+                return true;
+        }
+};
+
+
+
 ///////////////////////////////
 // RELOAD SETTINGS OVERRIDES //
 ///////////////////////////////
@@ -11260,6 +11303,8 @@ void initialize_menus()
         addMenu(new LLAdvancedToggleConsole(), "Advanced.ToggleConsole");
         addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole");
         addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole");
+        addMenu(new LLMessageLogBuilder(), "Advanced.MessageLog");
+        addMenu(new LLMessageLogBuilder(), "Advanced.MessageBuilder");
         addMenu(new LLAdvancedReloadSettingsOverrides(), "Advanced.ReloadSettingsOverrides");
         addMenu(new LLAdvancedToggleSit(), "Advanced.ToggleSit");
         addMenu(new LLAdvancedCheckSit(), "Advanced.CheckSit");
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index 632f783..f33c201 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -110,6 +110,8 @@ bool handle_give_money_dialog();
 bool handle_object_open();
 bool handle_go_to_confirm();
 bool handle_go_to();
+void handle_open_message_log(void*);
+void handle_open_message_builder(void*);
 
 // Export to XML or Collada
 void handle_export_selected( void * );
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index dbf9d72..9e7b166 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -152,6 +152,7 @@
 
 #include "hippoGridManager.h"
 #include "hippoLimits.h"
+#include "wlsettingsmanager.h"
 
 #if LL_WINDOWS // For Windows specific error handler
 #include "llwindebug.h" // For the invalid message handler
@@ -2520,6 +2521,62 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                 else
                                 {
                                         LLNotifications::instance().add("TeleportOffered", args, payload);
+                                        if(binary_bucket_size)
+                                        {
+                                                char* dest = new char[binary_bucket_size];
+                                                strncpy(dest, (char*)binary_bucket, binary_bucket_size-1);              /* Flawfinder: ignore */
+                                                dest[binary_bucket_size-1] = '\0';
+
+                                                llinfos << "IM_LURE_USER binary_bucket " << dest << llendl;
+
+                                                std::string str(dest);
+                                                typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+                                                boost::char_separator<char> sep("|","",boost::keep_empty_tokens);
+                                                tokenizer tokens(str, sep);
+                                                tokenizer::iterator iter = tokens.begin();
+                                                std::string global_x_str(*iter++);
+                                                std::string global_y_str(*iter++);
+                                                std::string x_str(*iter++);
+                                                std::string y_str(*iter++);
+                                                std::string z_str(*iter++);
+                                                // skip what I think must be LookAt
+                                                if(iter != tokens.end())
+                                                        iter++; // x
+                                                if(iter != tokens.end())
+                                                        iter++; // y
+                                                if(iter != tokens.end())
+                                                        iter++; // z
+                                                std::string mat_str("");
+                                                if(iter != tokens.end())
+                                                        mat_str.assign(*iter++);
+                                                mat_str = utf8str_trim(mat_str);
+
+                                                llinfos << "IM_LURE_USER tokenized " << global_x_str << "|" << global_y_str << "|" << x_str << "|" << y_str << "|" << z_str << "|" << mat_str << llendl;
+
+                                                std::istringstream gxstr(global_x_str);
+                                                int global_x;
+                                                gxstr >> global_x;
+
+                                                std::istringstream gystr(global_y_str);
+                                                int global_y;
+                                                gystr >> global_y;
+
+                                                std::istringstream xstr(x_str);
+                                                int x;
+                                                xstr >> x;
+
+                                                std::istringstream ystr(y_str);
+                                                int y;
+                                                ystr >> y;
+
+                                                std::istringstream zstr(z_str);
+                                                int z;
+                                                zstr >> z;
+
+                                                llinfos << "IM_LURE_USER parsed " << global_x << "|" << global_y << "|" << x << "|" << y << "|" << z << "|" << mat_str << llendl;
+
+                                                gAgent.showLureDestination(name, global_x, global_y, x, y, z, mat_str);
+                                        }
                                 }
 // [/RLVa:KB]
                                 //LLNotifications::instance().add("TeleportOffered", args, payload);
@@ -3060,8 +3117,17 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
                         if (!is_muted && !is_busy)
                         {
-                                static BOOL* sUseChatBubbles = rebind_llcontrol<BOOL>("UseChatBubbles", &gSavedSettings, true);
-                                visible_in_chat_bubble = *sUseChatBubbles;
+                                
+                                BOOL sUseChatBubbles = gSavedSettings.getBOOL("UseChatBubbles");
+                                if(sUseChatBubbles)
+                                {
+                                        BOOL localChat = gSavedSettings.getBOOL("UseLocalChatWithBubbles");
+                                        if(localChat)
+                                                sUseChatBubbles = FALSE; //Act like they arn't enabled and show it anyway
+                                }
+                                //Update..
+                                visible_in_chat_bubble = sUseChatBubbles;
+
                                 ((LLVOAvatar*)chatter)->addChat(chat);
                         }
                 }
@@ -3513,6 +3579,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 
         // Tell the LightShare handler that we have changed regions.
         WindlightMessage::resetRegion();
+        WLSettingsManager::wlresetRegion();
 }
 
 // stuff we have to do every time we get an AvatarInitComplete from a sim
@@ -3779,6 +3846,7 @@ void process_crossed_region(LLMessageSystem* msg, void**)
 
         // Tell the LightShare handler that we have changed regions.
         WindlightMessage::resetRegion();
+        WLSettingsManager::wlresetRegion();
 }
 
 
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 4fd3bfb..b63914c 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -452,6 +452,12 @@ void LLViewerRegion::setWaterHeight(F32 water_level)
         mLandp->setWaterHeight(water_level);
 }
 
+
+void LLViewerRegion::rebuildWater()
+{
+        mLandp->rebuildWater();
+}
+
 F32 LLViewerRegion::getWaterHeight() const
 {
         return mLandp->getWaterHeight();
@@ -1416,7 +1422,9 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         LLSD capabilityNames = LLSD::emptyArray();
         capabilityNames.append("ChatSessionRequest");
         capabilityNames.append("CopyInventoryFromNotecard");
+        capabilityNames.append("DispatchOpenRegionSettings");
         capabilityNames.append("DispatchRegionInfo");
+        capabilityNames.append("DispatchWindLightSettings");
         capabilityNames.append("EstateChangeInfo");
         capabilityNames.append("EventQueueGet");
         capabilityNames.append("FetchInventory");
@@ -1434,6 +1442,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         capabilityNames.append("ProvisionVoiceAccountRequest");
         capabilityNames.append("RemoteParcelRequest");
         capabilityNames.append("RequestTextureDownload");
+        capabilityNames.append("RetrieveWindLightSettings");
         capabilityNames.append("SearchStatRequest");
         capabilityNames.append("SearchStatTracking");
         capabilityNames.append("SendPostcard");
diff --git a/linden/indra/newview/llviewerregion.h b/linden/indra/newview/llviewerregion.h
index 09280a5..8cc80e3 100644
--- a/linden/indra/newview/llviewerregion.h
+++ b/linden/indra/newview/llviewerregion.h
@@ -132,6 +132,7 @@ public:
 
         void setWaterHeight(F32 water_level);
         F32 getWaterHeight() const;
+        void rebuildWater();
 
         BOOL isVoiceEnabled() const;
 
@@ -315,10 +316,11 @@ public:
         LLDynamicArray<U32> mMapAvatars;
         LLDynamicArray<LLUUID> mMapAvatarIDs;
 
-private:
         // The surfaces and other layers
         LLSurface*      mLandp;
 
+private:
+
         // Region geometry data
         LLVector3d      mOriginGlobal;  // Location of southwest corner of region (meters)
         LLVector3d      mCenterGlobal;  // Location of center in world space (meters)
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 9937ed9..a20769e 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -94,7 +94,7 @@
 #include "boost/lexical_cast.hpp"
 #endif
 #include "hippoLimits.h"// getMaxPrimScale
-
+#include "llstartup.h"
 // [RLVa:KB]
 #include "rlvhandler.h"
 // [/RLVa:KB]
@@ -3666,7 +3666,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 }
 // [/RLVa:KB]
 
-
                                 BOOL need_comma = FALSE;
 
                                 static BOOL* sShowClientNameTag = rebind_llcontrol<BOOL>("ShowClientNameTag", &gSavedSettings, true);
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 50ce53a..548818d 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -148,6 +148,7 @@ public:
         void clampAttachmentPositions();
         S32 getAttachmentCount(); // Warning: order(N) not order(1)
 
+
         // HUD functions
         BOOL hasHUDAttachment() const;
         LLBBox getHUDBBox() const;
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index e01506e..0156622 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -75,6 +75,7 @@
 #include "curl/curl.h"
 
 LLWaterParamManager * LLWaterParamManager::sInstance = NULL;
+LLFrameTimer waterSmoothTransitionTimer;
 
 LLWaterParamManager::LLWaterParamManager() :
         mFogColor(22.f/255.f, 43.f/255.f, 54.f/255.f, 0.0f, 0.0f, "waterFogColor", "WaterFogColor"),
@@ -454,9 +455,44 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
                                 shaders_iter->mUniformsDirty = TRUE;
                         }
                 }
+                //Mix windlight settings if needed
+                if(sNeedsMix == TRUE)
+                {
+                        if(sMixSet == NULL)
+                        {
+                                sNeedsMix = FALSE;
+                                return;
+                        }
+                        if (waterSmoothTransitionTimer.getElapsedTimeF32() >=
+                                (sMixTime / 100)) //100 steps inbetween
+                        {
+                                waterSmoothTransitionTimer.reset();
+                                mCurParams.mix(mCurParams, *sMixSet, sMixCount / 100);//.01 to 1.0
+                        }
+                        sMixCount++;
+                        if((sMixCount / 100) == 1)
+                        {
+                                //All done
+                                sNeedsMix = FALSE;
+                                std::string wlWaterPresetName   = "(Region settings)";
+                                mCurParams.mName = wlWaterPresetName;
+                                removeParamSet( wlWaterPresetName, true );
+                                addParamSet( wlWaterPresetName, mCurParams );
+                                savePreset( wlWaterPresetName );
+                                loadPreset( wlWaterPresetName, true );
+                                sMixSet = NULL;
+                        }
+                }
         }
 }
-
+void LLWaterParamManager::SetMixTime(LLWaterParamSet *mixSet, F32 mixTime)
+{
+        waterSmoothTransitionTimer.reset();
+        sNeedsMix = TRUE;
+        sMixSet = mixSet;
+        sMixTime = mixTime;
+        sMixCount = 1;
+}
 // static
 void LLWaterParamManager::initClass(void)
 {
diff --git a/linden/indra/newview/llwaterparammanager.h b/linden/indra/newview/llwaterparammanager.h
index 588e436..96dd1aa 100644
--- a/linden/indra/newview/llwaterparammanager.h
+++ b/linden/indra/newview/llwaterparammanager.h
@@ -304,6 +304,8 @@ public:
         // singleton pattern implementation
         static LLWaterParamManager * instance();
 
+        void SetMixTime(LLWaterParamSet* mixSet, F32 mixTime);
+
 public:
 
         LLWaterParamSet mCurParams;
@@ -334,6 +336,11 @@ private:
         LLVector4 mWaterPlane;
         F32 mWaterFogKS;
 
+        BOOL sNeedsMix;
+        LLWaterParamSet* sMixSet;
+        F32 sMixTime;
+        F32 sMixCount;
+
         // our parameter manager singleton instance
         static LLWaterParamManager * sInstance;
 
diff --git a/linden/indra/newview/llwaterparamset.cpp b/linden/indra/newview/llwaterparamset.cpp
index a26cced..4b2e426 100644
--- a/linden/indra/newview/llwaterparamset.cpp
+++ b/linden/indra/newview/llwaterparamset.cpp
@@ -229,4 +229,96 @@ F32 LLWaterParamSet::getFloat(const std::string& paramName, bool& error)
         error = true;
         return 0;
 }
+void LLWaterParamSet::mix(LLWaterParamSet& src, LLWaterParamSet& dest, F32 weight)
+{
+        // set up the iterators
+        LLSD::map_iterator cIt = mParamValues.beginMap();
+
+        LLSD srcVal;
+        LLSD destVal;
+
+        // do the interpolation for all the ones saved as vectors
+        // skip the weird ones
+        for(; cIt != mParamValues.endMap(); cIt++) {
+
+                // check params to make sure they're actually there
+                if(src.mParamValues.has(cIt->first))
+                {
+                        srcVal = src.mParamValues[cIt->first];
+                }
+                else
+                {
+                        continue;
+                }
+                
+                if(dest.mParamValues.has(cIt->first))
+                {
+                        destVal = dest.mParamValues[cIt->first];
+                }
+                else
+                {
+                        continue;
+                }               
+                                
+                // skip if not a vector
+                if(!cIt->second.isArray()) 
+                {
+                        continue;
+                }
+
+                // only Real vectors allowed
+                if(!cIt->second[0].isReal()) 
+                {
+                        continue;
+                }
+                
+                // make sure all the same size
+                if(     cIt->second.size() != srcVal.size() ||
+                        cIt->second.size() != destVal.size())
+                {
+                        continue;
+                }
+                
+                // more error checking might be necessary;
+                
+                for(int i=0; i < cIt->second.size(); ++i) 
+                {
+                        cIt->second[i] = (1.0f - weight) * (F32) srcVal[i].asReal() + 
+                                weight * (F32) destVal[i].asReal();
+                }
+        }
+        mParamValues["waterFogColor"][0] = (1 - weight) * (F32) src.mParamValues["waterFogColor"][0].asReal()
+                + weight * (F32) dest.mParamValues["waterFogColor"][0].asReal();
+        mParamValues["waterFogColor"][1] = (1 - weight) * (F32) src.mParamValues["waterFogColor"][1].asReal()
+                + weight * (F32) dest.mParamValues["waterFogColor"][1].asReal();
+        mParamValues["waterFogColor"][2] = (1 - weight) * (F32) src.mParamValues["waterFogColor"][2].asReal()
+                + weight * (F32) dest.mParamValues["waterFogColor"][2].asReal();
+        mParamValues["waterFogColor"][3] = (1 - weight) * (F32) src.mParamValues["waterFogColor"][3].asReal()
+                + weight * (F32) dest.mParamValues["waterFogColor"][3].asReal();
+        
+        mParamValues["waterFogDensity"] = (1 - weight) * (F32) src.mParamValues["waterFogDensity"].asReal()
+                + weight * (F32) dest.mParamValues["waterFogDensity"].asReal();
+        mParamValues["underWaterFogMod"] = (1 - weight) * (F32) src.mParamValues["underWaterFogMod"].asReal()
+                + weight * (F32) dest.mParamValues["underWaterFogMod"].asReal();
+        mParamValues["fresnelScale"] = (1 - weight) * (F32) src.mParamValues["fresnelScale"].asReal()
+                + weight * (F32) dest.mParamValues["fresnelScale"].asReal();
+        mParamValues["fresnelOffset"] = (1 - weight) * (F32) src.mParamValues["fresnelOffset"].asReal()
+                + weight * (F32) dest.mParamValues["fresnelOffset"].asReal();
+        mParamValues["scaleAbove"] = (1 - weight) * (F32) src.mParamValues["scaleAbove"].asReal()
+                + weight * (F32) dest.mParamValues["scaleAbove"].asReal();
+        mParamValues["scaleBelow"] = (1 - weight) * (F32) src.mParamValues["scaleBelow"].asReal()
+                + weight * (F32) dest.mParamValues["scaleBelow"].asReal();
+        mParamValues["blurMultiplier"] = (1 - weight) * (F32) src.mParamValues["blurMultiplier"].asReal()
+                + weight * (F32) dest.mParamValues["blurMultiplier"].asReal();
+        
+        mParamValues["wave2Dir"][0] = (1 - weight) * (F32) src.mParamValues["wave2Dir"][0].asReal()
+                + weight * (F32) dest.mParamValues["wave2Dir"][0].asReal();
+        mParamValues["wave2Dir"][1] = (1 - weight) * (F32) src.mParamValues["wave2Dir"][1].asReal()
+                + weight * (F32) dest.mParamValues["wave2Dir"][1].asReal();
+        
+        mParamValues["wave1Dir"][0] = (1 - weight) * (F32) src.mParamValues["wave1Dir"][0].asReal()
+                + weight * (F32) dest.mParamValues["wave1Dir"][0].asReal();
+        mParamValues["wave1Dir"][1] = (1 - weight) * (F32) src.mParamValues["wave1Dir"][1].asReal()
+                + weight * (F32) dest.mParamValues["wave1Dir"][1].asReal();
+}
 
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 31471d7..8007cce 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -71,11 +71,13 @@
 #include "llviewerinventory.h"
 #include "llviewerregion.h"
 #include "llassetuploadresponders.h"
+#include "llframetimer.h"
 
 #include "curl/curl.h"
 
 LLWLParamManager * LLWLParamManager::sInstance = NULL;
 std::vector<LLWLPresetsObserver*> LLWLParamManager::sObservers;
+LLFrameTimer wlSmoothTransitionTimer;
 
 LLWLParamManager::LLWLParamManager() :
 
@@ -562,6 +564,46 @@ void LLWLParamManager::update(LLViewerCamera * cam)
                         }
                 }
         }
+
+        //Mix windlight settings if needed
+        if(sNeedsMix == TRUE)
+        {
+                if(sMixSet == NULL)
+                {
+                        sNeedsMix = FALSE;
+                        return;
+                }
+                if (wlSmoothTransitionTimer.getElapsedTimeF32() >=
+                        (sMixTime / 100)) //100 steps inbetween
+                {
+                        wlSmoothTransitionTimer.reset();
+                        mCurParams.mix(mCurParams, *sMixSet, sMixCount / 100);//.01 to 1.0
+                }
+                sMixCount++;
+                if((sMixCount / 100) == 1)
+                {
+                        //All done
+                        sNeedsMix = FALSE;
+                        std::string wlSkyPresetName   = "(Region settings)";
+                        mCurParams.mName = wlSkyPresetName;
+                        removeParamSet( wlSkyPresetName, true );
+                        addParamSet( wlSkyPresetName, mCurParams );
+                        savePreset( wlSkyPresetName );
+                        mAnimator.mIsRunning = false;
+                        mAnimator.mUseLindenTime = false;
+                        loadPreset( wlSkyPresetName, true );
+                        sMixSet = NULL;
+                }
+        }
+}
+
+void LLWLParamManager::SetMixTime(LLWLParamSet *mixSet, F32 mixTime)
+{
+        wlSmoothTransitionTimer.reset();
+        sNeedsMix = TRUE;
+        sMixSet = mixSet;
+        sMixTime = mixTime;
+        sMixCount = 1;
 }
 
 // static
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 612a507..fc1127e 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -221,6 +221,8 @@ public:
         static void removeObserver(LLWLPresetsObserver* observer);
         static void notifyObservers();
 
+        void SetMixTime(LLWLParamSet* mixSet, F32 mixTime);
+
 public:
 
         // helper variables
@@ -280,6 +282,11 @@ public:
 private:
         // our parameter manager singleton instance
         static LLWLParamManager * sInstance;
+
+        BOOL sNeedsMix;
+        LLWLParamSet* sMixSet;
+        F32 sMixTime;
+        F32 sMixCount;
         
         static std::vector<LLWLPresetsObserver*> sObservers;
 
diff --git a/linden/indra/newview/llwlparamset.cpp b/linden/indra/newview/llwlparamset.cpp
index ea9c00a..19528eb 100644
--- a/linden/indra/newview/llwlparamset.cpp
+++ b/linden/indra/newview/llwlparamset.cpp
@@ -145,6 +145,11 @@ void LLWLParamSet::set(const std::string& paramName, float x)
         {
                 mParamValues[paramName][0] = x;
         }
+        else
+        {
+                //Default this
+                mParamValues[paramName] = x;
+        } 
 }
 
 void LLWLParamSet::set(const std::string& paramName, float x, float y) {
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index ca8ce2d..c484462 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -669,7 +669,8 @@ void LLWorld::updateClouds(const F32 dt)
 {
         static BOOL* sFreezeTime = rebind_llcontrol<BOOL>("FreezeTime", &gSavedSettings, true);
         if ((*sFreezeTime) ||
-                !gSavedSettings.getBOOL("SkyUseClassicClouds"))
+                !gSavedSettings.getBOOL("SkyUseClassicClouds") ||
+                !gHippoLimits->skyUseClassicClouds)
         {
                 // don't move clouds in snapshot mode
                 return;
@@ -830,6 +831,14 @@ void LLWorld::setLandFarClip(const F32 far_clip)
         }
 }
 
+void LLWorld::rebuildClouds(LLViewerRegion *regionp)
+{
+        regionp->mCloudLayer.destroy();
+        regionp->mCloudLayer.create(regionp);
+        regionp->mCloudLayer.setWidth((F32)mWidth);
+        regionp->mCloudLayer.setWindPointer(&regionp->mWind);
+}
+
 // Some region that we're connected to, but not the one we're in, gave us
 // a (possibly) new water height. Update it in our local copy.
 void LLWorld::waterHeightRegionInfo(std::string const& sim_name, F32 water_height)
diff --git a/linden/indra/newview/llworld.h b/linden/indra/newview/llworld.h
index 2c5815c..964729d 100644
--- a/linden/indra/newview/llworld.h
+++ b/linden/indra/newview/llworld.h
@@ -150,6 +150,8 @@ public:
 
         void getInfo(LLSD& info);
 
+        void rebuildClouds(LLViewerRegion *regionp);
+
 public:
         typedef std::list<LLViewerRegion*> region_list_t;
         const region_list_t& getRegionList() const { return mActiveRegionList; }
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index c6242f6..43d7426 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -735,6 +735,13 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
                                 callback(handle, LLWorldMap::getInstance()->mSLURL, image_id, LLWorldMap::getInstance()->mSLURLTeleport);
                         }
                 }
+                if(gAgent.mLureShow)
+                {
+                        if((x_regions == gAgent.mLureGlobalX) && (y_regions == gAgent.mLureGlobalY))
+                        {
+                                gAgent.onFoundLureDestination();
+                        }
+                }
         }
 
         if(adjust) gFloaterWorldMap->adjustZoomSliderBounds();
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index cf766e0..2932865 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -101,6 +101,7 @@
 #include "llwaterparammanager.h"
 #include "llspatialpartition.h"
 #include "llmutelist.h"
+#include "hippolimits.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -5980,6 +5981,9 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                         stop_glerror();
 
                         LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? FALSE : TRUE;
+                        
+                        if (!gSavedSettings.getBOOL("RenderWater") || !gHippoLimits->mRenderWater)
+                                LLPipeline::sUnderWaterRender = FALSE;
 
                         if (LLPipeline::sUnderWaterRender)
                         {
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
index 0e5a642..cd88c2e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
@@ -58,7 +58,7 @@
            font="SansSerif" mouse_opaque="true" name="Refresh" scale_image="TRUE" />
       <slider bottom_delta="-20" left="10" follows="left|top" width="175" height="15"
            name="near_me_range" label="Range" control_name="NearMeRange" 
-           min_val="5" max_val="40" increment="1" initial_val="20" decimal_digits="0" />
+           min_val="5" max_val="512" increment="1" initial_val="20" decimal_digits="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
            bottom_delta="0" left="185" drop_shadow_visible="true" follows="left|top"
            font="SansSerifSmall" h_pad="0" halign="left" height="15"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
index e2bafbf..0a4f2a9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_env_settings.xml
@@ -58,9 +58,11 @@
         <button bottom="-140" follows="left|top" font="SansSerifSmall" height="20"
              label="Use Estate Time" left="8" name="EnvUseEstateTimeButton" width="137" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-             label="Advanced Sky" left="154" name="EnvAdvancedSkyButton" width="137" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
-             label="Advanced Water" left="300" name="EnvAdvancedWaterButton" width="137" />
-        <button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
+             label="Advanced Sky" left="154" name="EnvAdvancedSkyButton" width="107" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
+             label="Advanced Water" left="270" name="EnvAdvancedWaterButton" width="137" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20"
+             label="Advanced WindLight Manager" left="416" name="EnvWLManager" width="177" />
+  <button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?"
              left="570" name="EnvSettingsHelpButton" width="22" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index 82a65b8..0175508 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -5,7 +5,7 @@
              embedded_items="false" enabled="true" follows="left|top|right|bottom"
              font="Monospace" height="376" ignore_tab="false" left="4"
              max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
-             word_wrap="true" show_line_numbers="true">
+             word_wrap="true" show_line_numbers="true" spell_check="false">
                 Loading...
         </text_editor>
         <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
index 485cfcc..beea02f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tos.xml
@@ -15,15 +15,14 @@
              bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif"
              h_pad="0" halign="left" height="30" left="16" mouse_opaque="true"
              name="tos_heading" v_pad="0" width="552">
-                Please read the following Terms of Service carefully. To continue logging in to Second Life,
-you must accept the agreement.
+                Please read the following Terms of Service carefully. To continue logging in you must accept the agreement.
         </text>
-        <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
+  <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
              height="283" left="16" max_length="65536" mouse_opaque="true"
              name="tos_text" width="568"
              word_wrap="true">
-                TOS_TEXT
-        </text_editor>
+    TOS_TEXT
+  </text_editor>
   <!-- Loading text says: "Loading Terms of Service..." URL encoded -->
         <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
              height="340" left="16" max_length="65536" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
index 441ce7b..a05deb6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
@@ -1,273 +1,276 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="240" left="50" min_height="200"
-     min_width="400" mouse_opaque="true" name="Water Floater"
-     rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"
-     width="700">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
-             width="110">
-                Water Presets:
-        </text>
-        <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
-             left_delta="120" max_chars="20" mouse_opaque="true"
-             name="WaterPresetsCombo" width="150" />
-  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
-             mouse_opaque="true" name="prev" scale_image="true" width="20" />
-  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
-             mouse_opaque="true" name="next" scale_image="true" width="20" />
-        <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" right="-270"
-       mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="100" />
-  <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save to Disk"
-       right="-140" halign="center" list_position="above" enabled="true" 
-       mouse_opaque="true" width="125"  name="WaterSavePreset">
-    <flyout_button_item value="save_inventory_item" name="save_inventory_item">
-      Save to Inventory
-    </flyout_button_item>
-    <flyout_button_item value="save_disk_item" name="save_disk_item">
-      Save to Disk
-    </flyout_button_item>
-  </flyout_button>
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Delete File" label_selected="Delete File" right="-10"
-             mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="125" />
-        <tab_container bottom="-240" follows="left|top" height="180" left="0"
-             mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
-                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-                     label="Settings" left="1" mouse_opaque="false"
-                     name="Settings" width="698">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-                                Water Fog Color
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="160" name="WaterFogColorHelp" width="18" />
-                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
-                             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-                             height="50" label="" left="40" mouse_opaque="true"
-                             name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-90" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">
-                                Fog Density Exponent
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="160" name="WaterFogDensityHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity"
-                             decimal_digits="1" follows="left" height="10" increment=".1"
-                             initial_val="16" label="" left="24" max_val="10" min_val="0"
-                             mouse_opaque="true" name="WaterFogDensity" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-130" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"
-                             width="355">
-                                Underwater Fog Modifier
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="160" name="WaterUnderWaterFogModHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2"
-                             follows="left" height="10" increment=".01" initial_val="16" label=""
-                             left="24" max_val="2" min_val="0" mouse_opaque="true"
-                             name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
-                                Reflection Wavelet Scale
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="395" name="WaterNormalScaleHelp" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
-                                1
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
-                                2
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
-                                3
-                        </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WaterNormalScaleX"
-                             decimal_digits="1" follows="left" height="10" increment="0.1"
-                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-                             mouse_opaque="true" name="WaterNormalScaleX" show_text="true" value="1.0"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleY"
-                             decimal_digits="1" follows="left" height="10" increment="0.1"
-                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-                             mouse_opaque="true" name="WaterNormalScaleY" show_text="true" value="1.0"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleZ"
-                             decimal_digits="1" follows="left" height="10" increment="0.1"
-                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-                             mouse_opaque="true" name="WaterNormalScaleZ" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-80" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
-                                Fresnel Scale
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="395" name="WaterFresnelScaleHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WaterFresnelScale" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-115" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"
-                             width="355">
-                                Fresnel Offset
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="395" name="WaterFresnelOffsetHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WaterFresnelOffset" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
-                                Refract Scale Above
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="630" name="WaterScaleAboveHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.1" label="" left="494" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WaterScaleAbove" show_text="true" value="1.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"
-                             width="355">
-                                Refract Scale Below
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="630" name="WaterScaleBelowHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0" label="" left="494" max_val="1" min_val="0"
-                             mouse_opaque="true" name="WaterScaleBelow" show_text="true" value="0.0"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
-                                Blur Multiplier
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="630" name="WaterBlurMultiplierHelp" width="18" />
-                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult"
-                             decimal_digits="3" follows="left" height="10" increment=".001"
-                             initial_val="0" label="" left="494" max_val=".16" min_val="0"
-                             mouse_opaque="true" name="WaterBlurMult" show_text="true" value="0"
-                             width="200" />
-                </panel>
-                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-                     label="Image" left="1" mouse_opaque="false" name="Waves"
-                     width="698">
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-                                Big Wave Direction
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="155" name="WaterWave1Help" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"
-                             width="10">
-                                X
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"
-                             width="10">
-                                Y
-                        </text>
-                        <slider bottom="-50" can_edit_text="false" control_name="WaterWave1DirX"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                             mouse_opaque="true" name="WaterWave1DirX" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave1DirY"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                             mouse_opaque="true" name="WaterWave1DirY" show_text="true" value="0.7"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-70" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">
-                                Little Wave Direction
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="155" name="WaterWave2Help" width="18" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"
-                             width="10">
-                                X
-                        </text>
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16"
-                             left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"
-                             width="10">
-                                Y
-                        </text>
-                        <slider bottom="-100" can_edit_text="false" control_name="WaterWave2DirX"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                             mouse_opaque="true" name="WaterWave2DirX" show_text="true" value="0.7"
-                             width="200" />
-                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave2DirY"
-                             decimal_digits="2" follows="left" height="10" increment="0.01"
-                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-                             mouse_opaque="true" name="WaterWave2DirY" show_text="true" value="0.7"
-                             width="200" />
-                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-                             font="SansSerif" h_pad="0" halign="left" height="16"
-                             left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">
-                                Normal Map
-                        </text>
-                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-                             left="365" name="WaterNormalMapHelp" width="18" />
-                        <texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap"
-                             width="128" />
-                </panel>
-        </tab_container>
-        <string name="WLDefaultWaterNames">
-                Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-        </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"

+     can_resize="false" height="240" left="50" min_height="200"

+     min_width="400" mouse_opaque="true" name="Water Floater"

+     rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"

+     width="700">

+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="-50" drop_shadow_visible="true" follows="left|top|right"

+             font="SansSerif" h_pad="0" halign="left" height="16"

+             left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"

+             width="110">

+                Water Presets:

+        </text>

+        <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"

+             left_delta="120" max_chars="20" mouse_opaque="true"

+             name="WaterPresetsCombo" width="150" />

+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"

+             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"

+             mouse_opaque="true" name="prev" scale_image="true" width="20" />

+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"

+             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"

+             mouse_opaque="true" name="next" scale_image="true" width="20" />

+        <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"

+             label="New" right="-270"

+       mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="100" />

+  <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save to Disk"

+       right="-140" halign="center" list_position="above" enabled="true" 

+       mouse_opaque="true" width="125"  name="WaterSavePreset">

+    <flyout_button_item value="save_inventory_item" name="save_inventory_item">

+      Save to Inventory

+    </flyout_button_item>

+    <flyout_button_item value="save_disk_item" name="save_disk_item">

+      Save to Disk

+    </flyout_button_item>

+    <flyout_button_item value="send_to_server_item" name="send_to_server_item">

+      Send to Server

+    </flyout_button_item>

+  </flyout_button>

+        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"

+             label="Delete File" label_selected="Delete File" right="-10"

+             mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="125" />

+        <tab_container bottom="-240" follows="left|top" height="180" left="0"

+             mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">

+                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"

+                     label="Settings" left="1" mouse_opaque="false"

+                     name="Settings" width="698">

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">

+                                Water Fog Color

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="160" name="WaterFogColorHelp" width="18" />

+                        <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"

+                             can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"

+                             height="50" label="" left="40" mouse_opaque="true"

+                             name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-90" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">

+                                Fog Density Exponent

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="160" name="WaterFogDensityHelp" width="18" />

+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity"

+                             decimal_digits="1" follows="left" height="10" increment=".1"

+                             initial_val="16" label="" left="24" max_val="10" min_val="0"

+                             mouse_opaque="true" name="WaterFogDensity" show_text="true" value="1.0"

+                             width="200" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-130" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"

+                             width="355">

+                                Underwater Fog Modifier

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="160" name="WaterUnderWaterFogModHelp" width="18" />

+                        <slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2"

+                             follows="left" height="10" increment=".01" initial_val="16" label=""

+                             left="24" max_val="2" min_val="0" mouse_opaque="true"

+                             name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">

+                                Reflection Wavelet Scale

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="395" name="WaterNormalScaleHelp" width="18" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"

+                             left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">

+                                1

+                        </text>

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"

+                             left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">

+                                2

+                        </text>

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"

+                             left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">

+                                3

+                        </text>

+                        <slider bottom="-50" can_edit_text="false" control_name="WaterNormalScaleX"

+                             decimal_digits="1" follows="left" height="10" increment="0.1"

+                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"

+                             mouse_opaque="true" name="WaterNormalScaleX" show_text="true" value="1.0"

+                             width="200" />

+                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleY"

+                             decimal_digits="1" follows="left" height="10" increment="0.1"

+                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"

+                             mouse_opaque="true" name="WaterNormalScaleY" show_text="true" value="1.0"

+                             width="200" />

+                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleZ"

+                             decimal_digits="1" follows="left" height="10" increment="0.1"

+                             initial_val="0.7" label="" left="259" max_val="10" min_val="0"

+                             mouse_opaque="true" name="WaterNormalScaleZ" show_text="true" value="1.0"

+                             width="200" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-80" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">

+                                Fresnel Scale

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="395" name="WaterFresnelScaleHelp" width="18" />

+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale"

+                             decimal_digits="2" follows="left" height="10" increment="0.01"

+                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"

+                             mouse_opaque="true" name="WaterFresnelScale" show_text="true" value="1.0"

+                             width="200" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-115" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"

+                             width="355">

+                                Fresnel Offset

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="395" name="WaterFresnelOffsetHelp" width="18" />

+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset"

+                             decimal_digits="2" follows="left" height="10" increment="0.01"

+                             initial_val="0.7" label="" left="259" max_val="1" min_val="0"

+                             mouse_opaque="true" name="WaterFresnelOffset" show_text="true" value="1.0"

+                             width="200" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">

+                                Refract Scale Above

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="630" name="WaterScaleAboveHelp" width="18" />

+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove"

+                             decimal_digits="2" follows="left" height="10" increment="0.01"

+                             initial_val="0.1" label="" left="494" max_val="1" min_val="0"

+                             mouse_opaque="true" name="WaterScaleAbove" show_text="true" value="1.0"

+                             width="200" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-53" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"

+                             width="355">

+                                Refract Scale Below

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="630" name="WaterScaleBelowHelp" width="18" />

+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow"

+                             decimal_digits="2" follows="left" height="10" increment="0.01"

+                             initial_val="0" label="" left="494" max_val="1" min_val="0"

+                             mouse_opaque="true" name="WaterScaleBelow" show_text="true" value="0.0"

+                             width="200" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">

+                                Blur Multiplier

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="630" name="WaterBlurMultiplierHelp" width="18" />

+                        <slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult"

+                             decimal_digits="3" follows="left" height="10" increment=".001"

+                             initial_val="0" label="" left="494" max_val=".16" min_val="0"

+                             mouse_opaque="true" name="WaterBlurMult" show_text="true" value="0"

+                             width="200" />

+                </panel>

+                <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"

+                     label="Image" left="1" mouse_opaque="false" name="Waves"

+                     width="698">

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">

+                                Big Wave Direction

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="155" name="WaterWave1Help" width="18" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-37" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"

+                             left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"

+                             width="10">

+                                X

+                        </text>

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"

+                             left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"

+                             width="10">

+                                Y

+                        </text>

+                        <slider bottom="-50" can_edit_text="false" control_name="WaterWave1DirX"

+                             decimal_digits="2" follows="left" height="10" increment="0.01"

+                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"

+                             mouse_opaque="true" name="WaterWave1DirX" show_text="true" value="0.7"

+                             width="200" />

+                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave1DirY"

+                             decimal_digits="2" follows="left" height="10" increment="0.01"

+                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"

+                             mouse_opaque="true" name="WaterWave1DirY" show_text="true" value="0.7"

+                             width="200" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-70" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">

+                                Little Wave Direction

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="155" name="WaterWave2Help" width="18" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-87" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"

+                             left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"

+                             width="10">

+                                X

+                        </text>

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerifSmall" h_pad="0" halign="center" height="16"

+                             left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"

+                             width="10">

+                                Y

+                        </text>

+                        <slider bottom="-100" can_edit_text="false" control_name="WaterWave2DirX"

+                             decimal_digits="2" follows="left" height="10" increment="0.01"

+                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"

+                             mouse_opaque="true" name="WaterWave2DirX" show_text="true" value="0.7"

+                             width="200" />

+                        <slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave2DirY"

+                             decimal_digits="2" follows="left" height="10" increment="0.01"

+                             initial_val="0.7" label="" left="24" max_val="4" min_val="-4"

+                             mouse_opaque="true" name="WaterWave2DirY" show_text="true" value="0.7"

+                             width="200" />

+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             bottom="-20" drop_shadow_visible="true" follows="left|top|right"

+                             font="SansSerif" h_pad="0" halign="left" height="16"

+                             left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">

+                                Normal Map

+                        </text>

+                        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"

+                             left="365" name="WaterNormalMapHelp" width="18" />

+                        <texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap"

+                             width="128" />

+                </panel>

+        </tab_container>

+        <string name="WLDefaultWaterNames">

+                Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez

+        </string>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_manager.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_manager.xml
new file mode 100644
index 0000000..9ef70c8
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_manager.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"

+     can_resize="false" height="130" left="50" min_height="130"

+     min_width="300" mouse_opaque="true" name="WindLight send to server floater"

+     title="WindLight Manager"

+     width="300">

+  <button bottom="-50" enabled="true" font="SansSerif" halign="center" height="20"

+             label="This Parcel" label_selected="This Parcel" left="10"

+             mouse_opaque="true" name="this_parcel" scale_image="true" width="90" />

+  <button  bottom="-50" enabled="true" font="SansSerif" halign="center" height="20"

+             label="All Parcels" label_selected="All Parcels" left_delta="95 "

+             mouse_opaque="true" name="all_parcels" scale_image="true" width="90" />

+  <button  bottom="-50" enabled="true" font="SansSerif" halign="center" height="20"

+             label="This Region" label_selected="This Region" left_delta="95 "

+             mouse_opaque="true" name="this_region" scale_image="true" width="90" />

+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="-75" drop_shadow_visible="true" follows="left|top|right"

+             font="SansSerif" h_pad="0" halign="left" height="16"

+             left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"

+             width="110">

+    Settings:

+  </text>

+  <combo_box allow_text_entry="false" bottom="-77" follows="left|top" height="18"

+             left_delta="70" max_chars="20" mouse_opaque="true" name="WLSettingsCombo"

+             width="200" />

+  <button  bottom="-125" enabled="true" font="SansSerif" halign="center" height="20"

+             label="Show" label_selected="Show" left="10"

+             mouse_opaque="true" name="show" scale_image="true" width="80" />

+  <button  bottom="-125" enabled="true" font="SansSerif" halign="center" height="20"

+             label="Set to Current" label_selected="Set to Current" left="95"

+             mouse_opaque="true" name="set_to_current" scale_image="true" width="100" />

+  <button  bottom="-125" enabled="true" font="SansSerif" halign="center" height="20"

+             label="Remove" label_selected="Remove" left="200"

+             mouse_opaque="true" name="remove" scale_image="true" width="80" />

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
index 4f5fc4a..c5e2c2a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
@@ -32,6 +32,9 @@
     <flyout_button_item value="save_disk_item" name="save_disk_item">
       Save to Disk
     </flyout_button_item>
+    <flyout_button_item value="send_to_server_item" name="send_to_server_item">
+      Send to Server
+    </flyout_button_item>
   </flyout_button>
   <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
              label="Delete File" label_selected="Delete File" right="-10"
@@ -211,6 +214,10 @@
                              initial_val="500" label="" left="494" max_val="4000" min_val="0"
                              mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000"
                              width="205" />
+      <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
+         label="Day Cycle Editor" label_selected="Day Cycle Editor"
+         right="-10" mouse_opaque="true" name="WLDayCycleMenuButton"
+         scale_image="true" width="150" />
     </panel>
     <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
                      label="Lighting" left="1" mouse_opaque="true"
@@ -572,34 +579,54 @@
                              mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0"
                              width="200" />
       <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-60" drop_shadow_visible="true" follows="left|top|right"
+                             bottom="-52" drop_shadow_visible="true" follows="left|top|right"
                              font="SansSerif" h_pad="0" halign="left" height="16"
                              left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
                              width="355">
         Cloud Scroll Y
       </text>
-      <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom_delta="-2" follows="left|top" font="SansSerifSmall" height="18" label="?"
                              left="605" name="WLCloudScrollYHelp" width="18" />
       <check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
                              initial_value="false" label="Lock" left="625" mouse_opaque="true"
                              name="WLCloudLockY" width="200" />
-      <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY"
+      <slider bottom_delta="-10" can_edit_text="false" control_name="WLCloudScrollY"
                              decimal_digits="2" follows="left" height="10" increment="0.01"
                              initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
                              mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0"
                              width="200" />
-      <check_box bottom="-120" control_name="DrawClassicClouds" follows="left"
+      <check_box bottom="-102" control_name="DrawClassicClouds" follows="left"
                              font="SansSerifSmall" height="16" initial_value="false"
                              label="Draw Classic Clouds" left="480" mouse_opaque="true"
                              name="DrawClassicClouds" width="200" />
-      <button bottom="-102" follows="left|top" font="SansSerifSmall" height="18" label="?"
+      <button bottom="-85" follows="left|top" font="SansSerifSmall" height="18" label="?"
                              left="608" name="WLClassicCloudsHelp" width="18" />
+      <text bottom_delta="-19" type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="20"
+                             left="480" mouse_opaque="true" name="WLCloudHeightText" v_pad="0"
+                             width="355">
+        Classic Cloud Height
+      </text>
+      <slider bottom_delta="-27" can_edit_text="true" control_name="WLCloudHeight"
+                             decimal_digits="0" follows="left" height="16" increment="1"
+                             initial_val="192" label="" left="494" max_val="1000" min_val="0"
+                             mouse_opaque="true" name="WLCloudHeight" show_text="true" value="192"
+                             width="200" />
+      <text bottom_delta="0" type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             drop_shadow_visible="true" follows="left|top|right"
+                             font="SansSerif" h_pad="0" halign="left" height="20"
+                             left="480" mouse_opaque="true" name="WLCloudClassicRangeText" v_pad="0"
+                             width="355">
+        Classic Cloud Range
+      </text>
+      <slider bottom_delta="-27" can_edit_text="true" control_name="WLCloudClassicRange"
+                             decimal_digits="0" follows="left" height="16" increment="1 "
+                             initial_val="48" label="" left="494" max_val="100" min_val="0"
+                             mouse_opaque="true" name="WLCloudRange" show_text="true" value="48"
+                             width="200" />
     </panel>
   </tab_container>
-  <button bottom="4" enabled="true" font="SansSerif" halign="center" height="20"
-     label="Day Cycle Editor" label_selected="Day Cycle Editor"
-     right="-10" mouse_opaque="true" name="WLDayCycleMenuButton"
-     scale_image="true" width="150" />
         <string name="WLDefaultSkyNames">
                 A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
         </string>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_remote_save.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_remote_save.xml
new file mode 100644
index 0000000..84c1d04
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_remote_save.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"

+     can_resize="true" height="220" left="50" min_height="220"

+     min_width="300" mouse_opaque="true" name="WindLight send to server floater"

+     title="WindLight Send to Server"

+     width="300">

+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+                             left="10" bottom="180" drop_shadow_visible="true" follows="left|top"

+                             font="SansSerif" h_pad="0" halign="left" height="10"

+                             mouse_opaque="true" name="label Type" v_pad="0" width="275">

+    WindLight Send to Server

+  </text>

+  <slider can_edit_text="true" control_name="max_altitude"

+          left="20" bottom="110"

+          decimal_digits="2" follows="left" height="18" increment="0.1"

+          initial_val="4096.0" label="Max Altitude" max_val="4096.001" min_val="0"

+          mouse_opaque="true" name="max_altitude" show_text="true" value="4096.0"

+          width="200" />

+  <button follows="left|top" font="SansSerifSmall" height="18" label="?"

+           left_delta="210" bottom="125" name="max_altitude_help" width="18" enabled="true" />

+

+  <slider can_edit_text="true" control_name="min_altitude"

+            left="20" bottom="80"

+            decimal_digits="2" follows="left" height="18" increment="0.1"

+            initial_val="1.0" label="Min Altitude" max_val="4096" min_val="0"

+            mouse_opaque="true" name="min_altitude" show_text="true" value="0"

+            width="200" />

+  <button follows="left|top" font="SansSerifSmall" height="18" label="?"

+           left_delta="210" bottom="95" name="min_altitude_help" width="18" enabled="true" />

+  <slider can_edit_text="true" control_name="Fade"

+               left="20" bottom="50"

+               decimal_digits="2" follows="left" height="18" increment="0.1"

+               initial_val="1.0" label="Fade" max_val="10" min_val="0"

+               mouse_opaque="true" name="Fade" show_text="true" value="1.0"

+               width="200" />

+  <button follows="left|top" font="SansSerifSmall" height="18" label="?"

+           left_delta="210" bottom="65" name="fade_help" width="18" />

+

+  <tab_container bottom="-220" follows="left|top" height="160" left="0"

+             mouse_opaque="false" name="WindLight_Setting_Types" tab_position="top" width="299">

+    <panel border="true" bottom="175" follows="left|top|right|bottom" height="160"

+                     label="Region" left="1" mouse_opaque="false"

+                     name="Region" width="698">

+      <check_box control_name="override_parcel" follows="left" font="SansSerifSmall" height="16"

+           left="20" bottom="30"

+                             initial_value="false" label="Override Parcels" mouse_opaque="true"

+                             name="override_parcel" width="200" enabled="true" />

+      <button follows="left|top" font="SansSerifSmall" height="18" label="?"

+               left_delta="210" bottom="45" name="override_parcel_help" width="18" enabled="true" />

+

+      <button follows="top|right" font="SansSerif" halign="center"

+               right="-10" bottom="20"

+               height="20" label="Send" label_selected="Send"

+               mouse_opaque="true" name="button_region_send_to_server" scale_image="TRUE" width="78" />

+    </panel>

+    <panel border="true" bottom="175" follows="left|top|right|bottom" height="160"

+                     label="Parcel" left="1" mouse_opaque="false"

+                     name="Parcel" width="698">

+

+      <!--<slider can_edit_text="true" control_name="max_altitude"

+                left="20" bottom="110"

+                decimal_digits="2" follows="left" height="18" increment="0.1"

+                initial_val="4096.0" label="Max Altitude" max_val="4096.001" min_val="0"

+                mouse_opaque="true" name="max_altitude" show_text="true" value="4096.0"

+                width="200" />

+      <button follows="left|top" font="SansSerifSmall" height="18" label="?"

+               left_delta="210" bottom="125" name="max_altitude_help" width="18" enabled="true" />

+      

+      <slider can_edit_text="true" control_name="min_altitude"

+                left="20" bottom="80"

+                decimal_digits="2" follows="left" height="18" increment="0.1"

+                initial_val="1.0" label="Min Altitude" max_val="4096" min_val="0"

+                mouse_opaque="true" name="min_altitude" show_text="true" value="0"

+                width="200" />

+      <button follows="left|top" font="SansSerifSmall" height="18" label="?"

+               left_delta="210" bottom="95" name="min_altitude_help" width="18" enabled="true" />

+      

+      <slider can_edit_text="true" control_name="Fade"

+                left="20" bottom="50"

+                decimal_digits="2" follows="left" height="18" increment="0.1"

+                initial_val="1.0" label="Fade" max_val="10" min_val="0"

+                mouse_opaque="true" name="Fade" show_text="true" value="1.0"

+                width="200" />

+      <button follows="left|top" font="SansSerifSmall" height="18" label="?"

+               left_delta="210" bottom="65" name="fade_help" width="18" />-->

+

+      <button follows="top|right" font="SansSerif" halign="center"

+              right="-10" bottom="20" height="20" label="Send"

+              mouse_opaque="true" name="button_parcel_send_to_server" width="78" />

+    </panel>

+    <!--<panel border="true" bottom="175" follows="left|top|right|bottom" height="160"

+                     label="Area" left="1" mouse_opaque="false"

+                     name="Area" width="698">

+

+      <slider can_edit_text="true" control_name="Max Altitude"

+                left="20" bottom="110"

+                decimal_digits="2" follows="left" height="18" increment="0.1"

+                initial_val="4096.0" label="Max Altitude" max_val="4096.001" min_val="0"

+                mouse_opaque="true" name="Max Altitude" show_text="true" value="4096.0"

+                width="200" />

+      <slider can_edit_text="true" control_name="Min Altitude"

+                left="20" bottom="80"

+                decimal_digits="2" follows="left" height="18" increment="0.1"

+                initial_val="1.0" label="Min Altitude" max_val="4096" min_val="0"

+                mouse_opaque="true" name="Min Altitude" show_text="true" value="0"

+                width="200" />

+

+      <slider can_edit_text="true" control_name="Fade"

+                left="20" bottom="50"

+                decimal_digits="2" follows="left" height="18" increment="0.1"

+                initial_val="1.0" label="Fade" max_val="10" min_val="0"

+                mouse_opaque="true" name="Fade" show_text="true" value="1.0"

+                width="200" />

+      <button follows="left|top" font="SansSerifSmall" height="18" label="?"

+               left_delta="210" bottom="65" name="fade_help" width="18" />

+

+      <button follows="top|right" font="SansSerif" halign="center"

+               right="-10" bottom="20"

+               height="20" label="Send" label_selected="Send"

+               mouse_opaque="true" name="button send to server" scale_image="TRUE" width="78" />

+    </panel>-->

+   </tab_container>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
index 389efb5..daf217e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
@@ -1,183 +1,183 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="711" min_height="520" min_width="410" name="worldmap"
-     rect_control="FloaterWorldMapRect2" title="World Map" width="1243">
-        <tab_container bottom="-701" follows="left|top|right|bottom" height="681" left="15"
-             mouse_opaque="false" name="maptab" tab_position="top" width="995">
-                <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Objects"
-                     left="1" mouse_opaque="true" name="objects_mapview" width="993" />
-                <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Terrain"
-                     left="1" mouse_opaque="true" name="terrain_mapview" width="993" />
-        </tab_container>
-        <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self"
-             width="16" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-50" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-             mouse_opaque="true" name="you_label" v_pad="0" width="145">
-                You
-        </text>
-        <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_home.tga" left="1083" mouse_opaque="true" name="home"
-             width="16" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-50" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-             mouse_opaque="true" name="home_label" v_pad="0" width="145">
-                Home
-        </text>
-        <icon bottom="-70" color="0.5, 0.25, 1, 1" follows="top|right" height="16"
-             image_name="legend.tga" left="1013" mouse_opaque="true" name="square2"
-             width="16" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-70" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-             mouse_opaque="true" name="auction_label" v_pad="0" width="145">
-                Auction
-        </text>
-        <icon bottom="-70" color="1, 1, 0.25, 1" follows="top|right" height="16"
-             image_name="legend.tga" left="1083" mouse_opaque="true" name="square"
-             width="16" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-70" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-             mouse_opaque="true" name="land_for_sale_label" v_pad="0" width="145">
-                Land For Sale
-        </text>
-        <button bottom="-50" follows="top|right" font="SansSerifSmall" halign="center"
-             height="16" label="Go Home" label_selected="Go Home" left="1150"
-             mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home"
-             width="88" />
-        <icon bottom="-92" color="0, 1, 0, 1" follows="top|right" height="8"
-                image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"
-                width="8" />
-        <check_box bottom="-96" control_name="MapShowPeople" follows="top|right"
-                font="SansSerifSmall" height="16" initial_value="false" label="Resident"
-                left_delta="16" mouse_opaque="true" name="people_chk" width="110" />
-        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
-                image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub"
-                width="16" />
-        <check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right"
-                font="SansSerifSmall" height="16" initial_value="false" label="Infohub"
-                left_delta="20" mouse_opaque="true" name="infohub_chk" width="110" />
-        <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
-                image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"
-                width="16" />
-        <check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right"
-                font="SansSerifSmall" height="16" initial_value="false" label="Telehub"
-                left_delta="20" mouse_opaque="true" name="telehubchk" width="110" />
-        <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="icon_for_sale.tga" left="1013" mouse_opaque="true"
-             name="landforsale" width="16" />
-        <check_box bottom="-156" control_name="MapShowLandForSale" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label="Land for Sale"
-             left_delta="20" mouse_opaque="true" name="land_for_sale_chk" width="110" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-96" drop_shadow_visible="true" follows="top|right"
-             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="1139"
-             mouse_opaque="true" name="events_label" v_pad="0" width="145">
-                Events:
-        </text>
-        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_event.tga" left="1151" mouse_opaque="true" name="event"
-             width="16" />
-        <check_box bottom="-116" control_name="MapShowEvents" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label="PG"
-             left_delta="20" mouse_opaque="true" name="event_chk" width="55" />
-        <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_event_mature.tga" left="1151" mouse_opaque="true"
-             name="events_mature_icon" width="16" />
-        <check_box bottom="-136" control_name="ShowMatureEvents" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="true" label="Mature"
-             left_delta="20" mouse_opaque="true" name="event_mature_chk" width="55" />
-        <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
-             image_name="map_event_adult.tga" left="1151" mouse_opaque="true"
-             name="events_adult_icon" width="16" />
-        <check_box bottom="-156" control_name="ShowAdultEvents" follows="top|right"
-             font="SansSerifSmall" height="16" initial_value="false" label="Adult"
-             left_delta="20" mouse_opaque="true" name="event_adult_chk" width="55" />
-        <icon bottom="-180" color="0.5, 0, 0, 1" follows="top|right" height="16"
-             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
-             name="avatar_icon" width="16" />
-        <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-             label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true"
-             name="friend combo" tool_tip="Friend to Show on Map" width="202">
-                <combo_item name="none_selected" value="None">
-                        Online Friends
-                </combo_item>
-        </combo_box>
-        <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
-             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
-             name="landmark_icon" width="16" />
-        <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-             label="Landmarks" left_delta="20" max_chars="64" mouse_opaque="true"
-             name="landmark combo" tool_tip="Landmark to Show on Map" width="202">
-                <combo_item name="none_selected" value="None">
-                        Landmarks
-                </combo_item>
-        </combo_box>
-        <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
-             image_name="map_track_16.tga" left="1013" mouse_opaque="true"
-             name="location_icon" width="16" />
-        <line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name"
-             left_delta="20" name="location" select_on_focus="true"
-             tool_tip="Type the name of a region" width="140" />
-        <button bottom_delta="0" follows="top|right" font="SansSerif" halign="center"
-             height="20" label="Search" left_delta="145" mouse_opaque="true"
-             name="DoSearch" tool_tip="Search for region" width="60" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" follows="top|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
-             mouse_opaque="true" name="search_label" v_pad="0" width="222">
-                Search Results:
-        </text>
-        <scroll_list background_visible="true" bottom_delta="-326" draw_border="true"
-             draw_stripes="false" 
-             follows="top|right|bottom" height="320" left="1013" multi_select="false"
-             name="search_results" width="222">
-                <column label="" name="icon" width="16" />
-                <column label="" name="sim_name" width="206" />
-        </scroll_list>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" follows="bottom|right"
-             font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
-             mouse_opaque="true" name="location_label" v_pad="0" width="98">
-                Location:
-        </text>
-        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-             increment="1" initial_val="128" left="1090" max_val="255" min_val="0"
-             mouse_opaque="true" name="spin x"
-             tool_tip="X coordinate of location to show on map" width="48" />
-        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-             increment="1" initial_val="128" left_delta="50" max_val="255" min_val="0"
-             mouse_opaque="true" name="spin y"
-             tool_tip="Y coordinate of location to show on map" width="48" />
-        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-             increment="1" initial_val="0" left_delta="50" max_val="4096" min_val="0"
-             mouse_opaque="true" name="spin z"
-             tool_tip="Z coordinate of location to show on map" width="48" />
-        <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Teleport" label_selected="Teleport" left="-230"
-             mouse_opaque="true" name="Teleport"
-             tool_tip="Teleport to selected location" width="90" />
-        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Show Destination" label_selected="Show Destination"
-             left_delta="100" mouse_opaque="true" name="Show Destination"
-             tool_tip="Center map on selected location" width="125" />
-        <button bottom_delta="-24" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Clear" label_selected="Clear" left="-230"
-             mouse_opaque="true" name="Clear" tool_tip="Stop tracking" width="90" />
-        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-             height="20" label="Show My Location" label_selected="Show My Location"
-             left_delta="100" mouse_opaque="true" name="Show My Location"
-             tool_tip="Center map on your avatar&apos;s location" width="125" />
-        <button bottom_delta="-24" enabled="false" follows="bottom|right" font="SansSerif"
-             height="20" label="Copy SLURL to clipboard" left="-230" name="copy_slurl"
-             tool_tip="Copies current location as SLURL to be used on the web."
-             width="222" />
-        <slider bottom="-697" can_edit_text="false" decimal_digits="3" follows="right|bottom"
-             height="16" increment="0.2" initial_val="48.5029" label="Zoom" left="-230"
-             max_val="0" min_val="-8" mouse_opaque="true" name="zoom slider"
-             show_text="false" value="48.5029" width="222" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"

+     height="711" min_height="520" min_width="410" name="worldmap"

+     rect_control="FloaterWorldMapRect2" title="World Map" width="1243">

+        <tab_container bottom="-701" follows="left|top|right|bottom" height="681" left="15"

+             mouse_opaque="false" name="maptab" tab_position="top" width="995">

+                <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Objects"

+                     left="1" mouse_opaque="true" name="objects_mapview" width="993" />

+                <panel bottom="-680" follows="left|top|right|bottom" height="664" label="Terrain"

+                     left="1" mouse_opaque="true" name="terrain_mapview" width="993" />

+        </tab_container>

+        <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"

+             image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self"

+             width="16" />

+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="-50" drop_shadow_visible="true" follows="top|right"

+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"

+             mouse_opaque="true" name="you_label" v_pad="0" width="145">

+                You

+        </text>

+        <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"

+             image_name="map_home.tga" left="1083" mouse_opaque="true" name="home"

+             width="16" />

+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="-50" drop_shadow_visible="true" follows="top|right"

+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"

+             mouse_opaque="true" name="home_label" v_pad="0" width="145">

+                Home

+        </text>

+        <icon bottom="-70" color="0.5, 0.25, 1, 1" follows="top|right" height="16"

+             image_name="legend.tga" left="1013" mouse_opaque="true" name="square2"

+             width="16" />

+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="-70" drop_shadow_visible="true" follows="top|right"

+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"

+             mouse_opaque="true" name="auction_label" v_pad="0" width="145">

+                Auction

+        </text>

+        <icon bottom="-70" color="1, 1, 0.25, 1" follows="top|right" height="16"

+             image_name="legend.tga" left="1083" mouse_opaque="true" name="square"

+             width="16" />

+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="-70" drop_shadow_visible="true" follows="top|right"

+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"

+             mouse_opaque="true" name="land_for_sale_label" v_pad="0" width="145">

+                Land For Sale

+        </text>

+        <button bottom="-50" follows="top|right" font="SansSerifSmall" halign="center"

+             height="16" label="Go Home" label_selected="Go Home" left="1150"

+             mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home"

+             width="88" />

+        <icon bottom="-92" color="0, 1, 0, 1" follows="top|right" height="8"

+                image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"

+                width="8" />

+        <check_box bottom="-96" control_name="MapShowPeople" follows="top|right"

+                font="SansSerifSmall" height="16" initial_value="false" label="Resident"

+                left_delta="16" mouse_opaque="true" name="people_chk" width="110" />

+        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"

+                image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub"

+                width="16" />

+        <check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right"

+                font="SansSerifSmall" height="16" initial_value="false" label="Infohub"

+                left_delta="20" mouse_opaque="true" name="infohub_chk" width="110" />

+        <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"

+                image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"

+                width="16" />

+        <check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right"

+                font="SansSerifSmall" height="16" initial_value="false" label="Telehub"

+                left_delta="20" mouse_opaque="true" name="telehubchk" width="110" />

+        <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"

+             image_name="icon_for_sale.tga" left="1013" mouse_opaque="true"

+             name="landforsale" width="16" />

+        <check_box bottom="-156" control_name="MapShowLandForSale" follows="top|right"

+             font="SansSerifSmall" height="16" initial_value="false" label="Land for Sale"

+             left_delta="20" mouse_opaque="true" name="land_for_sale_chk" width="110" />

+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom="-96" drop_shadow_visible="true" follows="top|right"

+             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="1139"

+             mouse_opaque="true" name="events_label" v_pad="0" width="145">

+                Events:

+        </text>

+        <icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"

+             image_name="map_event.tga" left="1151" mouse_opaque="true" name="event"

+             width="16" />

+        <check_box bottom="-116" control_name="MapShowEvents" follows="top|right"

+             font="SansSerifSmall" height="16" initial_value="false" label="PG"

+             left_delta="20" mouse_opaque="true" name="event_chk" width="55" />

+        <icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"

+             image_name="map_event_mature.tga" left="1151" mouse_opaque="true"

+             name="events_mature_icon" width="16" />

+        <check_box bottom="-136" control_name="ShowMatureEvents" follows="top|right"

+             font="SansSerifSmall" height="16" initial_value="true" label="Mature"

+             left_delta="20" mouse_opaque="true" name="event_mature_chk" width="55" />

+        <icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"

+             image_name="map_event_adult.tga" left="1151" mouse_opaque="true"

+             name="events_adult_icon" width="16" />

+        <check_box bottom="-156" control_name="ShowAdultEvents" follows="top|right"

+             font="SansSerifSmall" height="16" initial_value="false" label="Adult"

+             left_delta="20" mouse_opaque="true" name="event_adult_chk" width="55" />

+        <icon bottom="-180" color="0.5, 0, 0, 1" follows="top|right" height="16"

+             image_name="map_track_16.tga" left="1013" mouse_opaque="true"

+             name="avatar_icon" width="16" />

+        <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"

+             label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true"

+             name="friend combo" tool_tip="Friend to Show on Map" width="202">

+                <combo_item name="none_selected" value="None">

+                        Online Friends

+                </combo_item>

+        </combo_box>

+        <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"

+             image_name="map_track_16.tga" left="1013" mouse_opaque="true"

+             name="landmark_icon" width="16" />

+        <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"

+             label="Landmarks" left_delta="20" max_chars="64" mouse_opaque="true"

+             name="landmark combo" tool_tip="Landmark to Show on Map" width="202">

+                <combo_item name="none_selected" value="None">

+                        Landmarks

+                </combo_item>

+        </combo_box>

+        <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"

+             image_name="map_track_16.tga" left="1013" mouse_opaque="true"

+             name="location_icon" width="16" />

+        <line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name"

+             left_delta="20" name="location" select_on_focus="true"

+             tool_tip="Type the name of a region" width="140" />

+        <button bottom_delta="0" follows="top|right" font="SansSerif" halign="center"

+             height="20" label="Search" left_delta="145" mouse_opaque="true"

+             name="DoSearch" tool_tip="Search for region" width="60" />

+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom_delta="-20" drop_shadow_visible="true" follows="top|right"

+             font="SansSerif" h_pad="0" halign="left" height="16" left="1013"

+             mouse_opaque="true" name="search_label" v_pad="0" width="222">

+                Search Results:

+        </text>

+        <scroll_list background_visible="true" bottom_delta="-326" draw_border="true"

+             draw_stripes="false" 

+             follows="top|right|bottom" height="320" left="1013" multi_select="false"

+             name="search_results" width="222">

+                <column label="" name="icon" width="16" />

+                <column label="" name="sim_name" width="206" />

+        </scroll_list>

+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom_delta="-20" drop_shadow_visible="true" follows="bottom|right"

+             font="SansSerif" h_pad="0" halign="left" height="16" left="1013"

+             mouse_opaque="true" name="location_label" v_pad="0" width="98">

+                Location:

+        </text>

+        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"

+             increment="1" initial_val="128" left="1090" max_val="99999" min_val="0"

+             mouse_opaque="true" name="spin x"

+             tool_tip="X coordinate of location to show on map" width="48" />

+        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"

+             increment="1" initial_val="128" left_delta="50" max_val="99999" min_val="0"

+             mouse_opaque="true" name="spin y"

+             tool_tip="Y coordinate of location to show on map" width="48" />

+        <spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"

+             increment="1" initial_val="0" left_delta="50" max_val="4096" min_val="0"

+             mouse_opaque="true" name="spin z"

+             tool_tip="Z coordinate of location to show on map" width="48" />

+        <button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"

+             height="20" label="Teleport" label_selected="Teleport" left="-230"

+             mouse_opaque="true" name="Teleport"

+             tool_tip="Teleport to selected location" width="90" />

+        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"

+             height="20" label="Show Destination" label_selected="Show Destination"

+             left_delta="100" mouse_opaque="true" name="Show Destination"

+             tool_tip="Center map on selected location" width="125" />

+        <button bottom_delta="-24" follows="right|bottom" font="SansSerif" halign="center"

+             height="20" label="Clear" label_selected="Clear" left="-230"

+             mouse_opaque="true" name="Clear" tool_tip="Stop tracking" width="90" />

+        <button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"

+             height="20" label="Show My Location" label_selected="Show My Location"

+             left_delta="100" mouse_opaque="true" name="Show My Location"

+             tool_tip="Center map on your avatar&apos;s location" width="125" />

+        <button bottom_delta="-24" enabled="false" follows="bottom|right" font="SansSerif"

+             height="20" label="Copy SLURL to clipboard" left="-230" name="copy_slurl"

+             tool_tip="Copies current location as SLURL to be used on the web."

+             width="222" />

+        <slider bottom="-697" can_edit_text="false" decimal_digits="3" follows="right|bottom"

+             height="16" increment="0.2" initial_val="48.5029" label="Zoom" left="-230"

+             max_val="0" min_val="-8" mouse_opaque="true" name="zoom slider"

+             show_text="false" value="48.5029" width="222" />

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
index 18bedd0..35f3037 100644
--- a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<pie_menu name="Attachment Pie">
-        <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
-                <on_click function="Attachment.Drop" />
-                <on_enable function="Attachment.EnableDrop" />
-        </menu_item_call>
-        <menu_item_separator />
-        <menu_item_separator />
-        <menu_item_separator />
-        <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
-                <on_click function="Object.Inspect" />
-                <on_enable function="Object.EnableInspect" />
-        </menu_item_call>
-        <menu_item_separator />
-        <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
-                <on_click function="Attachment.Detach" />
-                <on_enable function="Attachment.EnableDetach" />
-        </menu_item_call>
-        <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit">
-                <on_click function="Object.Edit" />
-                <on_enable function="EnableEdit" />
-        </menu_item_call>
-</pie_menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<pie_menu name="Attachment Pie">

+        <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">

+                <on_click function="Attachment.Drop" />

+                <on_enable function="Attachment.EnableDrop" />

+        </menu_item_call>

+        <menu_item_separator />

+        <menu_item_separator />

+        <menu_item_separator />

+        <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">

+                <on_click function="Object.Inspect" />

+                <on_enable function="Object.EnableInspect" />

+        </menu_item_call>

+        <menu_item_separator />

+        <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">

+                <on_click function="Attachment.Detach" />

+                <on_enable function="Attachment.EnableDetach" />

+        </menu_item_call>

+        <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit">

+                <on_click function="Object.Edit" />

+                <on_enable function="EnableEdit" />

+        </menu_item_call>

+</pie_menu>

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 1ae7465..86dc5c7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -166,11 +166,15 @@
                 <on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
         </menu_item_call>
         <menu_item_separator name="Copy Separator" />
-        <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
+  <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
+             name="Cut" width="128">
+    <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
+  </menu_item_call>
+  <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
              name="Copy" width="128">
-                <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
-        </menu_item_call>
-        <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
+    <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
+  </menu_item_call>
+  <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
              name="Paste" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="paste" />
         </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index c85dd47..53e9e2d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -908,6 +908,15 @@
                   userdata="notifications" />
       </menu_item_call>
       <menu_item_separator />
+      <menu_item_call name="Message Log" label="Message Log">
+        <on_click function="Advanced.MessageLog"
+                  userdata="MessageLog" />
+      </menu_item_call>
+      <menu_item_call name="Message Builder" label="Message Builder">
+        <on_click function="Advanced.MessageBuilder"
+                  userdata="MessageBuilder" />
+      </menu_item_call>
+      <menu_item_separator />
       <menu_item_call name="Region Info to Debug Console"
                       label="Region Info to Debug Console">
         <on_click function="Advanced.DumpInfoToConsole"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 0ac7401..3680ca9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3653,6 +3653,16 @@ Default: off
 
 <notification
  icon="alertmodal.tga"
+ label="Minimum Age"
+ name="HelpRegionMinimumAge"
+ type="alertmodal">
+This sets the minimum age (in days) that users entering this sim have to be to enter.
+
+Default: 0 (disabled)
+</notification>
+
+<notification
+ icon="alertmodal.tga"
  label="Block Fly"
  name="HelpRegionBlockFly"
  type="alertmodal">
@@ -3663,6 +3673,90 @@ Default: off
 
 <notification
  icon="alertmodal.tga"
+ label="Force Draw Distance"
+ name="HelpForceDrawDistance"
+ type="alertmodal">
+If this box is checked, draw distance will be locked for all people in the sim. Note: This will lag people on older machines. PLEASE think before setting this setting.
+
+Default: off
+</notification>
+
+<notification
+ icon="alertmodal.tga"
+ label="Max Inventory Items To Transfer"
+ name="HelpMaxInventoryItemsTransfer"
+ type="alertmodal">
+This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default Second Life setting is 42.
+
+Default: -1
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Max Groups"
+ name="HelpMaxGroups"
+ type="alertmodal">
+This box controls how many groups an agent can join. -1 sets no limit on the amount of groups.
+
+Default: -1
+</notification>
+  <notification
+   icon="alertmodal.tga"
+   label="Render Water"
+   name="HelpRenderWater"
+   type="alertmodal">
+    If this box is checked, water will not be shown for users in this sim.
+
+    Default: -1
+  </notification>
+<notification
+ icon="alertmodal.tga"
+ label="Allow Minimap"
+ name="HelpAllowMinimap"
+ type="alertmodal">
+If this box is checked, the minimap will be disabled for users in this sim.
+
+Default: on
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Allow Minimap"
+ name="HelpAllowPhysicalPrims"
+ type="alertmodal">
+If this box is checked, physical prims will be allowed to be created in this sim.
+
+Default: on
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Enable Teen Mode"
+ name="HelpEnableTeenMode"
+ type="alertmodal">
+If this box is checked, all avatars will be forced to wear underwear and will not be able to take it off.
+
+Default: off
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Show Tags"
+ name="HelpShowTags"
+ type="alertmodal">
+This box controls how avatar name tags are shown in this sim. 2 sets tags to always be shown. 1 sets tags to disappear after some time. 0 blocks the viewing of name tags.
+
+Default: 2
+</notification>
+<notification
+ icon="alertmodal.tga"
+ label="Allow Parcel WindLight"
+ name="HelpAllowParcelWindLight"
+ type="alertmodal">
+If this box is checked, setting WindLight settings in parcels will be enabled.
+
+Default: on
+</notification>
+
+
+<notification
+ icon="alertmodal.tga"
  label="Bulk Change Content Permissions"
  name="HelpBulkPermission"
  type="alertmodal">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 2360e6b..0df65e7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -138,11 +138,11 @@
                              bottom_delta="-6" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
                              mouse_opaque="true" name="About:" v_pad="0" width="170">
-        About (500 chars):
+        About (8196 chars):
       </text>
       <text_editor bottom_delta="-137" embedded_items="false"
                              enabled="true" follows="left|top" font="SansSerifSmall" height="137"
-                             is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true"
+                             is_unicode="false" left_delta="0" max_length="8196" mouse_opaque="true"
                              name="about" width="235" word_wrap="true" spell_check="true" />
 
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -350,11 +350,11 @@
                              bottom_delta="-8" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
                              mouse_opaque="true" name="Info:" v_pad="0" width="161">
-        Info (250 chars):
+        Info (8196 chars):
       </text>
       <text_editor bottom_delta="-179" embedded_items="false"
                              enabled="true" follows="left|top" font="SansSerifSmall" height="178"
-                             is_unicode="false" left="12" max_length="254" mouse_opaque="false"
+                             is_unicode="false" left="12" max_length="8196" mouse_opaque="false"
                              name="about" width="378" word_wrap="true" spell_check="true" />
     </panel>
     <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
@@ -372,7 +372,7 @@
       </text>
       <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
                              font="SansSerif" height="256" is_unicode="false" left="10"
-                             max_length="1023" mouse_opaque="true" name="notes edit" width="400"
+                             max_length="8196" mouse_opaque="true" name="notes edit" width="400"
                              word_wrap="false" spell_check="true" />
     </panel>
   </tab_container>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 95d0c33..fe60203 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -153,11 +153,15 @@
              mouse_opaque="false" name="text_box7" v_pad="0" width="128">
                 Chat Bubbles:
         </text>
-        <check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
+  <check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show chat bubbles" left="148" mouse_opaque="true"
              name="bubble_text_chat" radio_style="false" width="237" />
-        <slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
+  <check_box bottom="-386" control_name="UseLocalChatBubbles" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Show local chat and bubbles" left="288" mouse_opaque="true"
+             name="local_bubble_text_chat" radio_style="false" width="237" />
+  <slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
              decimal_digits="3" enabled="true" follows="left|top" height="12"
              increment="0.05" initial_val="1" label="Bubble opacity:" left="148" max_val="1"
              min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index f85e3c0..b47794b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -61,34 +61,34 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Hide my group title" left="151" name="show_my_title_checkbox"
              radio_style="false" width="256" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-230"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
              can_apply_immediately="false" color="1 1 1 1"
              enabled="true" follows="left|top" height="65" label="" left="153"
              mouse_opaque="true" name="effect_color_swatch"
              tool_tip="Click to open Color Picker" width="55" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-235" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
     UI Size:
   </text>
-  <slider bottom="-237" can_edit_text="true"
+  <slider bottom="-217" can_edit_text="true"
              decimal_digits="3" enabled="true" height="16" increment="0.001"
              initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
              name="ui_scale_slider" show_text="true" value="1" width="220" />
-  <button bottom="-241" enabled="true" follows="left|top"
+  <button bottom="-221" enabled="true" follows="left|top"
              font="SansSerif" halign="center" height="22" label="Reset"
              label_selected="Reset" left_delta="226" mouse_opaque="true"
              name="reset_ui_size" scale_image="true" width="80" />
-  <check_box bottom="-256" enabled="true" follows="left|top"
+  <check_box bottom="-236" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Use resolution independent scale" left="151" mouse_opaque="true"
              name="ui_auto_scale" radio_style="false" width="256" />
-  <check_box bottom="-280" enabled="true" follows="left|top"
+  <check_box bottom="-260" enabled="true" follows="left|top"
                    font="SansSerifSmall" height="16" initial_value="false"
                    label="Go Away/AFK when idle" left="330" mouse_opaque="true"
                    name="afk_timeout_checkbox" radio_style="false" width="256" />
-  <spinner bottom="-280" decimal_digits="0" enabled="true"
+  <spinner bottom="-260" decimal_digits="0" enabled="true"
              follows="left|top" height="16" increment="1" initial_val="300"
              label="Away Timeout:" label_width="141" left="10" max_val="600"
              min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
@@ -109,18 +109,18 @@
        mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
        width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
                  Rating:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
              mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
                  I want to access content rated:
         </text>
-        <combo_box bottom="-338" follows="left|top" height="18" left="320"
+        <combo_box bottom="-318" follows="left|top" height="18" left="315"
              mouse_opaque="true" name="maturity_desired_combobox" width="150">
                 <combo_item name="Desired_Adult" value="42">
                         PG, Mature and Adult
@@ -133,8 +133,8 @@
                 </combo_item>
         </combo_box>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="320"
+             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
              mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
                  PG only
         </text>
@@ -151,25 +151,25 @@
                 Nametags:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-175" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-155" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
                 Selection Beam Color:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-274" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-254" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
              mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
                 seconds
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-372" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
              mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
                 Clock:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-404" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
              mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
                 Language:
@@ -181,10 +181,20 @@
              v_pad="0" width="400">
                 (requires restart for full effect)
         </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
+             mouse_opaque="true" name="remember_password_text" v_pad="0" width="394">
+    Remember Password:
+  </text>
+  <check_box bottom_delta="0" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Remember Password" left="151" mouse_opaque="true"
+             name="remember_password" radio_style="false" width="256" />
         <string name="region_name_prompt">
                 &lt;Type region name&gt;
         </string>
-        <combo_box allow_text_entry="false" bottom="-372" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
              height="18" left="153" max_chars="20" mouse_opaque="true"
              name="time_combobox" width="146">
                 <combo_item type="string" name="12HourTime" value="PST 12">
@@ -197,7 +207,7 @@
                         UTC
                 </combo_item>
         </combo_box>
-        <combo_box allow_text_entry="true" bottom="-402" enabled="true"
+        <combo_box allow_text_entry="true" bottom="-382" enabled="true"
              follows="left|top" height="16" left="153" max_chars="135"
              mouse_opaque="true" name="language_combobox" width="146">
                 <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 0611ce3..58a2989 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -5,8 +5,8 @@
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
-             mouse_opaque="true" name="muting_text" v_pad="0" width="400">
-    Select a skin (requires restart).
+             mouse_opaque="true" name="muting_text" v_pad="0" width="500">
+    Select a skin (requires restart). (Please see the skin folders for information and credits)
   </text>
   <radio_group bottom="0" draw_border="false" follows="top|left" height="380" left="12"
              name="skin_selection" width="480">
@@ -40,12 +40,24 @@
           scale_image="true" label="" image_selected="skin_thumbnail_gemini.png" 
           image_hover_selected="skin_thumbnail_gemini.png" image_unselected="skin_thumbnail_gemini.png" 
           image_hover_unselected="skin_thumbnail_gemini.png" follows="left|top" />
-
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="10" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="90"
-             mouse_opaque="true" name="muting_text" v_pad="0" width="400">
-    (Please see the skin folders for information and credits)
+  <text name="skin_current_text"
+              left="10" bottom="5" halign="left" height="12"
+        follows="left|bottom" h_pad="0" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+    Other Skin Name:
   </text>
+  <line_editor name="skin_current_edit"
+               bottom_delta="0" left_delta="120" height="20" width="120"
+               follows="left|bottom" font="SansSerif"
+               bevel_style="in" border_style="line" border_thickness="1"
+               max_length="31" mouse_opaque="true"
+               handle_edit_keys_directly="true"
+               select_all_on_focus_received="true" />
+  <button name="save_skin" label="Save"
+          bottom_delta="-2" left_delta="120" height="24" width="90"
+          follows="left|center" font="SansSerif" halign="center"
+                mouse_opaque="true" scale_image="TRUE" />
 </panel>
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
index 603f2d8..ce2d5ad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
@@ -41,15 +41,15 @@
   </text>
 
   <slider name="near_me_range" label="" control_name="NearMeRange"
-          bottom_delta="0" left_delta="62" width="110" height="15"
-          follows="left|top" min_val="5" max_val="512" increment="1"
+          bottom_delta="0" left_delta="62" width="150" height="15"
+          follows="left|top" min_val="5" max_val="2048" increment="1"
           initial_val="96" decimal_digits="0" />
 
   <text name="meters"
-        bottom_delta="0" left="180" height="15" width="40"
+        bottom_delta="0" left_delta="10" height="15" width="40"
         h_pad="0" halign="left" v_pad="0" follows="left|top"
         bg_visible="false" border_drop_shadow_visible="false"
-        border_visible="false" drop_shadow_visible="true" 
+        border_visible="false" drop_shadow_visible="true"
         font="SansSerifSmall" mouse_opaque="true">
     m
   </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
index 84ce9d0..5dd738a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_estate.xml
@@ -25,7 +25,7 @@ regions in the estate.
                 (unknown)
         </text>
         <view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
-             follows="top|left" height="290" left="6" width="250" />
+             follows="top|left" height="350" left="6" width="250" />
         <check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time"
              left="12" name="use_global_time_check" width="200" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
@@ -69,13 +69,12 @@ regions in the estate.
              left="12" name="allow_direct_teleport" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              name="allow_direct_teleport_help" right="250" width="18" />
-        <text bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="20"
-             left="10" name="abuse_email_text" width="180">
-                Abuse email address:
-        </text>
-        <line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254"
+  <text bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="20"
+      left="10" name="abuse_email_text" width="180">
+    Abuse email address:
+  </text>
+  <line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254"
              name="abuse_email_address" width="205" />
-        <string name="email_unsupported">Feature unsupported</string>
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              name="abuse_email_address_help" right="250" width="18" />
         <button bottom_delta="-26" enabled="false" follows="left|top" height="20" label="Apply"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
index 6302428..70df1df 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_general.xml
@@ -58,16 +58,21 @@
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="205" name="parcel_search_help" width="18" />
         <spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
-             label="Agent Limit" label_width="97" left="10" max_val="100" min_val="1"
+             label="Agent Limit" label_width="100" left="10" max_val="100" min_val="1"
              name="agent_limit_spin" width="170" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="205" name="agent_limit_help" width="18" />
         <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5"
-             label="Object Bonus" label_width="97" left="10" max_val="10" min_val="1"
+             label="Object Bonus" label_width="100" left="10" max_val="10" min_val="1"
              name="object_bonus_spin" width="170" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
              left="205" name="object_bonus_help" width="18" />
-        <text bottom_delta="-30" follows="left|top" height="20" label="Maturity" left="10"
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5"
+             label="Minimum Agent Age" label_width="100" left="10" max_val="1000" min_val="0"
+             name="minimum_agent_age" width="170" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="205" name="minimum_agent_age_help" width="18" />
+  <text bottom_delta="-30" follows="left|top" height="20" label="Maturity" left="10"
              name="access_text" width="100">
                 Rating:
         </text>
@@ -87,7 +92,7 @@
              left="205" name="access_help" width="18" />
         <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
              left="108" name="apply_btn" width="100" />
-        <button bottom_delta="-60" follows="left|top" height="20"
+        <button bottom_delta="-40" follows="left|top" height="20"
              label="Teleport Home One User..." left="10" name="kick_btn" width="250" />
         <button bottom_delta="-23" follows="left|top" height="20"
              label="Teleport Home All Users..." left="10" name="kick_all_btn" width="250" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_open_region_settings.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_open_region_settings.xml
new file mode 100644
index 0000000..3eb7806
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_open_region_settings.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="100" follows="top|left" height="320" label="Region Settings"
+     left="0" name="RegionSettings" width="480">
+        <spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
+             label="Default Draw Distance" label_width="175" left="10" max_val="10000" min_val="1"
+             name="draw_distance" width="250" />
+  <check_box bottom_delta="-20" follows="left|top" height="20" label="Force Draw Distance"
+             left="10" name="force_draw_distance" width="80" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="force_draw_distance_help" width="18" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Drag Distance" label_width="175" left="10" max_val="1000 0" min_val="0"
+             name="max_drag_distance" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Prim Scale" label_width="175" left="10" max_val="10000" min_val="0"
+             name="max_prim_scale" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Min Prim Scale" label_width="175" left="10" max_val="10000" min_val="0"
+             name="min_prim_scale" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Physical Prim Scale" label_width="175" left="10" max_val="10000" min_val="0"
+             name="max_phys_prim_scale" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Hollow Size" label_width="175" left="10" max_val="100" min_val="0"
+             name="max_hollow_size" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Min Hole Size" label_width="175" left="10" max_val="100" min_val="0"
+             name="min_hole_size" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Link Count" label_width="175" left="10" max_val="100000" min_val="0"
+             name="max_link_count" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Link Count Phys" label_width="175" left="10" max_val="100000" min_val="0"
+             name="max_link_count_phys" width="250" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Max Inventory Items To Transfer" label_width="175" left="10" max_val="10000" min_val="-1"
+             name="max_inventory_items_transfer" width="250" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="max_inventory_items_transfer_help" width="18" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+             label="Show Tags" label_width="175" left="10" max_val="2" min_val="0"
+             name="show_tags" width="250" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="show_tags_help" width="18" />
+  <spinner bottom_delta="-20" follows="left|top" height="20" increment="1"
+     label="Max Groups" label_width="175" left="10" max_val="1000" min_val="-1"
+     name="max_groups" width="250" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="max_groups_help" width="18" />
+  <check_box bottom_delta="-20" follows="left|top" height="20" label="Render Water" left="10"
+             name="render_water" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="render_water_help" width="18" />
+        <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Minimap"
+             left="10" name="allow_minimap" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="allow_minimap_help" width="18" />
+        <check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Physical Prims"
+             left="10" name="allow_physical_prims" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="allow_physical_prims_help" width="18" />
+        <check_box bottom_delta="-20" follows="left|top" height="20" label="Enable Teen Mode"
+             left="10" name="enable_teen_mode" width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="enable_teen_mode_help" width="18" />
+  <check_box bottom_delta="-20" follows="left|top" height="20" label="Enforce Max Build Constraints"
+             left="10" name="enforce_max_build" width="80" />
+        <check_box bottom_delta="-20" follows="left|top" height="20"
+             label="Allow Parcel WindLight" left="10"
+             name="allow_parcel_windlight"
+             width="80" />
+        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+             left="285" name="allow_parcel_windlight_help" width="18" />
+  <button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
+             left="108" name="apply_ors_btn" width="100" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index ceb6994..d3c9df1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -23,6 +23,12 @@
   <string name="copy_obj_key_info">
     Copied key(s) for:
   </string>
+  <string name="TeleportOfferMaturity">
+    [NAME] is offering a TP to [DESTINATION]
+  </string>
+  <string name="TeleportLureMaturity">
+    [NAME]'s teleport lure is to [DESTINATION]
+  </string>
 
   <!-- Login -->
   <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/ja/menu_mini_map.xml
index c8828a5..bdd63e8 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_mini_map.xml
@@ -3,6 +3,9 @@
         <menu_item_call label="ズーム（近）" name="Zoom Close"/>
         <menu_item_call label="ズーム（中）" name="Zoom Medium"/>
         <menu_item_call label="ズーム（遠）" name="Zoom Far"/>
+        <menu_item_check label="カメラを中央に" name="Center on Camera"/>
+        <menu_item_check label="ミニマップを回転" name="Rotate Mini-Map"/>
+        <menu_itemcall label="世界地図を表示" name="Show Map"/>
         <menu_item_call label="追跡をやめる" name="Stop Tracking"/>
         <menu_item_call label="プロフィール..." name="Profile"/>
 </menu>
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
index c69c2e3..bc263bb 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -1,26 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
+
+
+        <!-- ファイル -->
+        
         <menu label="ファイル" name="File">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-                <menu label="アップロード" name="upload">
-                        <menu_item_call label="画像 （L$[COST]）..." name="Upload Image"/>
-                        <menu_item_call label="サウンド （L$[COST]）..." name="Upload Sound"/>
-                        <menu_item_call label="アニメーション （L$[COST]）..." name="Upload Animation"/>
-                        <menu_item_call label="一括 （ファイルにつきL$[COST]）..." name="Bulk Upload"/>
+                <menu label="アップロード" name="Upload">
+                        <menu_item_call label="画像 （[UPLOADFEE]）..." name="Upload Image"/>
+                        <menu_item_call label="サウンド （[UPLOADFEE]）..." name="Upload Sound"/>
+                        <menu_item_call label="アニメーション （[UPLOADFEE]）..." name="Upload Animation"/>
+                        <menu_item_call label="一括 （ファイルにつき[UPLOADFEE]）..." name="Bulk Upload"/>
                         <menu_item_separator label="-----------" name="separator"/>
                         <menu_item_call label="デフォルト権限の設定..." name="perm prefs"/>
                 </menu>
                 <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="オブジェクトのインポート..." name="Import"/>
+                <menu_item_call label="インポートとアップロード... (テクスチャにつき[UPLOADFEE])" name="ImportUpload"/>
+                <menu_item_call label="選択したオブジェクトのエクスポート..." name="Export"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="全てののウィンドウを最小化" name="Minimize All Windows"/>
                 <menu_item_call label="ウィンドウを閉じる" name="Close Window"/>
                 <menu_item_call label="全てのウィンドウを閉じる" name="Close All Windows"/>
-                <menu_item_separator label="-----------" name="separator2"/>
-                <menu_item_call label="テクスチャーを別名で保存..." name="Save Texture As..."/>
                 <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="テクスチャーを別名で保存..." name="Save Texture As..."/>
+                <menu_item_separator label="-----------" name="separator4"/>
                 <menu_item_call label="スナップショットを撮る" name="Take Snapshot"/>
                 <menu_item_call label="スナップショットをディスクに保存" name="Snapshot to Disk"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator5"/>
                 <menu_item_call label="終了" name="Quit"/>
         </menu>
+
+        
+        <!--  編集 -->
+        
         <menu label="編集" name="Edit">
                 <menu_item_call label="元に戻す" name="Undo"/>
                 <menu_item_call label="やり直し" name="Redo"/>
@@ -51,16 +64,21 @@
                         <menu_item_call label="スカート" name="Skirt"/>
                         <menu_item_call label="すべての服" name="All Clothes"/>
                 </menu>
+                <menu_item_call label="容姿の再描画" name="Refresh Appearance"/>
                 <menu_item_separator label="-----------" name="separator6"/>
-                <menu_item_call label="ジェスチャー…" name="Gestures..."/>
+                <menu_item_call label="ジェスチャー" name="Gestures"/>
                 <menu_item_call label="プロフィール..." name="Profile..."/>
                 <menu_item_call label="容姿..." name="Appearance..."/>
                 <menu_item_separator label="-----------" name="separator7"/>
-                <menu_item_check label="フレンド..." name="Friends..."/>
-                <menu_item_call label="グループ..." name="Groups..."/>
+                <menu_item_check label="フレンド" name="Friends"/>
+                <menu_item_call label="グループ" name="Groups"/>
                 <menu_item_separator label="-----------" name="separator8"/>
                 <menu_item_call label="環境設定..." name="Preferences..."/>
         </menu>
+
+
+        <!-- 表示 -->
+        
         <menu label="表示" name="View">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
                 <menu_item_call label="一人称視点（マウスルック）" name="Mouselook"/>
@@ -69,23 +87,27 @@
                 <menu_item_call label="表示をリセット" name="Reset View"/>
                 <menu_item_call label="最後のチャットを閲覧" name="Look at Last Chatter"/>
                 <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="ウェブ・ブラウザ" name="Web Browser"/>
+                <menu_item_separator label="-----------" name="separator2"/>
                 <menu_item_check label="ツールバー" name="Toolbar"/>
                 <menu_item_check label="ローカル・チャット" name="Chat History"/>
                 <menu_item_check label="コミュニケーション" name="Instant Message"/>
                 <menu_item_check label="持ち物" name="Inventory"/>
                 <menu_item_check label="ボイスチャット・ユーザー一覧" name="Active Speakers"/>
                 <menu_item_check label="無視リスト" name="Mute List"/>
-                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_separator label="-----------" name="separator3"/>
                 <menu_item_check label="カメラ・コントロール" name="Camera Controls"/>
                 <menu_item_check label="移動コントロール" name="Movement Controls"/>
                 <menu_item_check label="世界地図" name="World Map"/>
                 <menu_item_check label="ミニマップ" name="Mini-Map"/>
-                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="AO" name="AO"/>
+                <menu_item_separator label="-----------" name="separator5"/>
                 <menu_item_check label="地域の統計情報" name="Statistics Bar"/>
                 <menu_item_check label="土地の境界線" name="Property Lines"/>
                 <menu_item_check label="立入禁止ライン" name="Banlines"/>
                 <menu_item_check label="土地オーナー" name="Land Owners"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator6"/>
                 <menu label="ヒントのポップアップ" name="Hover Tips">
                         <menu_item_check label="ヒントを表示" name="Show Tips"/>
                         <menu_item_separator label="-----------" name="separator"/>
@@ -96,14 +118,21 @@
                 <menu_item_check label="ビーコン(標識)" name="beacons"/>
                 <menu_item_check label="パーティクルを非表示" name="Hide Particles"/>
                 <menu_item_check label="HUD装着物を表示" name="Show HUD Attachments"/>
-                <menu_item_separator label="-----------" name="separator5"/>
-                <menu_item_call label="カメラ・ズームイン" name="Zoom In"/>
-                <menu_item_call label="カメラ・デフォルト" name="Zoom Default"/>
-                <menu_item_call label="カメラ・ズームアウト" name="Zoom Out"/>
-                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_separator label="-----------" name="separator7"/>
+                <menu label="ズーム" name="Zoom Level">
+                        <menu_item_call label="カメラ・ズームイン" name="Zoom In"/>
+                        <menu_item_call label="カメラ・デフォルト" name="Zoom Default"/>
+                        <menu_item_call label="カメラ・ズームアウト" name="Zoom Out"/>
+                </menu>
                 <menu_item_call label="[全画面表示]" name="Toggle Fullscreen"/>
                 <menu_item_call label="UIサイズを標準設定に戻す" name="Set UI Size to Default"/>
+                <menu_item_separator label="-----------" name="separator8"/>
+                <menu_item_check label="アドバンスメニューを表示" name="Toggle Advanced Menu"/>
         </menu>
+
+
+        <!-- 世界 -->
+        
         <menu label="世界" name="World">
                 <menu_item_call label="チャット" name="Chat"/>
                 <menu_item_check label="常に走る" name="Always Run"/>
@@ -116,9 +145,11 @@
                 <menu_item_separator label="-----------" name="separator3"/>
                 <menu_item_call label="離席中に設定" name="Set Away"/>
                 <menu_item_call label="取り込み中に設定" name="Set Busy"/>
+                <menu_item_call label="IMに自動応答する" name="Auto-Respond to IMs"/>
+                <menu_item_separator label="-----------" name="separator4"/>
                 <menu_item_call label="自分のアバターのアニメーションを停止" name="Stop Animating My Avatar"/>
                 <menu_item_call label="キー制御を解除" name="Release Keys"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator5"/>
                 <menu_item_call label="アカウントの履歴..." name="Account History...">
                         <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=ja"/>
                 </menu_item_call>
@@ -126,12 +157,12 @@
                         <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja"/>
                 </menu_item_call>
                 <menu_item_call label="L$（リンデン・ドル）を購入" name="Buy and Sell L$..."/>
-                <menu_item_separator label="-----------" name="separator5"/>
-                <menu_item_call label="自分の土地..." name="My Land..."/>
-                <menu_item_call label="土地情報..." name="About Land..."/>
-                <menu_item_call label="土地を購入..." name="Buy Land..."/>
-                <menu_item_call label="地域／不動産..." name="Region/Estate..."/>
                 <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="自分の土地" name="My Land"/>
+                <menu_item_call label="土地情報" name="About Land"/>
+                <menu_item_call label="土地を購入..." name="Buy Land..."/>
+                <menu_item_call label="地域／不動産" name="Region/Estate"/>
+                <menu_item_separator label="-----------" name="separator7"/>
                 <menu label="環境の設定" name="Environment Settings">
                         <menu_item_call label="日の出" name="Sunrise"/>
                         <menu_item_call label="正午" name="Noon"/>
@@ -142,6 +173,10 @@
                         <menu_item_call label="環境編集" name="Environment Editor"/>
                 </menu>
         </menu>
+
+
+        <!-- ツール -->
+        
         <menu label="ツール" name="Tools">
                 <menu label="ツールを選ぶ" name="Select Tool">
                         <menu_item_call label="フォーカス" name="Focus"/>
@@ -151,28 +186,43 @@
                         <menu_item_call label="土地" name="Land"/>
                 </menu>
                 <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_check label="自分のオブジェクトのみ選択" name="Select Only My Objects"/>
-                <menu_item_check label="移動可能なオブジェクトのみ選択" name="Select Only Movable Objects"/>
-                <menu_item_check label="環境で選択" name="Select By Surrounding"/>
-                <menu_item_check label="隠れた位置の選択も表示" name="Show Hidden Selection"/>
-                <menu_item_check label="選択したものの光源範囲を表示" name="Show Light Radius for Selection"/>
-                <menu_item_check label="選択ビームを表示" name="Show Selection Beam"/>
+                <menu_item_call label="選択対象に視点移動" name="Focus on Selection"/>
+                <menu_item_call label="選択範囲にズームイン" name="Zoom to Selection"/>
+                <menu label="選択オプション" name="Selection Options">
+                        <menu_item_check label="自分のオブジェクトのみ選択" name="Select Only My Objects"/>
+                        <menu_item_check label="移動可能なオブジェクトのみ選択" name="Select Only Movable Objects"/>
+                        <menu_item_check label="コピー可能なオブジェクトのみ選択" name="Select Only Copyable Objects"/>
+                        <menu_item_check label="環境で選択" name="Select By Surrounding"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="隠れた位置の選択も表示" name="Show Hidden Selection"/>
+                        <menu_item_check label="選択したものの光源範囲を表示" name="Show Light Radius for Selection"/>
+                        <menu_item_check label="選択したものの輪郭を表示" name="Show Selection Outlines"/>
+                        <menu_item_check label="選択ビームを表示" name="Show Selection Beam"/>
+                </menu>
                 <menu_item_separator label="-----------" name="separator2"/>
                 <menu_item_check label="グリッドにスナップ" name="Snap to Grid"/>
                 <menu_item_call label="オブジェクトのXY移動をグリッドに合わせる" name="Snap Object XY to Grid"/>
                 <menu_item_call label="グリッドをオブジェクトの位置基準で再設定" name="Use Selection for Grid"/>
                 <menu_item_call label="グリッドのオプション..." name="Grid Options..."/>
+                <menu_item_call label="高度な制作オプション" name="Advanced Build Options..."/>
                 <menu_item_separator label="-----------" name="separator3"/>
                 <menu_item_check label="リンクされた一部を編集" name="Edit Linked Parts"/>
+                <menu label="リンクした部分を選択する" name="Select Linked Parts">
+                        <menu_item_call label="次の部分を選択する" name="Select Next Part"/>
+                        <menu_item_call label="前回の部分を選択する" name="Select Previous Part"/>
+                        <menu_item_call label="次の部分を含める" name="Include Next Part"/>
+                        <menu_item_call label="前回の部分を含める" name="Include Previous Part"/>
+                </menu>
                 <menu_item_call label="リンク" name="Link"/>
                 <menu_item_call label="リンク解除" name="Unlink"/>
                 <menu_item_separator label="-----------" name="separator4"/>
-                <menu_item_call label="選択対象に視点移動" name="Focus on Selection"/>
-                <menu_item_call label="選択範囲にズームイン" name="Zoom to Selection"/>
+                <menu_item_call label="複製" name="Duplicate"/>
                 <menu_item_call label="オブジェクトを購入" name="Menu Object Take">
                         <on_enable userdata="購入,取る" name="EnableBuyOrTake"/>
                 </menu_item_call>
                 <menu_item_call label="コピーを取る" name="Take Copy"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_call label="オブジェクトを返却" name="Return..."/>
                 <menu_item_call label="オブジェクトをオブジェクト・コンテンツに戻して保存" name="Save Object Back to Object Contents"/>
                 <menu_item_separator label="-----------" name="separator6"/>
                 <menu_item_call label="スクリプト警告／エラー・ウィンドウを表示" name="Show Script Warning/Error Window"/>
@@ -183,37 +233,274 @@
                 <menu_item_call label="選択したオブジェクトの中のスクリプトをリセット" name="Reset Scripts in Selection"/>
                 <menu_item_call label="選択したオブジェクトの中のスクリプトを起動する" name="Set Scripts to Running in Selection"/>
                 <menu_item_call label="選択したオブジェクトの中のスクリプトを停止する" name="Set Scripts to Not Running in Selection"/>
+                <menu_item_separator label="-----------" name="separator7"/>
+                <menu_item_call label="一括権限設定" name="Set permissions on selected task inventory"/>
         </menu>
+
+
+        <!-- ヘルプ -->
+        
         <menu label="ヘルプ" name="Help">
-                <menu_item_call label="Second Life ヘルプ" name="Second Life Help"/>
+                <menu_item_call label="ヘルプ" name="Grid Help"/>
                 <menu_item_call label="チュートリアル" name="Tutorial"/>
                 <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_call label="Linden公式ブログ..." name="Official Linden Blog..."/>
+                <menu_item_call label="Imprudenceブログ" name="Imprudence Blog"/>
+                <menu_item_call label="Imprudenceフォーラム" name="Imprudence Forums"/>
                 <menu_item_separator label="-----------" name="separator2"/>
-                <menu_item_call label="スクリプト・ポータル..." name="Scripting Portal...">
+                <menu_item_call label="スクリプト・ポータル" name="Scripting Portal">
                         <on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/ja" />
                 </menu_item_call>
                 <menu_item_separator label="-----------" name="separator3"/>
                 <menu_item_call label="嫌がらせの報告..." name="Report Abuse..."/>
-                <menu_item_call label="衝突の記録..." name="Bumps, Pushes &amp;amp; Hits..."/>
+                <menu_item_call label="衝突の記録" name="Bumps, Pushes &amp;amp; Hits"/>
                 <menu_item_call label="ラグ メーター" name="Lag Meter"/>
-                <menu_item_separator label="-----------" name="separator7"/>
-                <menu label="バグの報告" name="Bug Reporting">
-                        <menu_item_call label="パブリック問題トラッカー..." name="Public Issue Tracker..."/>
-                        <menu_item_call label="パブリック問題トラッカー ヘルプ..." name="Publc Issue Tracker Help...">
-                                <on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/ja" />
-                        </menu_item_call>
-                        <menu_item_separator label="-----------" name="separator7"/>
-                        <menu_item_call label="バグの報告 101..." name="Bug Reporing 101...">
-                                <on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101"/>
-                        </menu_item_call>
-                        <menu_item_call label="セキュリティ問題..." name="Security Issues...">
-                                <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/ja"/>
-                        </menu_item_call>
-                        <menu_item_call label="品質保証関連Wiki..." name="QA Wiki..."/>
-                        <menu_item_separator label="-----------" name="separator9"/>
-                        <menu_item_call label="バグの報告..." name="Report Bug..."/>
-                </menu>
-                <menu_item_call label="Second Lifeについて" name="About Second Life..."/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="Imprudenceについて" name="About Imprudence"/>
+        </menu>
+
+
+        <!-- アドバンス-->
+        
+        <menu label="アドバンス" name="Advanced" drop_shadow="true">
+                <menu label="コンソール" name="Consoles">
+                        <menu_item_check label="フレームのコンソール" name="Frame Console"/>
+                        <menu_item_check label="テクスチャのコンソール" name="Texture Console"/>
+                        <menu_item_check label="デバッグコンソール" name="Debug Console"/>
+                        <menu_item_check label="ファーストタイマー" name="Fast Timers"/>
+                        <menu_item_separator label="-----------" name="separator"/>                                     <menu_item_call label="通知コンソール" name="Notifications Console"/>
+                        <menu_item_separator label="-----------" name="separator2"/>                            <menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console"/>
+                        <menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console"/>
+                        <menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/>
+                </menu>
+                <menu label="HUD情報" name="HUD Info">
+                        <menu_item_check label="速度" name="Velocity"/>
+                        <menu_item_check label="カメラ" name="Camera"/>
+                        <menu_item_check label="風" name="Wind"/>
+                        <menu_item_check label="FOV (視野角)" name="FOV"/>
+                </menu>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="ここにすわる" name="Ground Sit"/>
+                <menu_item_call label="地上にテレポート" name="Teleport to Ground"/>
+                <menu_item_check label="アバターをファントムにする" name="Phantom"/>
+                <menu_item_check label="アニメーション・リスト" name="Animation List"/>
+                <menu_item_check label="このエリアのオブジェクトを検索" name="Area Object Search"/>
+                <menu_item_check label="テクスチャ・ブラウザ" name="asset browser"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu label="レンダリング" name="Rendering">
+                        <menu label="種類" name="Types">
+                                <menu_item_check label="シンプル" name="Simple"/>
+                                <menu_item_check label="アルファ" name="Alpha"/>
+                                <menu_item_check label="木" name="Tree"/>
+                                <menu_item_check label="アバター" name="Character"/>
+                                <menu_item_check label="地表" name="SurfacePatch"/>
+                                <menu_item_check label="空" name="Sky"/>
+                                <menu_item_check label="水" name="Water"/>
+                                <menu_item_check label="地面" name="Ground"/>
+                                <menu_item_check label="ボリューム" name="Volume"/>
+                                <menu_item_check label="草" name="Grass"/>
+                                <menu_item_check label="雲" name="Clouds"/>
+                                <menu_item_check label="パーティクル" name="Particles"/>
+                                <menu_item_check label="衝突" name="Bump"/>
+                        </menu>
+                        <menu label="機能" name="Features">
+                                <menu_item_check label="UI" name="UI"/>
+                                <menu_item_check label="選択済" name="Selected"/>
+                                <menu_item_check label="ハイライト" name="Highlighted"/>
+                                <menu_item_check label="ダイナミックテクスチャ" name="Dynamic Textures"/>
+                                <menu_item_check label="足の影" name="Foot Shadows"/>
+                                <menu_item_check label="くもり" name="Fog"/>
+                                <menu_item_check label="FRInfo のテスト" name="Test FRInfo"/>
+                                <menu_item_check label="フレキシブルオブジェクト" name="Flexible Objects"/>
+                        </menu>
+                        <menu label="情報を表示" name="Info Displays">
+                                <menu_item_check label="検証" name="Verify"/>
+                                <menu_item_check label="バウンディングボックス" name="BBoxes"/>
+                                <menu_item_check label="先端" name="Points"/>
+                                <menu_item_check label="オクトリー" name="Octree"/>
+                                <menu_item_check label="オクルージョン" name="Occlusion"/>
+                                <menu_item_check label="バッチの描画" name="Render Batches"/>
+                                <menu_item_check label="アニメーション・テクスチャ" name="Animated Textures"/>
+                                <menu_item_check label="テクスチャ優先度" name="Texture Priority"/>
+                                <menu_item_check label="アバターのレンダリングコストを表示する" name="Avatar Rendering Cost"/>
+                                <menu_item_check label="テクスチャの範囲" name="Texture Area (sqrt(A))"/>
+                                <menu_item_check label="側面" name="Face Area (sqrt(A))"/>
+                                <menu_item_check label="光" name="Lights"/>
+                                <menu_item_check label="パーティクル" name="Particles"/>
+                        </menu>
+                        <menu label="レンダーテスト" name="Render Tests">
+                                <menu_item_check label="カメラオフセット" name="Camera Offset"/>
+                                <menu_item_check label="フレームレートをランダム化" name="Randomize Framerate"/>
+                                <menu_item_check label="定期的に遅いフレームを挿入する" name="Periodic Slow Frame"/>
+                                <menu_item_check label="フレームテスト" name="Frame Test"/>
+                        </menu>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="軸" name="Axes"/>
+                        <menu_item_separator label="-----------" name="separator2"/>
+                        <menu_item_check label="選択したものを非表示にする" name="Hide Selected"/>
+                        <menu_item_separator label="-----------" name="separator3"/>
+                        <menu_item_check label="接線基底" name="Tangent Basis"/>
+                        <menu_item_call label="選択したテクスチャ情報" name="Selected Texture Info"/>
+                        <menu_item_check label="ワイヤーフレーム" name="Wireframe"/>
+                        <menu_item_check label="オブジェクト間オクルージョン" name="Object-Object Occlusion"/>
+                        <menu_item_check label="GL デバッグ" name="Debug GL"/>
+                        <menu_item_check label="経路をデバッグ" name="Debug Pipeline"/>
+                        <menu_item_check label="ファーストアルファ" name="Fast Alpha"/>
+                        <menu_item_check label="木のアニメーション" name="Animate Trees"/>
+                        <menu_item_check label="テクスチャのアニメーション" name="Animate Textures"/>
+                        <menu_item_check label="テクスチャを無効にする" name="Disable Textures"/>
+                        <menu_item_check label="マルチスレッド処理" name="Run Multiple Threads"/>
+                        <menu_item_check label="チージービーコン" name="Cheesy Beacon"/>
+                        <menu_item_check label="装着された光源を描画する" name="Attached Lights"/>
+                        <menu_item_check label="装着されたパーティクルを描画する" name="Attached Particles"/>
+                </menu>
+                <menu label="世界" name="World">
+                        <menu_item_check label="シムの太陽の設定を無視する" name="Sim Sun Override"/>
+                        <menu_item_call label="スクリプト付きカメラをダンプ" name="Dump Scripted Camera"/>
+                        <menu_item_check label="固定された天気" name="Fixed Weather"/>
+                        <menu_item_call label="リージョンオブジェクトのキャッシュをダンプする" name="Dump Region Object Cache"/>
+                </menu>
+                <menu label="RLVa" name="RLVa">
+                        <menu label="デバッグ" name="Debug">
+                                <menu_item_check label="デバッグ・メッセージを表示" name="Show Debug Messages"/>
+                                <menu_item_separator label="-----------" name="separator"/>
+                                <menu_item_check label="古い名称を有効にする" name="Enable Legacy Naming"/>
+                        </menu>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="装着を有効にする" name="Enable Wear"/>
+                        <menu_item_separator label="-----------" name="separator2"/>
+                        <menu_item_check label="ロックされたレイヤーを非表示" name="Hide locked layers"/>
+                        <menu_item_check label="ロックされたアタッチメントを非表示" name="Hide locked attachments"/>
+                        <menu_item_separator label="-----------" name="separator3"/>
+                        <menu_item_check label="#RLVフォルダの共有を禁止" name="Forbid Give to #RLV"/>
+                        <menu_item_check label="タグを表示" name="Show Name Tags"/>
+                        <menu_item_separator label="-----------" name="separator4"/>
+                        <menu_item_call label="制限..." name="Restrictions..."/>
+                </menu>
+                <menu label="UI" name="UI">
+                        <menu_item_check label="デフォルトのカラー・ピッカーを使用する" name="Use default system color picker"/>
+                        <menu_item_check label="メニュー・バーに検索ボックスを表示" name="Show search panel in overlay bar"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_call label="Web ブラウザのテスト" name="Web Browser Test"/>
+                        <menu_item_call label="UIを編集可能にする" name="Editable UI"/>
+                        <menu_item_call label="SelectMgrをダンプ" name="Dump SelectMgr"/>
+                        <menu_item_call label="持ち物の出力" name="Dump Inventory"/>
+                        <menu_item_call label="フォーカスホールダーをダンプ" name="Dump Focus Holder"/>
+                        <menu_item_call label="選択したオブジェクト情報をプリント" name="Print Selected Object Info"/>
+                        <menu_item_call label="エージェント情報をプリント" name="Print Agent Info"/>
+                        <menu_item_call label="メモリ使用状況" name="Memory Stats"/>
+                        <menu_item_call label="グループ情報のキャッシュをクリア" name="Clear Cached Group Info"/>
+                        <menu_item_separator label="-----------" name="separator2"/>
+                        <menu_item_check label="SelectMgr のデバッグ" name="Debug SelectMgr"/>
+                        <menu_item_check label="ダブルクリック" name="Debug Clicks"/>
+                        <menu_item_check label="表示のデバッグ" name="Debug Views"/>
+                        <menu_item_check label="名称ツールチップのデバッグ" name="Show Name Tooltips"/>
+                        <menu_item_check label="マウス操作によるイベントのデバッグ" name="Debug Mouse Events"/>
+                        <menu_item_check label="キーのデバッグ" name="Debug Keys"/>
+                        <menu_item_check label="WindowProcのデバッグ" name="Debug WindowProc"/>
+                        <menu_item_check label="テキスト・エディタのヒントをデバッグ" name="Debug Text Editor Tips"/>
+                        <menu_item_separator label="-----------" name="separator3"/>
+                        <menu_item_check label="時間を表示する" name="Show Time"/>
+                        <menu_item_check label="描画情報を表示する" name="Show Render Info"/>
+                        <menu_item_check label="マトリックスを表示する" name="Show Matrices"/>
+                        <menu_item_check label="カーソルを乗せた場所の色を表示する" name="Show Color Under Cursor"/>
+                </menu>
+                <menu label="XUI" name="XUI">
+                        <menu_item_call label="ウィンドウのテスト" name="Floater Test"/>
+                        <menu_item_call label="フォントのテスト" name="Font Test"/>
+                        <menu_item_call label="メニューをXMLで書き出し..." name="Export Menus to XML..."/>
+                        <menu_item_call label="UIの編集..." name="Edit UI..."/>
+                        <menu_item_call label="XMLから読み込む" name="Load from XML..."/>
+                        <menu_item_call label="XMLで保存する" name="Save to XML..."/>
+                        <menu_item_check label="XUIネームを表示する" name="Show XUI Names"/>
+                        <menu_item_call label="テスト用 IM を送信する" name="Send Test IMs"/>
+                </menu>
+                <menu label="アバター" name="Character">
+                        <menu label="ベークドテクスチャを取得する" name="Grab Baked Texture">
+                                <menu_item_call label="瞳" name="Iris"/>
+                                <menu_item_call label="頭" name="Head"/>
+                                <menu_item_call label="上半身" name="Upper Body"/>
+                                <menu_item_call label="下半身" name="Lower Body"/>
+                                <menu_item_call label="スカート" name="Skirt"/>
+                        </menu>
+                        <menu label="キャラクターテスト" name="Character Tests">
+                                <menu_item_call label="容姿を XML に保存する" name="Appearance To XML"/>
+                                <menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry"/>
+                                <menu_item_call label="男性アバターのテスト" name="Test Male"/>
+                                <menu_item_call label="女性アバターのテスト" name="Test Female"/>
+                                <menu_item_call label="PGを有効にする" name="Toggle PG"/>
+                                <menu_item_check label="アバターの選択を許可" name="Allow Select Avatar"/>
+                        </menu>
+                        <menu_item_check label="ボイスに合わせて唇を動かす" name="Enable Lip Sync (Beta)"/>
+                        <menu_item_check label="矢印キーのTap-Tap-Holdで走る" name="Tap-Tap-Hold To Run"/>
+                        <menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
+                        <menu_item_call label="頂点シェーダの再読込" name="Reload Vertex Shader"/>
+                        <menu_item_check label="アニメーション情報" name="Animation Info"/>
+                        <menu_item_check label="スローモーションのアニメーション" name="Slow Motion Animations"/>
+                        <menu_item_check label="見ているものを表示する" name="Show Look At"/>
+                        <menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
+                        <menu_item_check label="見ているものを自分にだけ表示" name="Private Look At"/>
+                        <menu_item_check label="クリックした場所を自分にだけ表示" name="Private Point At"/>
+                        <menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
+                        <menu_item_check label="LOD を無効にする" name="Disable LOD"/>
+                        <menu_item_check label="キャラクターVis のデバッグ" name="Debug Character Vis"/>
+                        <menu_item_check label="骨組みの衝突判定を表示する" name="Show Collision Skeleton"/>
+                        <menu_item_check label="エージェントのターゲットを表示する" name="Display Agent Target"/>
+                        <menu_item_check label="回転をデバッグ" name="Debug Rotation"/>
+                        <menu_item_call label="アタッチメントをダンプ" name="Dump Attachments"/>
+                </menu>
+                <menu label="クラッシュ" name="Crash">
+                        <menu_item_call label="バッドメモリアクセスを実行する" name="Force Bad Memory Access"/>
+                        <menu_item_call label="LLErrorとクラッシュを実行する" name="Force LLError And Crash"/>
+                        <menu_item_call label="無限ループ" name="Force Infinite Loop"/>
+                        <menu_item_call label="ドライバのクラッシュを実行する" name="Force Driver Crash"/>
+                        <menu_item_call label="ビューワの接続遮断を実行する" name="Force Disconnect Viewer"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/>
+                </menu>
+                <menu label="ネットワーク" name="Network">
+                        <menu_item_call label="メッセージログを有効にする" name="Enable Message Log"/>
+                        <menu_item_call label="メッセージログを使用不可にする" name="Disable Message Log"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="速力が挿入されたオブジェクト" name="Velocity Interpolate Objects"/>
+                        <menu_item_check label="挿入されたオブジェクトの位置の Ping" name="Ping Interpolate Object Positions"/>
+                        <menu_item_separator label="-----------" name="separator2"/>
+                        <menu_item_call label="パケットドロップ" name="Drop a Packet"/>
+                </menu>
+                <menu label="レコーダー" name="Recorder">
+                        <menu_item_call label="全セッションのログを記録" name="Full Session Logging"/>
+                        <menu_item_call label="ログの記録開始" name="Start Logging"/>
+                        <menu_item_call label="ログの記録停止" name="Stop Logging"/>
+                        <menu_item_call label="10秒間ログを記録" name="Log 10 Seconds"/>
+                        <menu_item_call label="30秒間ログを記録" name="Log 30 Seconds"/>
+                        <menu_item_call label="60秒間ログを記録" name="Log 60 Seconds"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_call label="再生開始" name="Start Playback"/>
+                        <menu_item_call label="再生停止" name="Stop Playback"/>
+                        <menu_item_check label="再生をループ" name="Loop Playback"/>
+                        <menu_item_call label="記録開始" name="Start Record"/>
+                        <menu_item_call label="記録停止" name="Stop Record"/>
+                </menu>
+                <menu label="管理者オプション" name="Admin Options">
+                        <menu_item_check label="管理者メニューを表示する" name="View Admin Options"/>
+                        <menu_item_call label="管理者ステータスの呼び出し" name="Request Admin Status"/>
+                        <menu_item_call label="管理者ステータス解除" name="Leave Admin Status"/>
+                </menu>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_check label="オブジェクトのアップデートを表示する" name="Show Updates"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_check label="シャッター音とアニメーションなしでスナップショットをディスクに保存する" name="Quiet Snapshots to Disk"/>
+                <menu_item_call label="画像を圧縮" name="Compress Image..."/>
+                <menu_item_check label="ビルドの最大制限を解除" name="Disable Max Build Constraints"/>
+                <menu_item_check label="権限の詳細を表示する" name="Debug Permissions"/>
+                <menu_item_check label="マウスの動きをスムーズに" name="Mouse Smoothing"/>
+                <menu_item_check label="マウスルック時に十字カーソルを表示" name="Show Mouselook Crosshairs"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_check label="次回の起動時にコンソールウィンドウを表示する" name="Console Window"/>
+                <menu_item_check label="Restrained Loveの使用" name="Restrained Love Support"/>
+                <menu_item_check label="複数のImprudenceの同時起動を許可" name="Allow Multiple Instances"/>
+                <menu_item_call label="ログアウト" name="Logout"/>
+                <menu_item_call label="デバッグ設定を表示する" name="Debug Settings"/>
         </menu>
+
+        
 </menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/ja/notifications.xml b/linden/indra/newview/skins/default/xui/ja/notifications.xml
index 77c6068..6da6ccc 100644
--- a/linden/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/ja/notifications.xml
@@ -3271,6 +3271,30 @@ Macの場合は、Cmd-Opt-Shift-Dを押してください。
         <notification name="UnableToOpenCommandURL">
                 クリックしたURLはこのウェブブラウザでは開けません
         </notification>
+
+
+<!-- ここから Imprudence 固有の通知 -->
+
+
+        <notification name="ConfirmAutoPilot">
+                本当にここまで歩きますか？
+                <usetemplate ignoretext="オートパイロットする時" name="okcancelignore" notext="キャンセル" yestext="歩く"/>
+        </notification>
+        
+        <notification name="ConfirmDoubleClickTP">
+                本当にここにテレポートしますか？
+                <usetemplate ignoretext="ダブルクリックテレポート時" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
+        </notification>
+        
+        <notification name="ConfirmTeleportHome">
+                本当にホームにテレポートしますか？
+                <usetemplate ignoretext="ホームにテレポートする時" name="okcancelignore" notext="キャンセル" yestext="テレポート"/>
+        </notification>
+
+
+<!-- ここまで Imprudence 固有の通知 -->
+
+
         <global name="UnsupportedCPU">
                 - あなたの CPU の速度は必須動作環境の条件を満たしていません。
         </global>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
index a3745a2..147a5f6 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
@@ -60,6 +60,7 @@
                         <text name="Photo:">
                                 写真：
                         </text>
+                        <button label="UUIDコピー" name="btn_copy_uuid"/>
                         <texture_picker label="" name="img" tool_tip="写真をクリックして選択"/>
                         <text name="Groups:">
                                 グループ：
@@ -77,8 +78,11 @@
                         </text>
                         <view_border name="drop_target_rect" />
                         <view_border name="drop_target_rect_vis" />
-                        <text name="Give inventory" tool_tip="ここに物品目をドロップしてこの人に贈ります">
-                                持ち物アイテムをここにドロップします
+                        <text name="drop target" tool_tip="ここに持ち物アイテムをドロップしてこの人に贈ります">
+                                持ち物アイテムを
+                        </text>
+                        <text name="Give inventory 2" tool_tip="ここに持ち物アイテムをドロップしてこの人に贈ります">
+                                ここにドロップします
                         </text>
                         <check_box label="検索に表示" name="allow_publish" tool_tip="検索で、詳細やイメージなどさらなるプロフィール情報を公開する。"/>
                         <button label="?" label_selected="?" name="?"/>
@@ -87,6 +91,7 @@
                         <button label="フレンドに追加" label_selected="フレンドに追加" name="Add Friend..." />
                         <button label="支払う" label_selected="支払う" name="Pay..."/>
                         <button label="IMを送る" label_selected="IMを送る" name="Instant Message..." tool_tip="インスタント・メッセージ (IM)" />
+                        <button label="グループに招待..." label_selected="グループに招待" name="Invite to Group..." />
                         <button label="無視する" label_selected="無視する" name="Mute" />
                 </panel>
                 <panel label="ウェブ" name="WebProfile">
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
index adfdcd4..f326a13 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -13,6 +13,8 @@
         <button label="抜ける" name="Leave" />
         <button label="作成..." name="Create" />
         <button label="検索..." name="Search..." />
+        <button label="招待..." name="Invite..." />
+        <button label="タイトル..." name="Titles..." />
   <string name="none">
                 グループなし
   </string>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/ja/panel_mini_map.xml
index fdc4465..2f07116 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_mini_map.xml
@@ -24,4 +24,15 @@
         <text name="nw_label" width="40">
                 北西
         </text>
+  
+  <string name="tooltip_tp">
+    ダブルクリックでテレポートします
+  </string>
+  <string name="tooltip_pan">
+    Shift+ドラッグでパンします
+  </string>
+  <string name="tooltip_map">
+    ダブルクリックで地図を開きます
+  </string>
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index ef13a75..4b5a2bb 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -1,4 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="advanced_panel">
+<panel label="高度な設定" name="advanced_panel">
+        <check_box label="ログイン／ログアウト画面を非表示" name="disable_log_screen_check"/>
+        <check_box label="テレポート画面を非表示" name="disable_tp_screen_check"/>
+        <check_box label="名前タグに使用ビューワの名称を表示" name="client_name_tag_check"/>
+        <check_box label="ビューワを色で識別" name="client_name_color_check"/>
+        <check_box label="ビューワの名称にヒントを表示" name="client_name_hover_check"/>
+        <check_box label="自分のビューワ名称をタグに表示" name="client_name_tag_broadcast_check"/>
+        <check_box label="影を有効にする（警告：動作が不安定になり、高いグラフィック性能が必要です。）" name="shadows_check"/>
+        <text bottom_delta="-25" left="16" height="15" width="300"
+        follows="top|left">
+                LightShare機能の使用（OpenSimのみ）：
+        </text>
+        <combo_box name="lightshare_combo">
+                <combo_item name="never">
+                        使用しない
+                </combo_item>
+                <combo_item name="ask">
+                        毎回確認
+                </combo_item>
+                <combo_item name="always">
+                        常に使用
+                </combo_item>
+        </combo_box>
+        <check_box label="HTTPテクスチャを使用（試験中の機能）" name="http_texture_check"/>
+        <check_box label="遠距離の描画をスキップして早く読み込む" name="speed_rez_check"/>
+        <check_box label="容姿編集中のアニメーションを表示" name="appearance_anim_check"/>
+        <check_box label="伝統的なパイメニューを使用" name="legacy_pie_menu_checkbox"/>
         <check_box label="言語をオブジェクトと共有" name="language_is_public" tool_tip="優先言語をインワールドのオブジェクトが認識する"/>
+        <check_box label="チャットとIMで MU* ポーズ・スタイルを使用" name="allow_mupose"/>
+        <check_box label="OOCチャットの自動クローズ" name="auto_close_ooc"/>
+        <button label="全ての設定を初期値に戻す" name="reset_btn"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
index 9a8d175..c617ba1 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
@@ -20,6 +20,7 @@
         </text>
         <check_box label="音楽がある場合再生する（通信が重くなる）"
              name="streaming_music" />
+        <check_box label="音楽のタイトルをチャットに表示" name="show_stream_title"/>
         <check_box
              label="ストリーミング・メディア使用可時に再生（帯域幅の消費増）"
              name="streaming_video" />
@@ -35,11 +36,15 @@
         <text type="string" length="1" name="ui_volume_text">
                 UI音量：
         </text>
+        <text name="ambient_prefs_text">
+                環境音：
+        </text>
+        <check_box label="風の発生を有効にする" name="mute_wind_check"/>
         <slider label="ドップラー効果" name="Doppler Effect" />
         <slider label="遠隔要因" name="Distance Factor" />
         <slider label="ロールオフ係数" name="Rolloff Factor" />
         <spinner label="L$変更基準点" name="L$ Change Threshold" />
-        <spinner label="ヘルス変化基準点" name="Health Change Threshold" />
+        <spinner label="ヘルス変化基準点" name="Health change threshold" />
         <text type="string" length="1" name="doppler_effect_text">
                 オーディオ環境設定：
         </text>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_fonts.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_fonts.xml
new file mode 100644
index 0000000..3cf54b7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_fonts.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<panel label="フォント" name="font_panel">
+
+  <text>
+    ユーザー・インターフェースのフォントを変更できます。（再起動後に有効）
+  </text>
+
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 83b21b8..ee99373 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -32,8 +32,16 @@
                 UI サイズ：
         </text>
         <check_box label="解像度独立スケールを使用" name="ui_auto_scale"/>
+        <check_box label="操作していない時は退席／AFK" name="afk_timeout_checkbox"/>
         <spinner label="退席までの時間：" name="afk_timeout_spinner"/>
+        <!-- リンデン・ドル支払／受取の通知は「ポップアップ」タブへ移動
         <check_box label="リンデン・ドル（L$）の支払い/受け取りを通知" name="notify_money_change_checkbox"/>
+        -->
+        <text name="Mini-Map Notify:">
+                ミニマップ通知：
+        </text>
+        <check_box label="チャット範囲に入った時" name="mini_map_notify_chat"/>
+        <check_box label="SIMに入った時" name="mini_map_notify_sim"/>
         <text name="maturity_desired_label">
                 レーティング区分：
         </text>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 167bc2a..bca61d9 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -5,6 +5,7 @@
         </text>
         <button label="?" name="GraphicsPreferencesHelpButton" />
         <check_box label="ウィンドウ内で Second Life を起動" name="windowed mode" />
+        <check_box label="Windlightツールバーを表示" name="toggle_windlight_control"/>
         <text_editor name="voice_chat_description">
                 チェック無しの場合は、ログイン時にフルスクリーン表示
         </text_editor>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
index a2c13bb..8d4a564 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
@@ -11,9 +11,14 @@
                 ログインして変更してください
         </text>
         <check_box label="IMを電子メール（[EMAIL]）へ送信" name="send_im_to_email"/>
-        <check_box label="チャットコンソールにIMを表示する" name="include_im_in_chat_console"/>
+        <text name="show_ims_label">
+                IMの表示：
+        </text>
+        <check_box label="チャットコンソールに表示" name="include_im_in_chat_console" left="208"/>
+        <check_box label="チャット履歴に表示" name="include_im_in_chat_history" left="358"/>
         <check_box label="IMにタイムスタンプを表示" name="show_timestamps_check"/>
         <check_box label="オンライン・フレンド通知を表示" name="friends_online_notify_checkbox"/>
+        <check_box label="IMタブを縦並びに（再起動後に有効）" name="vertical-imtabs-toggle"/>
         <text name="text_box4">
                 記録オプション：
         </text>
@@ -29,4 +34,5 @@
                 取り込み中
 応答メッセージ：
         </text>
+        <button label="IM応答オプション" name="busy_adv_btn"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
index ded6f9d..ed20af2 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
@@ -21,11 +21,42 @@
         <text name="Camera Follow Distance:">
                 カメラ追従距離：
         </text>
+        <text name="Camera Transition Time:">
+                カメラ切替時間：
+        </text>
+        <text name="Camera Smoothing:">
+                カメラの滑らかさ：
+        </text>
+        
         <check_box label="編集カメラの自動移動" name="edit_camera_movement" tool_tip="編集モードの開始、終了時はカメラ自動位置調整を使用"/>
         <check_box label="容姿カメラの自動移動" name="appearance_camera_movement" tool_tip="編集モードでは、カメラ自動位置調整を使用"/>
+        <check_box label="カメラ移動の制限を解除" name="Disable camera constraints"/>
+        <check_box label="ズームの最短距離制限を解除" name="disable_min_zoom_check"/>
         <text name="text2">
                 アバター表示：
         </text>
         <check_box label="アバターを一人称視点（マウスルック）で表示" name="first_person_avatar_visible"/>
         <button label="ジョイスティック設定" name="joystick_setup_button"/>
+        <text name="double_click_action_label">
+                ダブルクリック時の動作：
+        </text>
+        <combo_box name="double_click_action">
+                <combo_item name="None">
+                        なし
+                </combo_item>
+                <combo_item name="Go">
+                        オートパイロット
+                </combo_item>
+        </combo_box>
+        <text name="go_action_label">
+                オートパイロットの種類：
+        </text>
+        <combo_box name="go_action">
+                <combo_item name="Move">
+                        歩く
+                </combo_item>
+                <combo_item name="Teleport">
+                        テレポート
+                </combo_item>
+        </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_popups.xml
index 9c1ca6e..75b316c 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_popups.xml
@@ -18,4 +18,5 @@
         <button width="235" label="ポップアップ全てを有効化..." label_selected="「次回表示」ダイアログリセット..." name="reset_dialogs_btn" tool_tip="全てのオプショナルポップアップと「初回使用」通知を有効にしてください。"/>
         <button width="235" label="これらのポップアップ全てを無効化..." name="skip_dialogs_btn" tool_tip="全てのオプショナルポップアップと「初回使用」通知を無効にしてください。"/>
         <check_box label="新たに受け取ったオブジェクトを持ち物に自動的に表示" name="show_in_inventory"/>
+        <check_box label="[CURRENCY]を使用・受け取る時に通知" name="notify_money_change_checkbox"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_radar.xml b/linden/indra/newview/skins/default/xui/ja/panel_radar.xml
new file mode 100644
index 0000000..ae86ae6
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/panel_radar.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<!-- Note: panel rect (size) is specified in floater_mini_map.xml -->
+
+<panel name="RadarPanel" label="レーダー">
+
+  <string name="no_one_near">
+    近くに誰もいません
+  </string>
+  <string name="is_muted">
+    (ミュート)
+  </string>
+  <string name="is_typing">
+    (タイプ中)
+  </string>
+  <string name="entering_chat_range">
+    [NAME] さんがチャットレンジに入ってきました。 ([DISTANCE]m)
+  </string>
+  <string name="entering_sim_range">
+    [NAME] さんがSIMに入ってきました。 ([DISTANCE]m)
+  </string>
+  <string name="avatars_in_singular">
+    [COUNT]人のアバター
+  </string>
+  <string name="avatars_in_plural">
+    [COUNT]人のアバター
+  </string>
+  <string name="unknown_avatar">
+    (不明)
+  </string>
+
+  <tab_container name="radar_tab_container">
+    <panel name="avatar_tab" label="アバター">
+      <button name="im_btn" label="IM/コール" tool_tip="IMウィンドウを開きます" />
+      <button name="profile_btn" label="ﾌﾟﾛﾌｨｰﾙ" tool_tip="写真、所属グループ、その他の情報"/>
+      <button name="offer_teleport_btn" label="TPを送る" tool_tip="この人にテレポートを送って自分のところに呼びます"/>
+      <button name="teleport_btn" label="居場所へTP" tool_tip="この人のいるところにテレポートします"/>
+      <button name="track_btn" label="追跡する" tool_tip="地図上のフレンドにビーコンを作成、追跡します"/>
+      <button name="invite_btn" label="招待..." tool_tip="この人を自分の所属グループに招待します"/>
+      <button name="add_btn" label="追加..." tool_tip="この人にフレンド要請を送ります"/>
+    </panel>
+    <panel name="estate_tab" label="不動産管理">
+      <button name="cam_btn" label="カメラ追跡"/>
+      <button name="freeze_btn" label="動けなくする..."/>
+      <button name="eject_btn" label="追い出す..."/>
+      <button name="ban_btn" label="立入禁止..."/>
+      <button name="mute_btn" label="ミュート..."/>
+      <button name="unmute_btn" label="ﾐｭｰﾄ解除..."/>
+      <button name="ar_btn" label="報告..."/>
+    </panel>
+  </tab_container>
+
+  <scroll_list name="RadarList">
+    <column name="avatar_name" label="名前"/>
+    <column name="avatar_distance" label="距離"/>
+  </scroll_list>
+
+</panel>
+
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_windlight_controls.xml b/linden/indra/newview/skins/default/xui/ja/panel_windlight_controls.xml
new file mode 100644
index 0000000..bfe6a42
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/panel_windlight_controls.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="windlight_controls">
+  <button label="環境編集" name="Environment"/>
+  <flyout_button label="空" name="Presets">
+  </flyout_button>
+</panel>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index ff59aec..bccfa8f 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -845,7 +845,6 @@ class LinuxManifest(ViewerManifest):
             self.path("wrapper.sh","imprudence")
             self.path("handle_secondlifeprotocol.sh")
             self.path("register_secondlifeprotocol.sh")
-            self.path("getvoice.sh")
             self.end_prefix("linux_tools")
 
         self.gather_documents()
diff --git a/linden/indra/newview/viewertime.cpp b/linden/indra/newview/viewertime.cpp
index 06dd91a..06436b6 100644
--- a/linden/indra/newview/viewertime.cpp
+++ b/linden/indra/newview/viewertime.cpp
@@ -47,6 +47,9 @@ ViewerTime* gViewerTime = 0;
 // We use statics here for speed reasons
 bool ViewerTime::sUse24HourTime = false;
 bool ViewerTime::sUseUTCTime = false;
+bool ViewerTime::sUseTimeOffset = false;
+S32 ViewerTime::sTimeOffset = 0;
+bool ViewerTime::sTimeOffsetDST = false;
 
 std::vector<std::string> ViewerTime::sDays;
 std::vector<std::string> ViewerTime::sMonths;
@@ -87,16 +90,21 @@ void ViewerTime::refresh()
         // There's only one internal tm buffer.
         struct tm* internal_time;
 
-        if (!sUseUTCTime)
+        if (sUseUTCTime)
         {
-                // Convert to Pacific, based on server's opinion of whether
-                // it's daylight savings time there.
-                internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
+                time(&utc_time);
+                internal_time = gmtime(&utc_time);
+        }
+        else if (sUseTimeOffset)
+        {
+                //Its a UTC offset, deal with it
+                internal_time = utc_to_offset_time(utc_time, sTimeOffset, sTimeOffsetDST);
         }
         else
         {
-                time(&utc_time);
-                internal_time = gmtime(&utc_time);
+                // Convert to Pacific, based on server's opinion of whether
+                // it's daylight savings time there.
+                internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
         }
         
         mMinute = internal_time->tm_min;
diff --git a/linden/indra/newview/viewertime.h b/linden/indra/newview/viewertime.h
index 525a2bc..f7a80a6 100644
--- a/linden/indra/newview/viewertime.h
+++ b/linden/indra/newview/viewertime.h
@@ -59,6 +59,9 @@ public:
 
         static bool sUse24HourTime;
         static bool sUseUTCTime;
+        static bool sUseTimeOffset;
+        static S32 sTimeOffset;
+        static bool sTimeOffsetDST;
 
         void updateTimeFormat(const U32& index);
 
diff --git a/linden/indra/newview/windlightsettingsupdate.cpp b/linden/indra/newview/windlightsettingsupdate.cpp
new file mode 100644
index 0000000..a5f9cb7
--- /dev/null
+++ b/linden/indra/newview/windlightsettingsupdate.cpp
@@ -0,0 +1,200 @@
+/*
+ * @file kowopenregionsettings.cpp
+ * @brief Handler for OpenRegionInfo event queue message.
+ *
+ * Copyright (c) 2010, Patrick Sapinski
+ *
+ * The source code in this file ("Source Code") is provided to you
+ * under the terms of the GNU General Public License, version 2.0
+ * ("GPL"). 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
+ *
+ * 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
+ *
+ * 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.
+ *
+ * ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llhttpnode.h"
+#include "hippoLimits.h"
+#include "llfloatertools.h"
+#include "llviewercontrol.h"
+#include "llagent.h"
+#include "llsurface.h"
+#include "llviewerregion.h"
+#include "llviewerobject.h"
+
+#include "linden_common.h"
+#include "llwaterparammanager.h"
+#include "llwaterparamset.h"
+#include "llwlparammanager.h"
+#include "llwlparamset.h"
+#include "message.h"
+#include "meta7windlight.h"
+#include "lightshare.h"
+#include "wlsettingsmanager.h"
+
+//DEBUG includes
+//#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string
+
+class WindLightSettingsUpdate : public LLHTTPNode
+{
+        /*virtual*/ void post(
+                LLHTTPNode::ResponsePtr response,
+                const LLSD& context,
+                const LLSD& input) const
+        {
+                if (!input.isMap() || !input.has("body"))
+                {
+                        llinfos << "malformed WindLightSettingsUpdate update!" << llendl;        
+                        return;
+                }
+                LLWaterParamSet* mWater;
+                LLWLParamSet* mSky;
+                LLUUID* mWaterNormal;
+
+                mWater = new LLWaterParamSet();
+                mSky = new LLWLParamSet();
+                mWaterNormal = new LLUUID();
+
+                LLSD body = input["body"];
+                
+                mWater->set("waterFogColor",
+                        body["waterColorX"].asReal()   / 256.f,
+                        body["waterColorY"].asReal()   / 256.f,
+                        body["waterColorZ"].asReal()   / 256.f,
+                        body["waterColorW"].asReal()   / 256.f);
+                mWater->set("waterFogDensity", body["waterFogDensityExponent"].asReal());
+                mWater->set("underWaterFogMod", body["underwaterFogModifier"].asReal());
+                mWater->set("normScale", body["reflectionWaveletScaleX"].asReal(),
+                        body["reflectionWaveletScaleY"].asReal(),
+                        body["reflectionWaveletScaleZ"].asReal());
+                mWater->set("fresnelScale", body["fresnelScale"].asReal());
+                mWater->set("fresnelOffset", body["fresnelOffset"].asReal());
+                mWater->set("scaleAbove", body["refractScaleAbove"].asReal());
+                mWater->set("scaleBelow", body["refractScaleBelow"].asReal());
+                mWater->set("blurMultiplier", body["blurMultiplier"].asReal());
+                mWater->set("wave2Dir", body["bigWaveDirectionX"].asReal(),
+                        body["bigWaveDirectionY"].asReal());
+                mWater->set("wave1Dir", body["littleWaveDirectionX"].asReal(),
+                        body["littleWaveDirectionY"].asReal());
+                mWaterNormal->parseUUID(body["normalMapTexture"].asUUID().asString(), mWaterNormal);
+
+                mSky->setSunAngle(body["sunMoonPosition"].asReal());
+                mSky->setEastAngle(body["eastAngle"].asReal());
+
+                mSky->set("sunlight_color",
+                                                body["sunMoonColorX"].asReal() * 3.0f,
+                                                body["sunMoonColorY"].asReal() * 3.0f,
+                                                body["sunMoonColorZ"].asReal() * 3.0f,
+                                                body["sunMoonColorW"].asReal() * 3.0f);
+
+                mSky->set("ambient",
+                                                body["ambientX"].asReal() * 3.0f,
+                                                body["ambientY"].asReal() * 3.0f,
+                                                body["ambientZ"].asReal() * 3.0f,
+                                                body["ambientW"].asReal() * 3.0f);
+
+                mSky->set("blue_horizon",
+                                                body["horizonX"].asReal() * 2.0f,
+                                                body["horizonY"].asReal() * 2.0f,
+                                                body["horizonZ"].asReal() * 2.0f,
+                                                body["horizonW"].asReal() * 2.0f);
+
+                mSky->set("blue_density",
+                                                body["blueDensityX"].asReal(),
+                                                body["blueDensityY"].asReal(),
+                                                body["blueDensityZ"].asReal(),
+                                                1.0);
+
+                mSky->set("haze_horizon",
+                                                body["hazeHorizon"].asReal(),
+                                                body["hazeHorizon"].asReal(),
+                                                body["hazeHorizon"].asReal(),
+                                                1.f);
+
+                mSky->set("haze_density",
+                                                body["hazeDensity"].asReal(),
+                                                0.f, 0.f, 1.f);
+
+                mSky->set("cloud_shadow",
+                                                body["cloudCoverage"].asReal(),
+                                                0.f, 0.f, 1.f);
+
+                mSky->set("density_multiplier",
+                                                body["densityMultiplier"].asReal() / 1000.0f,
+                                                0.f, 0.f, 1.f);
+
+                mSky->set("distance_multiplier",
+                                                body["distanceMultiplier"].asReal(),
+                                                0.f, 0.f, 1.f);
+
+                mSky->set("max_y",
+                                                body["maxAltitude"].asReal(),
+                                                0.f, 0.f, 1.f);
+
+                mSky->set("cloud_color",
+                                                body["cloudColorX"].asReal(),
+                                                body["cloudColorY"].asReal(),
+                                                body["cloudColorZ"].asReal(),
+                                                body["cloudColorW"].asReal());
+
+                mSky->set("cloud_pos_density1",
+                                                body["cloudXYDensityX"].asReal(),
+                                                body["cloudXYDensityY"].asReal(),
+                                                body["cloudXYDensityZ"].asReal(),
+                                                1.f);
+
+                mSky->set("cloud_pos_density2",
+                                                body["cloudDetailXYDensityX"].asReal(),
+                                                body["cloudDetailXYDensityY"].asReal(),
+                                                body["cloudDetailXYDensityZ"].asReal(),
+                                                1.f);
+
+                mSky->set("cloud_scale",
+                                                body["cloudScale"].asReal(),
+                                                0.f, 0.f, 1.f);
+
+                mSky->set("gamma",
+                                                body["sceneGamma"].asReal(),
+                                                0.f, 0.f, 1.f);
+
+                mSky->set("glow",
+                                                (2 - body["sunGlowSize"].asReal()) * 20,
+                                                0.f,
+                                                -body["sunGlowFocus"].asReal() * 5,
+                                                1.f);
+
+        mSky->setCloudScrollX(body["cloudScrollX"].asReal() + 10.0f);
+        mSky->setCloudScrollY(body["cloudScrollY"].asReal() + 10.0f);
+
+        mSky->setEnableCloudScrollX(!body["cloudScrollXLock"].asBoolean());
+        mSky->setEnableCloudScrollY(!body["cloudScrollYLock"].asBoolean());
+
+        mSky->setStarBrightness(body["starBrightness"].asReal());
+
+        mSky->set("fade", body["fade"].asReal());
+
+        //Update this here.. since it isn't a part of WL... go figure
+        gHippoLimits->skyUseClassicClouds = body["drawClassicClouds"].asBoolean();
+        gSavedSettings.setF32("ClassicCloudHeight",body["classicCloudHeight"].asReal());
+        gSavedSettings.setF32("ClassicCloudRange",body["classicCloudRange"].asReal());
+
+        WLSettingsManager::Apply(mSky, mWater, mWaterNormal);
+}
+};
+
+LLHTTPRegistration<WindLightSettingsUpdate>
+gHTTPRegistrationWindLightSettingsUpdate(
+        "/message/WindLightSettingsUpdate");
\ No newline at end of file
diff --git a/linden/indra/newview/wlfloatermanager.cpp b/linden/indra/newview/wlfloatermanager.cpp
new file mode 100644
index 0000000..1946807
--- /dev/null
+++ b/linden/indra/newview/wlfloatermanager.cpp
@@ -0,0 +1,281 @@
+/** 
+* @file wlfloaterwindlightsend.cpp
+* @brief WLFloaterWindLightSend class definition
+*
+* $LicenseInfo:firstyear=2007&license=viewergpl$
+* 
+* Copyright (c) 2007-2009, 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
+* ("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
+* 
+* 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
+* 
+* 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.
+* 
+* 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"
+
+#include "llfloaterwindlight.h"
+
+#include "pipeline.h"
+#include "llsky.h"
+
+#include "llsliderctrl.h"
+#include "llmultislider.h"
+#include "llmultisliderctrl.h"
+#include "llspinctrl.h"
+#include "llcheckboxctrl.h"
+#include "lluictrlfactory.h"
+#include "llviewercamera.h"
+#include "llcombobox.h"
+#include "lllineeditor.h"
+#include "llfloaterdaycycle.h"
+#include "lltabcontainer.h"
+#include "llboost.h"
+
+#include "llagent.h"
+#include "llinventorymodel.h"
+#include "llviewerinventory.h"
+
+#include "v4math.h"
+#include "llviewerdisplay.h"
+#include "llviewercontrol.h"
+#include "llviewerwindow.h"
+#include "llsavedsettingsglue.h"
+
+#include "llwlparamset.h"
+#include "llwlparammanager.h"
+#include "llwaterparammanager.h"
+#include "llpostprocess.h"
+#include "hippoLimits.h"
+#include "wlfloatermanager.h"
+#include "llviewerregion.h"
+#include "llviewerparcelmgr.h"
+#include "llparcel.h"
+#include "wlretrievesettings.h"
+#include "wlsettingsmanager.h"
+#include "wlfloaterwindlightsend.h"
+
+#undef max
+WLFloaterManager* WLFloaterManager::sWindLight;
+std::map<std::string, LLWLParamSet*> WLFloaterManager::mWLParamList;    
+std::map<std::string, LLWaterParamSet*> WLFloaterManager::mWaterParamList;      
+std::map<std::string, LLUUID*> WLFloaterManager::mWaterNormalParamList; 
+std::map<std::string, LLSD> WLFloaterManager::mMinAltParamList; 
+std::map<std::string, LLSD> WLFloaterManager::mMaxAltParamList; 
+std::map<std::string, LLSD> WLFloaterManager::mFadeParamList;   
+
+WLFloaterManager::WLFloaterManager() : LLFloater(std::string("windlight manager floater"))
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_windlight_manager.xml");
+
+        // load it up
+        initCallbacks();
+}
+
+WLFloaterManager::~WLFloaterManager()
+{
+}
+
+void WLFloaterManager::initCallbacks(void) {
+
+        // help buttons
+        childSetAction("this_parcel", onGetThisParcel, this);
+        childSetAction("all_parcels", onGetAllParcels, this);
+        childSetAction("this_region", onGetThisRegion, this);
+        childSetAction("show", onShow, this);
+        childSetAction("set_to_current", onSetToCurrent, this);
+        childSetAction("remove", onRemove, this);
+}
+
+void WLFloaterManager::onClickHelp(void* data)
+{
+        LLFloaterWindLight* self = LLFloaterWindLight::instance();
+
+        const std::string xml_alert = *(std::string*)data;
+        LLNotifications::instance().add(self->contextualNotification(xml_alert));
+}
+
+void WLFloaterManager::initHelpBtn(const std::string& name, const std::string& xml_alert)
+{
+        childSetAction(name, onClickHelp, new std::string(xml_alert));
+}
+
+// static
+WLFloaterManager* WLFloaterManager::instance()
+{
+        if (!sWindLight)
+        {
+                sWindLight = new WLFloaterManager();
+                sWindLight->open();
+                sWindLight->setFocus(TRUE);
+        }
+        return sWindLight;
+}
+
+void WLFloaterManager::show()
+{
+        if (!sWindLight)
+        {
+                WLFloaterManager::instance();
+        }
+        else
+        {
+                if (sWindLight->getVisible())
+                {
+                        sWindLight->close();
+                }
+                else
+                {
+                        sWindLight->open();
+                }
+        }
+}
+
+bool WLFloaterManager::isOpen()
+{
+        if (sWindLight != NULL) {
+                return true;
+        }
+        return false;
+}
+
+// virtual
+void WLFloaterManager::onClose(bool app_quitting)
+{
+        if (sWindLight)
+        {
+                sWindLight->setVisible(FALSE);
+        }
+}
+
+void WLFloaterManager::onGetThisRegion(void* userData)
+{
+        LLSD body;
+
+        //Send the update CAPS to the server
+        std::string url = gAgent.getRegion()->getCapability("RetrieveWindLightSettings");
+        if (!url.empty())
+        {
+                body["RegionID"] = gAgent.getRegion()->getRegionID();
+                LLHTTPClient::post(url, body, new retrieveWindlightSettings(body));
+        }
+}
+
+void WLFloaterManager::onGetThisParcel(void* userData)
+{
+        LLSD body;
+
+        //Send the update CAPS to the server
+        std::string url = gAgent.getRegion()->getCapability("RetrieveWindLightSettings");
+        if (!url.empty())
+        {
+                body["ParcelID"] = LLViewerParcelMgr::getInstance()->getAgentParcel()->getLocalID();
+                LLHTTPClient::post(url, body, new retrieveWindlightSettings(body));
+        }
+}
+void WLFloaterManager::onGetAllParcels(void* userData)
+{
+        LLSD body;
+
+        //Send the update CAPS to the server
+        std::string url = gAgent.getRegion()->getCapability("RetrieveWindLightSettings");
+        if (!url.empty())
+        {
+                body["ParcelID"] = -1;
+                LLHTTPClient::post(url, body, new retrieveWindlightSettings(body));
+        }
+}
+
+void WLFloaterManager::onShow(void* userData)
+{
+        WLFloaterManager* mgr = WLFloaterManager::instance();
+        LLComboBox* comboBox = mgr->getChild<LLComboBox>("WLSettingsCombo");
+        std::string name = comboBox->getSelectedItemLabel();
+        //Set the new settings up
+        LLWLParamSet* mSky = mgr->mWLParamList[name];
+        LLWaterParamSet* mWater = mgr->mWaterParamList[name];
+        LLUUID* mWaterNormal = mgr->mWaterNormalParamList[name];
+        if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
+                WLSettingsManager::Apply(mSky, mWater, mWaterNormal);
+}
+void WLFloaterManager::onSetToCurrent(void* userData)
+{
+        WLFloaterManager* mgr = WLFloaterManager::instance();
+        LLComboBox* comboBox = mgr->getChild<LLComboBox>("WLSettingsCombo");
+        std::string name = comboBox->getSelectedItemLabel();
+
+        LLWLParamSet* mSky = mgr->mWLParamList[name];
+        LLWaterParamSet* mWater = mgr->mWaterParamList[name];
+        LLUUID* mWaterNormal = mgr->mWaterNormalParamList[name];
+        LLSD fade = mgr->mFadeParamList[name];
+        LLSD minAlt = mgr->mMinAltParamList[name];
+        LLSD maxAlt = mgr->mMaxAltParamList[name];
+
+        int type = 1;
+        if(name == "(Region Settings)")
+        {
+                type = 0;
+        }       
+        
+        if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
+                WLFloaterWindLightSend::SendSettings(false, type, NULL, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal); 
+}
+void WLFloaterManager::onRemove(void* userData)
+{
+        WLFloaterManager* mgr = WLFloaterManager::instance();
+        LLComboBox* comboBox = mgr->getChild<LLComboBox>("WLSettingsCombo");
+        std::string name = comboBox->getSelectedItemLabel();
+
+        LLWLParamSet* mSky = mgr->mWLParamList[name];
+        LLWaterParamSet* mWater = mgr->mWaterParamList[name];
+        LLUUID* mWaterNormal = mgr->mWaterNormalParamList[name];
+        LLSD fade = mgr->mFadeParamList[name];
+        LLSD minAlt = mgr->mMinAltParamList[name];
+        LLSD maxAlt = mgr->mMaxAltParamList[name];
+
+        int type = 1;
+        if(name == "(Region Settings)")
+        {
+                type = 0;
+        }
+
+        if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
+                WLFloaterWindLightSend::SendSettings(true, type, false, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal); 
+}
+
+
+//static
+void WLFloaterManager::UpdateFloater()
+{
+        WLFloaterManager* mgr = WLFloaterManager::instance();
+        LLComboBox* comboBox = mgr->getChild<LLComboBox>("WLSettingsCombo");
+        comboBox->clear();
+        comboBox->removeall();
+        std::map<std::string, LLWLParamSet*>::iterator mIt = 
+                WLFloaterManager::instance()->mWLParamList.begin();
+        for(; mIt != WLFloaterManager::instance()->mWLParamList.end(); mIt++) 
+        {
+                comboBox->add(mIt->first);
+        }
+        //Reorder them
+        comboBox->sortByName();
+}
+
diff --git a/linden/indra/newview/wlfloatermanager.h b/linden/indra/newview/wlfloatermanager.h
new file mode 100644
index 0000000..0a2d0ca
--- /dev/null
+++ b/linden/indra/newview/wlfloatermanager.h
@@ -0,0 +1,93 @@
+/** 
+ * @file wlfloaterwindlightsend.h
+ * @brief WLFloaterWindLightSend class definition
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2009, 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
+ * ("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
+ * 
+ * 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
+ * 
+ * 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.
+ * 
+ * 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$
+ */
+
+/*
+ * Menu for adjusting the atmospheric settings of the world
+ */
+
+#include "llfloater.h"
+
+#include <vector>
+#include "llwlparamset.h"
+
+struct WLColorControl;
+struct WLFloatControl;
+
+
+/// Menuing system for all of windlight's functionality
+class WLFloaterManager : public LLFloater
+{
+public:
+
+        WLFloaterManager();
+        virtual ~WLFloaterManager();
+        
+        /// initialize all
+        void initCallbacks(void);
+
+        /// one and one instance only
+        static WLFloaterManager* instance();
+
+        // help button stuff
+        static void onClickHelp(void* data);
+        void initHelpBtn(const std::string& name, const std::string& xml_alert);
+
+        static void onGetThisRegion(void* userData);
+        static void onGetThisParcel(void* userData);
+        static void onGetAllParcels(void* userData);
+        static void onShow(void* userData);
+        static void onSetToCurrent(void* userData);
+        static void onRemove(void* userData);
+        
+        //// menu management
+
+        /// show off our menu
+        static void show();
+
+        /// return if the menu exists or not
+        static bool isOpen();
+
+        /// stuff to do on exit
+        virtual void onClose(bool app_quitting);
+
+        static void UpdateFloater();
+        static std::map<std::string, LLWLParamSet*> mWLParamList;       
+        static std::map<std::string, LLWaterParamSet*> mWaterParamList; 
+        static std::map<std::string, LLUUID*> mWaterNormalParamList;    
+        static std::map<std::string, LLSD> mMinAltParamList;    
+        static std::map<std::string, LLSD> mMaxAltParamList;    
+        static std::map<std::string, LLSD> mFadeParamList;      
+
+private:
+        // one instance on the inside
+        static WLFloaterManager* sWindLight;
+};
\ No newline at end of file
diff --git a/linden/indra/newview/wlfloaterwindlightsend.cpp b/linden/indra/newview/wlfloaterwindlightsend.cpp
new file mode 100644
index 0000000..5244bcd
--- /dev/null
+++ b/linden/indra/newview/wlfloaterwindlightsend.cpp
@@ -0,0 +1,300 @@
+/** 
+* @file wlfloaterwindlightsend.cpp
+* @brief WLFloaterWindLightSend class definition
+*
+* $LicenseInfo:firstyear=2007&license=viewergpl$
+* 
+* Copyright (c) 2007-2009, 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
+* ("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
+* 
+* 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
+* 
+* 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.
+* 
+* 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"
+
+#include "llfloaterwindlight.h"
+
+#include "pipeline.h"
+#include "llsky.h"
+
+#include "llsliderctrl.h"
+#include "llmultislider.h"
+#include "llmultisliderctrl.h"
+#include "llspinctrl.h"
+#include "llcheckboxctrl.h"
+#include "lluictrlfactory.h"
+#include "llviewercamera.h"
+#include "llcombobox.h"
+#include "lllineeditor.h"
+#include "llfloaterdaycycle.h"
+#include "lltabcontainer.h"
+#include "llboost.h"
+
+#include "llagent.h"
+#include "llinventorymodel.h"
+#include "llviewerinventory.h"
+
+#include "v4math.h"
+#include "llviewerdisplay.h"
+#include "llviewercontrol.h"
+#include "llviewerwindow.h"
+#include "llsavedsettingsglue.h"
+
+#include "llwlparamset.h"
+#include "llwlparammanager.h"
+#include "llwaterparammanager.h"
+#include "llpostprocess.h"
+#include "hippoLimits.h"
+#include "wlfloaterwindlightsend.h"
+#include "llviewerregion.h"
+
+#undef max
+
+
+WLFloaterWindLightSend* WLFloaterWindLightSend::sWindLight = NULL;
+
+WLFloaterWindLightSend::WLFloaterWindLightSend() : LLFloater(std::string("windlight send floater"))
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_windlight_remote_save.xml");
+
+        // load it up
+        initCallbacks();
+}
+
+WLFloaterWindLightSend::~WLFloaterWindLightSend()
+{
+}
+
+void WLFloaterWindLightSend::initCallbacks(void) {
+
+        // help buttons
+        initHelpBtn("fade_help", "HelpBlueHorizon");
+        initHelpBtn("override_parcel_default_help", "HelpHazeHorizon");
+        initHelpBtn("override_parcel_help", "HelpBlueDensity");
+        initHelpBtn("max_altitude_help", "HelpHazeDensity");
+        initHelpBtn("min_altitude_help", "HelpDensityMult");
+        childSetAction("button_region_send_to_server", onSaveRegionPreset, this);
+        childSetAction("button_parcel_send_to_server", onSaveParcelPreset, this);
+}
+
+void WLFloaterWindLightSend::onClickHelp(void* data)
+{
+        LLFloaterWindLight* self = LLFloaterWindLight::instance();
+
+        const std::string xml_alert = *(std::string*)data;
+        LLNotifications::instance().add(self->contextualNotification(xml_alert));
+}
+
+void WLFloaterWindLightSend::initHelpBtn(const std::string& name, const std::string& xml_alert)
+{
+        childSetAction(name, onClickHelp, new std::string(xml_alert));
+}
+
+// static
+WLFloaterWindLightSend* WLFloaterWindLightSend::instance()
+{
+        if (!sWindLight)
+        {
+                sWindLight = new WLFloaterWindLightSend();
+                sWindLight->open();
+                sWindLight->setFocus(TRUE);
+        }
+        return sWindLight;
+}
+
+void WLFloaterWindLightSend::show()
+{
+        if (!sWindLight)
+        {
+                WLFloaterWindLightSend::instance();
+        }
+        else
+        {
+                if (sWindLight->getVisible())
+                {
+                        sWindLight->close();
+                }
+                else
+                {
+                        sWindLight->open();
+                }
+        }
+}
+
+bool WLFloaterWindLightSend::isOpen()
+{
+        if (sWindLight != NULL) {
+                return true;
+        }
+        return false;
+}
+
+// virtual
+void WLFloaterWindLightSend::onClose(bool app_quitting)
+{
+        if (sWindLight)
+        {
+                sWindLight->setVisible(FALSE);
+        }
+}
+
+void WLFloaterWindLightSend::onSaveRegionPreset(void* userData)
+{
+        int RegionType = 0;
+        SendSettings(false, RegionType, 
+                WLFloaterWindLightSend::instance()->childGetValue("override_parcel"),
+                LLWLParamManager::instance()->mCurParams,
+                LLWaterParamManager::instance()->mCurParams,
+                WLFloaterWindLightSend::instance()->childGetValue("Fade"),
+                WLFloaterWindLightSend::instance()->childGetValue("min_altitude"),
+                WLFloaterWindLightSend::instance()->childGetValue("max_altitude"),
+                LLWaterParamManager::instance()->getNormalMapID());
+}
+void WLFloaterWindLightSend::onSaveParcelPreset(void* userData)
+{
+        int ParcelType = 1;
+        SendSettings(false, ParcelType, false, LLWLParamManager::instance()->mCurParams,
+                LLWaterParamManager::instance()->mCurParams,
+                WLFloaterWindLightSend::instance()->childGetValue("Fade"),
+                WLFloaterWindLightSend::instance()->childGetValue("min_altitude"),
+                WLFloaterWindLightSend::instance()->childGetValue("max_altitude"),
+                LLWaterParamManager::instance()->getNormalMapID());
+}
+void WLFloaterWindLightSend::SendSettings(bool remove, int type, bool overrideParcels,
+                                                                                  LLWLParamSet mSky, LLWaterParamSet mWater,
+                                                                                  LLSD fade, LLSD minAlt, LLSD maxAlt,
+                                                                                  LLUUID normalMap)
+{
+        LLSD body;
+        std::string url = gAgent.getRegion()->getCapability("DispatchWindLightSettings");
+        if (!url.empty())
+        {
+                bool error;
+
+                body["type"] = type;
+                body["remove"] = remove;
+                body["fade"] = fade;
+                body["maxEffectiveAltitude"] = maxAlt;
+                body["minEffectiveAltitude"] = minAlt;
+                if(overrideParcels == true || overrideParcels == false)
+                        body["overrideParcels"] = overrideParcels;
+
+                LLVector4 v = mSky.getVector("ambient", error);
+                body["ambientX"] = v[0] / 3.0;
+                body["ambientY"] = v[1] / 3.0;
+                body["ambientZ"] = v[2] / 3.0;
+                body["ambientW"] = v[3] / 3.0;
+
+                body["eastAngle"] = mSky.getEastAngle();
+                body["sunMoonPosition"] = mSky.getSunAngle();
+
+                v = mSky.getVector("sunlight_color",error);
+                body["sunMoonColorX"] = v[0] / 3.0;
+                body["sunMoonColorY"] = v[1] / 3.0;
+                body["sunMoonColorZ"] = v[2] / 3.0;
+                body["sunMoonColorW"] = v[3] / 3.0;
+
+                v = mSky.getVector("blue_horizon",error);
+                body["horizonX"] = v[0] / 2.0;
+                body["horizonY"] = v[1] / 2.0;
+                body["horizonZ"] = v[2] / 2.0;
+                body["horizonW"] = v[3] / 2.0;
+
+                v = mSky.getVector("blue_density",error);
+                body["blueDensityX"] = v[0];
+                body["blueDensityY"] = v[1];
+                body["blueDensityZ"] = v[2];
+
+                v = mSky.getVector("haze_horizon",error);
+                body["hazeHorizon"] = v[0];
+
+                body["hazeDensity"] = mSky.getFloat("haze_density",error);
+                body["cloudCoverage"] = mSky.getFloat("cloud_shadow",error);
+                body["densityMultiplier"] = mSky.getFloat("density_multiplier",error) * 1000;
+                body["distanceMultiplier"] = mSky.getFloat("distance_multiplier",error);
+                body["maxAltitude"] = mSky.getFloat("max_y",error);
+
+                v = mSky.getVector("cloud_color",error);
+                body["cloudColorX"] = v[0];
+                body["cloudColorY"] = v[1];
+                body["cloudColorZ"] = v[2];
+                body["cloudColorW"] = v[3];
+
+                v = mSky.getVector("cloud_pos_density1",error);
+                body["cloudXYDensityX"] = v[0];
+                body["cloudXYDensityY"] = v[1];
+                body["cloudXYDensityZ"] = v[2];
+
+                v = mSky.getVector("cloud_pos_density2",error);
+                body["cloudDetailXYDensityX"] = v[0];
+                body["cloudDetailXYDensityY"] = v[1];
+                body["cloudDetailXYDensityZ"] = v[2];
+
+                v = mSky.getVector("glow",error);
+                body["sunGlowSize"] = -((v[0]/ 20) - 2);
+                body["sunGlowFocus"] = -v[2] / 5;
+
+                body["cloudScale"] = mSky.getFloat("cloud_scale",error);
+                body["sceneGamma"] = mSky.getFloat("gamma",error);
+                body["cloudScrollX"] = mSky.getCloudScrollX() - 10;
+                body["cloudScrollY"] = mSky.getCloudScrollY() - 10;
+                body["cloudScrollXLock"] = !mSky.getEnableCloudScrollX();
+                body["cloudScrollYLock"] = !mSky.getEnableCloudScrollY();
+                body["starBrightness"] = mSky.getStarBrightness();
+                body["drawClassicClouds"] = gHippoLimits->skyUseClassicClouds;
+                body["classicCloudHeight"] = gSavedSettings.getF32("ClassicCloudHeight");
+                body["classicCloudRange"] = gSavedSettings.getF32("ClassicCloudRange");
+
+                LLVector3 vvv = mWater.getVector3("normScale",error);
+                body["reflectionWaveletScaleX"] = vvv[0];
+                body["reflectionWaveletScaleY"] = vvv[1];
+                body["reflectionWaveletScaleZ"] = vvv[2];
+
+                v = mWater.getVector4("waterFogColor",error);
+                body["waterColorX"] = v[0] * 256.0;
+                body["waterColorY"] = v[1] * 256.0;
+                body["waterColorZ"] = v[2] * 256.0;
+                body["waterColorW"] = v[3] * 256.0;
+
+                body["waterFogDensityExponent"] = mWater.getFloat("waterFogDensity", error);
+                body["underwaterFogModifier"] = mWater.getFloat("underWaterFogMod", error);
+
+                body["fresnelScale"] = mWater.getFloat("fresnelScale", error);
+                body["fresnelOffset"] = mWater.getFloat("fresnelOffset", error);
+                body["refractScaleAbove"] = mWater.getFloat("scaleAbove", error);
+                body["refractScaleBelow"] = mWater.getFloat("scaleBelow", error);
+                body["blurMultiplier"] = mWater.getFloat("blurMultiplier", error);
+
+                LLVector2 vv = mWater.getVector2("wave1Dir",error);
+                body["littleWaveDirectionX"] = vv[0];
+                body["littleWaveDirectionY"] = vv[1];
+
+                vv = mWater.getVector2("wave2Dir",error);
+                body["bigWaveDirectionX"] = vv[0];
+                body["bigWaveDirectionY"] = vv[1];
+
+                body["normalMapTexture"] = normalMap;
+
+                LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
+        }
+}
\ No newline at end of file
diff --git a/linden/indra/newview/wlfloaterwindlightsend.h b/linden/indra/newview/wlfloaterwindlightsend.h
new file mode 100644
index 0000000..acd4386
--- /dev/null
+++ b/linden/indra/newview/wlfloaterwindlightsend.h
@@ -0,0 +1,88 @@
+/** 
+ * @file wlfloaterwindlightsend.h
+ * @brief WLFloaterWindLightSend class definition
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2009, 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
+ * ("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
+ * 
+ * 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
+ * 
+ * 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.
+ * 
+ * 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$
+ */
+
+/*
+ * Menu for adjusting the atmospheric settings of the world
+ */
+
+#include "llfloater.h"
+
+#include <vector>
+#include "llwlparamset.h"
+#include "llwaterparamset.h"
+#include "llsd.h"
+
+struct WLColorControl;
+struct WLFloatControl;
+
+
+/// Menuing system for all of windlight's functionality
+class WLFloaterWindLightSend : public LLFloater
+{
+public:
+
+        WLFloaterWindLightSend();
+        virtual ~WLFloaterWindLightSend();
+        
+        /// initialize all
+        void initCallbacks(void);
+
+        /// one and one instance only
+        static WLFloaterWindLightSend* instance();
+
+        // help button stuff
+        static void onClickHelp(void* data);
+        void initHelpBtn(const std::string& name, const std::string& xml_alert);
+
+        static void onSaveParcelPreset(void* userData);
+        static void onSaveRegionPreset(void* userData);
+        
+        //// menu management
+
+        /// show off our menu
+        static void show();
+
+        /// return if the menu exists or not
+        static bool isOpen();
+
+        /// stuff to do on exit
+        virtual void onClose(bool app_quitting);
+
+        static void SendSettings(bool remove, int type, bool overrideParcel,
+                                                                                  LLWLParamSet mSky, LLWaterParamSet mWater,
+                                                                                  LLSD Fade, LLSD minAlt, LLSD maxAlt,
+                                                                                  LLUUID normalMap);
+
+private:
+        // one instance on the inside
+        static WLFloaterWindLightSend* sWindLight;
+};
\ No newline at end of file
diff --git a/linden/indra/newview/wlretrievesettings.cpp b/linden/indra/newview/wlretrievesettings.cpp
new file mode 100644
index 0000000..ca91ba2
--- /dev/null
+++ b/linden/indra/newview/wlretrievesettings.cpp
@@ -0,0 +1,238 @@
+/** 
+* @file wlfloaterwindlightsend.cpp
+* @brief WLFloaterWindLightSend class definition
+*
+* $LicenseInfo:firstyear=2007&license=viewergpl$
+* 
+* Copyright (c) 2007-2009, 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
+* ("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
+* 
+* 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
+* 
+* 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.
+* 
+* 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"
+
+#include "llfloaterwindlight.h"
+
+#include "pipeline.h"
+#include "llsky.h"
+
+#include "llsliderctrl.h"
+#include "llmultislider.h"
+#include "llmultisliderctrl.h"
+#include "llspinctrl.h"
+#include "llcheckboxctrl.h"
+#include "lluictrlfactory.h"
+#include "llviewercamera.h"
+#include "llcombobox.h"
+#include "lllineeditor.h"
+#include "llfloaterdaycycle.h"
+#include "lltabcontainer.h"
+#include "llboost.h"
+
+#include "llagent.h"
+#include "llinventorymodel.h"
+#include "llviewerinventory.h"
+
+#include "v4math.h"
+#include "llviewerdisplay.h"
+#include "llviewercontrol.h"
+#include "llviewerwindow.h"
+#include "llsavedsettingsglue.h"
+
+#include "llwlparamset.h"
+#include "llwlparammanager.h"
+#include "llwaterparammanager.h"
+#include "llpostprocess.h"
+#include "hippoLimits.h"
+#include "wlfloaterwindlightsend.h"
+#include "llviewerregion.h"
+#include "wlsettingsmanager.h"
+#include "lightshare.h"
+
+#include "linden_common.h"
+#include "llviewercontrol.h"
+#include "message.h"
+#include "meta7windlight.h"
+#include "wlretrievesettings.h"
+#include "wlfloatermanager.h"
+
+#undef max
+
+//If we get back a normal response, handle it here
+void retrieveWindlightSettings::result(const LLSD& content)
+{
+        //Clear the lists first
+        WLFloaterManager::mMinAltParamList.clear();
+        WLFloaterManager::mMaxAltParamList.clear();
+        WLFloaterManager::mFadeParamList.clear();
+        WLFloaterManager::mWLParamList.clear();
+        WLFloaterManager::mWaterParamList.clear();
+        WLFloaterManager::mWaterNormalParamList.clear();
+
+        for(LLSD::array_const_iterator wls = content["WindLight"].beginArray();
+                wls != content["WindLight"].endArray();
+                ++wls)
+        {       
+                LLSD windLightLLSD = *wls;
+                LLWaterParamSet* mWater;
+                LLWLParamSet* mSky;
+                LLUUID* mWaterNormal;
+
+                mWater = new LLWaterParamSet();
+                mSky = new LLWLParamSet();
+                mWaterNormal = new LLUUID();
+
+                mWater->set("waterFogColor",
+                        windLightLLSD["waterColorX"].asReal()   / 256.f,
+                        windLightLLSD["waterColorY"].asReal()   / 256.f,
+                        windLightLLSD["waterColorZ"].asReal()   / 256.f,
+                        windLightLLSD["waterColorW"].asReal()   / 256.f);
+                mWater->set("waterFogDensity", windLightLLSD["waterFogDensityExponent"].asReal());
+                mWater->set("underWaterFogMod", windLightLLSD["underwaterFogModifier"].asReal());
+                mWater->set("normScale", windLightLLSD["reflectionWaveletScaleX"].asReal(),
+                        windLightLLSD["reflectionWaveletScaleY"].asReal(),
+                        windLightLLSD["reflectionWaveletScaleZ"].asReal());
+                mWater->set("fresnelScale", windLightLLSD["fresnelScale"].asReal());
+                mWater->set("fresnelOffset", windLightLLSD["fresnelOffset"].asReal());
+                mWater->set("scaleAbove", windLightLLSD["refractScaleAbove"].asReal());
+                mWater->set("scaleBelow", windLightLLSD["refractScaleBelow"].asReal());
+                mWater->set("blurMultiplier", windLightLLSD["blurMultiplier"].asReal());
+                mWater->set("wave2Dir", windLightLLSD["bigWaveDirectionX"].asReal(),
+                        windLightLLSD["bigWaveDirectionY"].asReal());
+                mWater->set("wave1Dir", windLightLLSD["littleWaveDirectionX"].asReal(),
+                        windLightLLSD["littleWaveDirectionY"].asReal());
+                mWaterNormal->parseUUID(windLightLLSD["normalMapTexture"].asUUID().asString(), mWaterNormal);
+
+                mSky->setSunAngle(windLightLLSD["sunMoonPosition"].asReal());
+                mSky->setEastAngle(windLightLLSD["eastAngle"].asReal());
+
+                mSky->set("sunlight_color",
+                        windLightLLSD["sunMoonColorX"].asReal() * 3.0f,
+                        windLightLLSD["sunMoonColorY"].asReal() * 3.0f,
+                        windLightLLSD["sunMoonColorZ"].asReal() * 3.0f,
+                        windLightLLSD["sunMoonColorW"].asReal() * 3.0f);
+
+                mSky->set("ambient",
+                        windLightLLSD["ambientX"].asReal() * 3.0f,
+                        windLightLLSD["ambientY"].asReal() * 3.0f,
+                        windLightLLSD["ambientZ"].asReal() * 3.0f,
+                        windLightLLSD["ambientW"].asReal() * 3.0f);
+
+                mSky->set("blue_horizon",
+                        windLightLLSD["horizonX"].asReal() * 2.0f,
+                        windLightLLSD["horizonY"].asReal() * 2.0f,
+                        windLightLLSD["horizonZ"].asReal() * 2.0f,
+                        windLightLLSD["horizonW"].asReal() * 2.0f);
+
+                mSky->set("blue_density",
+                        windLightLLSD["blueDensityX"].asReal(),
+                        windLightLLSD["blueDensityY"].asReal(),
+                        windLightLLSD["blueDensityZ"].asReal(),
+                        1.0);
+
+                mSky->set("haze_horizon",
+                        windLightLLSD["hazeHorizon"].asReal(),
+                        windLightLLSD["hazeHorizon"].asReal(),
+                        windLightLLSD["hazeHorizon"].asReal(),
+                        1.f);
+
+                mSky->set("haze_density",
+                        windLightLLSD["hazeDensity"].asReal(),
+                        0.f, 0.f, 1.f);
+
+                mSky->set("cloud_shadow",
+                        windLightLLSD["cloudCoverage"].asReal(),
+                        0.f, 0.f, 1.f);
+
+                mSky->set("density_multiplier",
+                        windLightLLSD["densityMultiplier"].asReal() / 1000.0f,
+                        0.f, 0.f, 1.f);
+
+                mSky->set("distance_multiplier",
+                        windLightLLSD["distanceMultiplier"].asReal(),
+                        0.f, 0.f, 1.f);
+
+                mSky->set("max_y",
+                        windLightLLSD["maxAltitude"].asReal(),
+                        0.f, 0.f, 1.f);
+
+                mSky->set("cloud_color",
+                        windLightLLSD["cloudColorX"].asReal(),
+                        windLightLLSD["cloudColorY"].asReal(),
+                        windLightLLSD["cloudColorZ"].asReal(),
+                        windLightLLSD["cloudColorW"].asReal());
+
+                mSky->set("cloud_pos_density1",
+                        windLightLLSD["cloudXYDensityX"].asReal(),
+                        windLightLLSD["cloudXYDensityY"].asReal(),
+                        windLightLLSD["cloudXYDensityZ"].asReal(),
+                        1.f);
+
+                mSky->set("cloud_pos_density2",
+                        windLightLLSD["cloudDetailXYDensityX"].asReal(),
+                        windLightLLSD["cloudDetailXYDensityY"].asReal(),
+                        windLightLLSD["cloudDetailXYDensityZ"].asReal(),
+                        1.f);
+
+                mSky->set("cloud_scale",
+                        windLightLLSD["cloudScale"].asReal(),
+                        0.f, 0.f, 1.f);
+
+                mSky->set("gamma",
+                        windLightLLSD["sceneGamma"].asReal(),
+                        0.f, 0.f, 1.f);
+
+                mSky->set("glow",
+                        (2 - windLightLLSD["sunGlowSize"].asReal()) * 20,
+                        0.f,
+                        -windLightLLSD["sunGlowFocus"].asReal() * 5,
+                        1.f);
+
+                mSky->setCloudScrollX(windLightLLSD["cloudScrollX"].asReal() + 10.0f);
+                mSky->setCloudScrollY(windLightLLSD["cloudScrollY"].asReal() + 10.0f);
+
+                mSky->setEnableCloudScrollX(!windLightLLSD["cloudScrollXLock"].asBoolean());
+                mSky->setEnableCloudScrollY(!windLightLLSD["cloudScrollYLock"].asBoolean());
+
+                mSky->setStarBrightness(windLightLLSD["starBrightness"].asReal());
+
+                mSky->set("fade", windLightLLSD["fade"].asReal());
+
+                WLFloaterManager::mMinAltParamList[windLightLLSD["Name"].asString()] = windLightLLSD["minEffectiveAltitude"].asReal();
+                WLFloaterManager::mMaxAltParamList[windLightLLSD["Name"].asString()] = windLightLLSD["maxEffectiveAltitude"].asReal();
+                WLFloaterManager::mFadeParamList[windLightLLSD["Name"].asString()] = windLightLLSD["fade"].asReal();
+
+                WLFloaterManager::mWLParamList[windLightLLSD["Name"].asString()] = mSky;
+                WLFloaterManager::mWaterParamList[windLightLLSD["Name"].asString()] = mWater;
+                WLFloaterManager::mWaterNormalParamList[windLightLLSD["Name"].asString()] = mWaterNormal;
+        }
+        WLFloaterManager::UpdateFloater();
+}
+
+//If we get back an error (not found, etc...), handle it here
+void retrieveWindlightSettings::error(U32 status, const std::string& reason)
+{
+        LL_INFOS("Inventory") << "retrieveWindlightSettings::error "
+                << status << ": " << reason << LL_ENDL;
+}
\ No newline at end of file
diff --git a/linden/indra/newview/wlretrievesettings.h b/linden/indra/newview/wlretrievesettings.h
new file mode 100644
index 0000000..d75d0d1
--- /dev/null
+++ b/linden/indra/newview/wlretrievesettings.h
@@ -0,0 +1,59 @@
+/** 
+ * @file wlfloaterwindlightsend.h
+ * @brief WLFloaterWindLightSend class definition
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2009, 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
+ * ("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
+ * 
+ * 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
+ * 
+ * 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.
+ * 
+ * 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$
+ */
+
+/*
+ * Menu for adjusting the atmospheric settings of the world
+ */
+
+
+#include <string>
+#include "llwlparamset.h"
+#include "llwaterparamset.h"
+#include "lluuid.h"
+
+class LLSD;
+class LLTimer;
+class LLUUID;
+class LLWaterParamSet;
+class LLWLParamSet;
+
+
+/// Menuing system for all of windlight's functionality
+class retrieveWindlightSettings: public LLHTTPClient::Responder
+{
+public:
+        retrieveWindlightSettings(const LLSD& request_sd) : mRequestSD(request_sd) {};
+        void result(const LLSD& content);                       
+        void error(U32 status, const std::string& reason);
+protected:
+        LLSD mRequestSD;
+};
\ No newline at end of file
diff --git a/linden/indra/newview/wlsettingsmanager.cpp b/linden/indra/newview/wlsettingsmanager.cpp
new file mode 100644
index 0000000..853d14f
--- /dev/null
+++ b/linden/indra/newview/wlsettingsmanager.cpp
@@ -0,0 +1,253 @@
+/** 
+* @file wlfloaterwindlightsend.cpp
+* @brief WLFloaterWindLightSend class definition
+*
+* $LicenseInfo:firstyear=2007&license=viewergpl$
+* 
+* Copyright (c) 2007-2009, 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
+* ("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
+* 
+* 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
+* 
+* 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.
+* 
+* 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"
+
+#include "llfloaterwindlight.h"
+
+#include "pipeline.h"
+#include "llsky.h"
+
+#include "llsliderctrl.h"
+#include "llmultislider.h"
+#include "llmultisliderctrl.h"
+#include "llspinctrl.h"
+#include "llcheckboxctrl.h"
+#include "lluictrlfactory.h"
+#include "llviewercamera.h"
+#include "llcombobox.h"
+#include "lllineeditor.h"
+#include "llfloaterdaycycle.h"
+#include "lltabcontainer.h"
+#include "llboost.h"
+
+#include "llagent.h"
+#include "llinventorymodel.h"
+#include "llviewerinventory.h"
+
+#include "v4math.h"
+#include "llviewerdisplay.h"
+#include "llviewercontrol.h"
+#include "llviewerwindow.h"
+#include "llsavedsettingsglue.h"
+
+#include "llwlparamset.h"
+#include "llwlparammanager.h"
+#include "llwaterparammanager.h"
+#include "llpostprocess.h"
+#include "hippoLimits.h"
+#include "wlfloaterwindlightsend.h"
+#include "llviewerregion.h"
+#include "wlsettingsmanager.h"
+#include "lightshare.h"
+
+#include "linden_common.h"
+#include "llviewercontrol.h"
+#include "message.h"
+#include "meta7windlight.h"
+#include "llworld.h"
+
+#undef max
+
+const std::string WLSettingsManager::wlWaterPresetName = "(Region settings)";
+const std::string WLSettingsManager::wlSkyPresetName   = "(Region settings)";
+
+LLTimer* WLSettingsManager::wlIgnoreTimer = new LLTimer();
+bool WLSettingsManager::wlIgnoreRegion = false;
+LLWaterParamSet* WLSettingsManager::mWater = NULL;
+LLWLParamSet* WLSettingsManager::mSky = NULL;
+LLUUID* WLSettingsManager::mWaterNormal = NULL;
+
+void WLSettingsManager::Apply( LLWLParamSet* Sky, LLWaterParamSet* Water, LLUUID* WaterNormal )
+{
+        if( gSavedSettings.getU32("LightShareAllowed") <= WindlightMessage::LIGHTSHARE_NEVER )
+                return;
+
+        std::string water = LLWaterParamManager::instance()->mCurParams.mName;
+        std::string sky = LLWLParamManager::instance()->mCurParams.mName;
+
+        // If they are using region settings already, or LightShare is
+        // always allowed, just apply the new settings, don't bother asking.
+        if( gSavedSettings.getU32("LightShareAllowed") == WindlightMessage::LIGHTSHARE_ALWAYS ||
+            (sky == wlSkyPresetName && water == wlWaterPresetName) )
+        {
+                mSky = Sky;
+                mWater = Water;
+                mWaterNormal = WaterNormal;
+                Apply();
+                return;
+        }
+
+        if( !wlignoreTimerHasExpired() )
+        {
+                // The user recently ignored a windlight message, so ignore
+                // this one too, and restart the timer.
+                wlrestartIgnoreTimer();
+                return;
+        }
+
+        if(wlIgnoreRegion)
+        {
+                // We are ignoring new settings until user enters a new region.
+                return;
+        }
+
+        if( gSavedSettings.getU32("LightShareAllowed") == WindlightMessage::LIGHTSHARE_ASK &&
+            mSky == NULL && mWater == NULL)
+        {
+                // No most recent, so store this and create notification
+                // asking the user whether to apply or not.
+                mSky = Sky;
+                mWater = Water;
+                mWaterNormal = WaterNormal;
+                LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(), 
+                                                boost::bind(&wlapplyCallback, _1, _2));
+        }
+        else
+        {
+                // No new notification (to avoid spamming the user, we do keep the saves from above)
+                mSky = Sky;
+                mWater = Water;
+                mWaterNormal = WaterNormal;
+        }
+}
+
+// static
+bool WLSettingsManager::wlapplyCallback(const LLSD& notification,
+                                     const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+
+        switch(option)
+        {
+                case 0:{
+                        // "Apply"
+                        Apply();
+                        break;
+                }
+                case 1:{
+                        // "Not Now", ignore until the region stops spamming
+                        wlrestartIgnoreTimer();
+                        break;
+                }
+                case 2:{
+                        // "Ignore", ignore all until user leaves the region
+                        wlIgnoreRegion = true;
+                        break;
+                }
+        }
+        return false;
+}
+
+//static
+void WLSettingsManager::Apply()
+{
+        LLWaterParamManager* water_mgr = LLWaterParamManager::instance();
+        LLWLParamManager* sky_mgr = LLWLParamManager::instance();
+
+        F32 fade = 0; //Instant
+        bool error;
+        fade = mSky->getFloat("fade", error);
+
+        mWater->mName = wlWaterPresetName;
+        if(fade != 0 && water_mgr->mCurParams.mName == wlWaterPresetName)//Load the settings forcefully the first time
+        {
+                LLWaterParamSet oldWset = water_mgr->mCurParams;
+                //This still needs done so that we update right, but load it to the old
+                water_mgr->removeParamSet( wlWaterPresetName, false );
+                water_mgr->addParamSet( wlWaterPresetName, oldWset );
+                water_mgr->savePreset( wlWaterPresetName );
+                water_mgr->loadPreset( wlWaterPresetName, true );
+                water_mgr->setNormalMapID( *mWaterNormal );
+                //Then mix with the new
+                water_mgr->SetMixTime(mWater, fade);
+        }
+        else
+        {
+                //Instant if fade is 0
+                water_mgr->removeParamSet( wlWaterPresetName, false );
+                water_mgr->addParamSet( wlWaterPresetName, *mWater );
+                water_mgr->savePreset( wlWaterPresetName );
+                water_mgr->loadPreset( wlWaterPresetName, true );
+                water_mgr->setNormalMapID( *mWaterNormal );
+        }
+
+        mSky->mName = wlSkyPresetName;
+        if(fade != 0 && sky_mgr->mCurParams.mName == wlSkyPresetName)//Load the settings forcefully the first time
+        {
+                LLWLParamSet oldset = sky_mgr->mCurParams;
+                //This still needs done so that we update right, but load it to the old
+                sky_mgr->removeParamSet( wlSkyPresetName, true );
+                sky_mgr->addParamSet( wlSkyPresetName, oldset );
+                sky_mgr->savePreset( wlSkyPresetName );
+                sky_mgr->loadPreset( wlSkyPresetName, true );
+                //Then mix with the new
+                sky_mgr->SetMixTime(mSky, fade);
+        }
+        else
+        {
+                //Instant if fade is 0
+                sky_mgr->mAnimator.mIsRunning = false;
+                sky_mgr->mAnimator.mUseLindenTime = false;
+                sky_mgr->removeParamSet( wlSkyPresetName, false );
+                sky_mgr->addParamSet( wlSkyPresetName, *mSky );
+                sky_mgr->savePreset( wlSkyPresetName );
+                sky_mgr->loadPreset( wlSkyPresetName, true );
+        }
+
+        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
+
+        mSky = NULL;
+        mWater = NULL;
+        mWaterNormal = NULL;
+}
+
+// static
+void WLSettingsManager::wlresetRegion()
+{
+        wlIgnoreRegion = false;
+        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
+}
+
+// static
+void WLSettingsManager::wlrestartIgnoreTimer()
+{
+        F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");
+        wlIgnoreTimer->start();
+        wlIgnoreTimer->setTimerExpirySec( (time < 0) ? 0 : time );
+}
+
+// static
+bool WLSettingsManager::wlignoreTimerHasExpired()
+{
+        return wlIgnoreTimer->hasExpired();
+}
\ No newline at end of file
diff --git a/linden/indra/newview/wlsettingsmanager.h b/linden/indra/newview/wlsettingsmanager.h
new file mode 100644
index 0000000..5a0e9e7
--- /dev/null
+++ b/linden/indra/newview/wlsettingsmanager.h
@@ -0,0 +1,90 @@
+/** 
+ * @file wlfloaterwindlightsend.h
+ * @brief WLFloaterWindLightSend class definition
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2009, 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
+ * ("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
+ * 
+ * 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
+ * 
+ * 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.
+ * 
+ * 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$
+ */
+
+/*
+ * Menu for adjusting the atmospheric settings of the world
+ */
+
+#ifndef WINDLIGHTSETTINGSMANAGER_H
+#define WINDLIGHTSETTINGSMANAGER_H
+
+#include <string>
+#include "llwlparamset.h"
+#include "llwaterparamset.h"
+#include "lluuid.h"
+
+class LLSD;
+class LLTimer;
+class LLUUID;
+class LLWaterParamSet;
+class LLWLParamSet;
+
+
+/// Menuing system for all of windlight's functionality
+class WLSettingsManager
+{
+public:
+
+        static LLTimer* wlIgnoreTimer;
+        static bool wlIgnoreRegion;
+
+        // Called after the user has entered a new region, to reset the
+        // "ignore while in this region" state.
+        static void wlresetRegion();
+
+        static void Apply( LLWLParamSet* Sky, LLWaterParamSet* Water, LLUUID* WaterNormal );
+
+        // Callback when the user interacts with the notification.
+        static bool wlapplyCallback(const LLSD& notification,
+                                  const LLSD& response);
+
+        static LLWaterParamSet* mWater;
+        static LLWLParamSet* mSky;
+        static LLUUID* mWaterNormal;
+
+private:
+        static void Apply();
+
+        // The name of the water preset where the region settings are stored.
+        static const std::string wlWaterPresetName;
+
+        // The name of the sky preset where the region settings are stored.
+        static const std::string wlSkyPresetName;
+
+        // Restart the timer for temporarily ignoring settings.
+        static void wlrestartIgnoreTimer();
+
+        // Returns true if the ignore timer has expired (i.e. new settings
+        // should not be ignored anymore).
+        static bool wlignoreTimerHasExpired();
+};
+#endif
\ No newline at end of file
diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index a16034f..f09fc48 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -534,24 +534,24 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
                                                          platform, 
                                                          cache_dir))
         to_install = []
+        to_uninstall = []
         #print "self._installed",self._installed
         for ifile in ifiles:
             if ifile.pkgname not in self._installed:
                 to_install.append(ifile)
             elif ifile.url not in self._installed[ifile.pkgname].urls():
+                to_uninstall.append(ifile.pkgname)
                 to_install.append(ifile)
             elif ifile.md5sum != \
                  self._installed[ifile.pkgname].get_md5sum(ifile.url):
-                # *TODO: We may want to uninstall the old version too
-                # when we detect it is installed, but the md5 sum is
-                # different.
+                to_uninstall.append(ifile.pkgname)
                 to_install.append(ifile)
             else:
                 #print "Installation up to date:",
                 #        ifile.pkgname,ifile.platform_path
                 pass
         #print "to_install",to_install
-        return to_install
+        return [to_install, to_uninstall]
 
     def _install(self, to_install, install_dir):
         for ifile in to_install:
@@ -620,12 +620,17 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
         cache_dir = os.path.realpath(cache_dir)
         _mkdir(install_dir)
         _mkdir(cache_dir)
-        to_install = self._build_ifiles(platform, cache_dir)
+        to_install_uninstall = self._build_ifiles(platform, cache_dir)
+        to_install = to_install_uninstall[0]
+        to_uninstall = to_install_uninstall[1]
 
         # Filter for files which we actually requested to install.
         to_install = [ifl for ifl in to_install if ifl.pkgname in installables]
+        to_uninstall = [ifl for ifl in to_uninstall if ifl in installables]
         for ifile in to_install:
             ifile.fetch_local()
+        if to_uninstall:
+            self.uninstall(to_uninstall, install_dir)
         self._install(to_install, install_dir)
 
     def do_install(self, installables, platform, install_dir, cache_dir=None,