Merge remote-tracking branch 'imprudence/exp' into exp

Conflicts (for future reference):
	linden/indra/llcommon/llstring.cpp
	linden/indra/newview/llpanelnetwork.cpp
	linden/indra/newview/llselectmgr.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/lltoolmgr.cpp
	linden/indra/newview/llvoavatar.cpp

130 files changed, 8542 insertions, 1826 deletions

diff --git a/linden/indra/llcommon/imageids.cpp b/linden/indra/llcommon/imageids.cpp
index 6b4fcd3..e5343fe 100644
--- a/linden/indra/llcommon/imageids.cpp
+++ b/linden/indra/llcommon/imageids.cpp
@@ -75,3 +75,5 @@ const LLUUID TERRAIN_MOUNTAIN_DETAIL	("303cd381-8560-7579-23f1-f0a880799740"); /
 const LLUUID TERRAIN_ROCK_DETAIL                ("53a2f406-4895-1d13-d541-d2e3b86bc19c"); // VIEWER
 
 const LLUUID DEFAULT_WATER_NORMAL               ("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); // VIEWER
+
+const LLUUID DEFAULT_UNREZZED_AVATAR_PARTICLE   ("c6e07fda-aea5-4149-acb6-6f09980e0db5"); // VIEWER only
diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h
index dc726dc..516fda1 100644
--- a/linden/indra/llcommon/imageids.h
+++ b/linden/indra/llcommon/imageids.h
@@ -72,4 +72,5 @@ LL_COMMON_API extern const LLUUID TERRAIN_ROCK_DETAIL;
 
 LL_COMMON_API extern const LLUUID DEFAULT_WATER_NORMAL;
 
+LL_COMMON_API extern const LLUUID DEFAULT_UNREZZED_AVATAR_PARTICLE;
 #endif
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index 32a75c0..069365b 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -50,7 +50,8 @@ std::string ll_safe_string(const char* in)
 
 std::string ll_safe_string(const char* in, S32 maxlen)
 {
-        if(in) return std::string(in, maxlen);
+//KOKUA FIXME:  Which wormhole all the antistrings (strings with negative length) come from ?
+        if(in && maxlen > 0) return std::string(in, maxlen);
         return std::string();
 }
 
diff --git a/linden/indra/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp
index a56ac47..95dd2e5 100644
--- a/linden/indra/llcommon/llsys.cpp
+++ b/linden/indra/llcommon/llsys.cpp
@@ -76,6 +76,75 @@ extern int errno;
 static const S32 CPUINFO_BUFFER_SIZE = 16383;
 LLCPUInfo gSysCPU;
 
+#if LL_WINDOWS
+#ifndef DLLVERSIONINFO
+typedef struct _DllVersionInfo
+{
+    DWORD cbSize;
+    DWORD dwMajorVersion;
+    DWORD dwMinorVersion;
+    DWORD dwBuildNumber;
+    DWORD dwPlatformID;
+}DLLVERSIONINFO;
+#endif
+
+#ifndef DLLGETVERSIONPROC
+typedef int (FAR WINAPI *DLLGETVERSIONPROC) (DLLVERSIONINFO *);
+#endif
+
+bool get_shell32_dll_version(DWORD& major, DWORD& minor, DWORD& build_number)
+{
+        bool result = false;
+        const U32 BUFF_SIZE = 32767;
+        WCHAR tempBuf[BUFF_SIZE];
+        if(GetSystemDirectory((LPWSTR)&tempBuf, BUFF_SIZE))
+        {
+                
+                std::basic_string<WCHAR> shell32_path(tempBuf);
+
+                // Shell32.dll contains the DLLGetVersion function. 
+                // according to msdn its not part of the API
+                // so you have to go in and get it.
+                // http://msdn.microsoft.com/en-us/library/bb776404(VS.85).aspx
+                shell32_path += TEXT("\\shell32.dll");
+
+                HMODULE hDllInst = LoadLibrary(shell32_path.c_str());   //load the DLL
+                if(hDllInst) 
+                {  // Could successfully load the DLL
+                        DLLGETVERSIONPROC pDllGetVersion;
+                        /*
+                        You must get this function explicitly because earlier versions of the DLL
+                        don't implement this function. That makes the lack of implementation of the
+                        function a version marker in itself.
+                        */
+                        pDllGetVersion = (DLLGETVERSIONPROC) GetProcAddress(hDllInst, 
+                                                                                                                                "DllGetVersion");
+
+                        if(pDllGetVersion) 
+                        {    
+                                // DLL supports version retrieval function
+                                DLLVERSIONINFO    dvi;
+
+                                ZeroMemory(&dvi, sizeof(dvi));
+                                dvi.cbSize = sizeof(dvi);
+                                HRESULT hr = (*pDllGetVersion)(&dvi);
+
+                                if(SUCCEEDED(hr)) 
+                                { // Finally, the version is at our hands
+                                        major = dvi.dwMajorVersion;
+                                        minor = dvi.dwMinorVersion;
+                                        build_number = dvi.dwBuildNumber;
+                                        result = true;
+                                } 
+                        } 
+
+                        FreeLibrary(hDllInst);  // Release DLL
+                } 
+        }
+        return result;
+}
+#endif // LL_WINDOWS
+
 LLOSInfo::LLOSInfo() :
         mMajorVer(0), mMinorVer(0), mBuild(0)
 {
@@ -98,44 +167,74 @@ LLOSInfo::LLOSInfo() :
         mMinorVer = osvi.dwMinorVersion;
         mBuild = osvi.dwBuildNumber;
 
+        DWORD shell32_major, shell32_minor, shell32_build;
+        bool got_shell32_version = get_shell32_dll_version(shell32_major, 
+                                                                                                           shell32_minor, 
+                                                                                                           shell32_build);
+
         switch(osvi.dwPlatformId)
         {
         case VER_PLATFORM_WIN32_NT:
                 {
                         // Test for the product.
-                        if(osvi.dwMajorVersion <= 4)
+                        if (osvi.dwMajorVersion <= 4)
                         {
                                 mOSStringSimple = "Microsoft Windows NT ";
                         }
-                        else if(osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
+                        else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0)
                         {
                                 mOSStringSimple = "Microsoft Windows 2000 ";
                         }
-                        else if(osvi.dwMajorVersion ==5 && osvi.dwMinorVersion == 1)
+                        else if (osvi.dwMajorVersion ==5 && osvi.dwMinorVersion == 1)
                         {
                                 mOSStringSimple = "Microsoft Windows XP ";
                         }
-                        else if(osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
+                        else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
                         {
-                                 if(osvi.wProductType == VER_NT_WORKSTATION)
+                                if (osvi.wProductType == VER_NT_WORKSTATION)
+                                {
                                         mOSStringSimple = "Microsoft Windows XP x64 Edition ";
-                                 else
-                                         mOSStringSimple = "Microsoft Windows Server 2003 ";
+                                }
+                                else
+                                {
+                                        mOSStringSimple = "Microsoft Windows Server 2003 ";
+                                }
                         }
-                        else if(osvi.dwMajorVersion == 6 && osvi.dwMinorVersion <= 1)
+                        else if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion <= 2)
                         {
-                                if(osvi.dwMinorVersion == 0)
+                                if (osvi.dwMinorVersion == 0)
                                 {
-                                        mOSStringSimple = "Microsoft Windows Vista ";
+                                        if (osvi.wProductType == VER_NT_WORKSTATION)
+                                        {
+                                                mOSStringSimple = "Microsoft Windows Vista ";
+                                        }
+                                        else
+                                        {
+                                                mOSStringSimple = "Windows Server 2008 ";
+                                        }
+
                                 }
-                                else if(osvi.dwMinorVersion == 1)
+                                else if (osvi.dwMinorVersion == 1)
                                 {
-                                        mOSStringSimple = "Microsoft Windows 7 ";
+                                        if (osvi.wProductType == VER_NT_WORKSTATION)
+                                        {
+                                                mOSStringSimple = "Microsoft Windows 7 ";
+                                        }
+                                        else
+                                        {
+                                                mOSStringSimple = "Windows Server 2008 R2 ";
+                                        }
                                 }
-
-                                if(osvi.wProductType != VER_NT_WORKSTATION)
+                                else if (osvi.dwMinorVersion == 2)
                                 {
-                                        mOSStringSimple += "Server ";
+                                        if (osvi.wProductType == VER_NT_WORKSTATION)
+                                        {
+                                                mOSStringSimple = "Microsoft Windows 8 ";
+                                        }
+                                        else
+                                        {
+                                                mOSStringSimple = "Windows Server 2012 ";
+                                        }
                                 }
 
                                 ///get native system info if available..
@@ -146,8 +245,8 @@ LLOSInfo::LLOSInfo() :
                                 pGNSI = (PGNSI) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),  "GetNativeSystemInfo"); //load kernel32 get function
                                 if(NULL != pGNSI) //check if it has failed
                                         pGNSI(&si); //success
-                                else
-                                        GetSystemInfo(&si); //if it fails get regular system info
+                                else 
+                                        GetSystemInfo(&si); //if it fails get regular system info 
                                 //(Warning: If GetSystemInfo it may result in incorrect information in a WOW64 machine, if the kernel fails to load)
 
                                 //msdn microsoft finds 32 bit and 64 bit flavors this way..
@@ -206,6 +305,7 @@ LLOSInfo::LLOSInfo() :
                                                                   csdversion.c_str(),
                                                                   (osvi.dwBuildNumber & 0xffff));
                         }
+
                         mOSString = mOSStringSimple + tmpstr;
                 }
                 break;
@@ -235,6 +335,20 @@ LLOSInfo::LLOSInfo() :
                 mOSString = mOSStringSimple;
                 break;
         }
+
+        std::string compatibility_mode;
+        if(got_shell32_version)
+        {
+                if(osvi.dwMajorVersion != shell32_major || osvi.dwMinorVersion != shell32_minor)
+                {
+                        compatibility_mode = llformat(" compatibility mode. real ver: %d.%d (Build %d)", 
+                                                                                        shell32_major,
+                                                                                        shell32_minor,
+                                                                                        shell32_build);
+                }
+        }
+        mOSString += compatibility_mode;
+
 #else
         struct utsname un;
         if(uname(&un) != -1)
@@ -262,8 +376,8 @@ LLOSInfo::LLOSInfo() :
                 else if (ostype == "Linux")
                 {
                         // Only care about major and minor Linux versions, truncate at second '.'
-                        S32 idx1 = mOSStringSimple.find_first_of(".", 0);
-                        S32 idx2 = (idx1 != std::string::npos) ? mOSStringSimple.find_first_of(".", idx1+1) : std::string::npos;
+                        std::string::size_type idx1 = mOSStringSimple.find_first_of(".", 0);
+                        std::string::size_type idx2 = (idx1 != std::string::npos) ? mOSStringSimple.find_first_of(".", idx1+1) : std::string::npos;
                         std::string simple = mOSStringSimple.substr(0, idx2);
                         if (simple.length() > 0)
                                 mOSStringSimple = simple;
@@ -429,15 +543,15 @@ LLCPUInfo::LLCPUInfo()
         mHasSSE = info->_Ext.SSE_StreamingSIMD_Extensions;
         mHasSSE2 = info->_Ext.SSE2_StreamingSIMD2_Extensions;
         mHasAltivec = info->_Ext.Altivec_Extensions;
-        mCPUMhz = (S32)(proc.GetCPUFrequency(50)/1000000.0);
+        mCPUMHz = (F64)(proc.GetCPUFrequency(50)/1000000.0);
         mFamily.assign( info->strFamily );
         mCPUString = "Unknown";
 
 #if LL_WINDOWS || LL_DARWIN || LL_SOLARIS
         out << proc.strCPUName;
-        if (200 < mCPUMhz && mCPUMhz < 10000)           // *NOTE: cpu speed is often way wrong, do a sanity check
+        if (200 < mCPUMHz && mCPUMHz < 10000)           // *NOTE: cpu speed is often way wrong, do a sanity check
         {
-                out << " (" << mCPUMhz << " MHz)";
+                out << " (" << mCPUMHz << " MHz)";
         }
         mCPUString = out.str();
         
@@ -482,7 +596,7 @@ LLCPUInfo::LLCPUInfo()
         if (LLStringUtil::convertToF64(cpuinfo["cpu mhz"], mhz)
             && 200.0 < mhz && mhz < 10000.0)
         {
-                mCPUMhz = (S32)llrint(mhz);
+                mCPUMHz = (F64)llrint(mhz);
         }
         if (!cpuinfo["model name"].empty())
                 mCPUString = cpuinfo["model name"];
@@ -505,9 +619,9 @@ bool LLCPUInfo::hasSSE2() const
         return mHasSSE2;
 }
 
-S32 LLCPUInfo::getMhz() const
+F64 LLCPUInfo::getMHz() const
 {
-        return mCPUMhz;
+        return mCPUMHz;
 }
 
 std::string LLCPUInfo::getCPUString() const
@@ -554,7 +668,7 @@ void LLCPUInfo::stream(std::ostream& s) const
         s << "->mHasSSE:     " << (U32)mHasSSE << std::endl;
         s << "->mHasSSE2:    " << (U32)mHasSSE2 << std::endl;
         s << "->mHasAltivec: " << (U32)mHasAltivec << std::endl;
-        s << "->mCPUMhz:     " << mCPUMhz << std::endl;
+        s << "->mCPUMHz:     " << mCPUMHz << std::endl;
         s << "->mCPUString:  " << mCPUString << std::endl;
 }
 
@@ -631,6 +745,26 @@ U32 LLMemoryInfo::getPhysicalMemoryClamped() const
         }
 }
 
+//static
+void LLMemoryInfo::getAvailableMemoryKB(U32& avail_physical_mem_kb, U32& avail_virtual_mem_kb)
+{
+#if LL_WINDOWS
+        MEMORYSTATUSEX state;
+        state.dwLength = sizeof(state);
+        GlobalMemoryStatusEx(&state);
+
+        avail_physical_mem_kb = (U32)(state.ullAvailPhys/1024) ;
+        avail_virtual_mem_kb = (U32)(state.ullAvailVirtual/1024) ;
+
+#else
+        //do not know how to collect available memory info for other systems.
+        //leave it blank here for now.
+
+        avail_physical_mem_kb = -1 ;
+        avail_virtual_mem_kb = -1 ;
+#endif
+}
+
 void LLMemoryInfo::stream(std::ostream& s) const
 {
 #if LL_WINDOWS
diff --git a/linden/indra/llcommon/llsys.h b/linden/indra/llcommon/llsys.h
index d5575b2..e481c88 100644
--- a/linden/indra/llcommon/llsys.h
+++ b/linden/indra/llcommon/llsys.h
@@ -81,7 +81,7 @@ public:
         bool hasAltivec() const;
         bool hasSSE() const;
         bool hasSSE2() const;
-        S32      getMhz() const;
+        F64 getMHz() const;
 
         // Family is "AMD Duron" or "Intel Pentium Pro"
         const std::string& getFamily() const { return mFamily; }
@@ -90,7 +90,7 @@ private:
         bool mHasSSE;
         bool mHasSSE2;
         bool mHasAltivec;
-        S32 mCPUMhz;
+        F64 mCPUMHz;
         std::string mFamily;
         std::string mCPUString;
 };
@@ -120,6 +120,9 @@ public:
         **  be returned.
         */
         U32 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes
+
+        //get the available memory infomation in KiloBytes.
+        static void getAvailableMemoryKB(U32& avail_physical_mem_kb, U32& avail_virtual_mem_kb);
 };
 
 
diff --git a/linden/indra/llimage/llimageworker.cpp b/linden/indra/llimage/llimageworker.cpp
index dc989e5..5e61f69 100644
--- a/linden/indra/llimage/llimageworker.cpp
+++ b/linden/indra/llimage/llimageworker.cpp
@@ -164,7 +164,7 @@ void LLImageDecodeThread::ImageRequest::finishRequest(bool completed)
 {
         if (mResponder.notNull())
         {
-                bool success = completed && mDecodedRaw && (!mNeedsAux || mDecodedAux);
+                bool success = completed && mDecodedRaw && mDecodedImageRaw->getDataSize() && (!mNeedsAux || mDecodedAux);
                 mResponder->completed(success, mDecodedImageRaw, mDecodedImageAux);
         }
         // Will automatically be deleted
diff --git a/linden/indra/llimagej2coj/llimagej2coj.cpp b/linden/indra/llimagej2coj/llimagej2coj.cpp
index fd92370..f003d60 100644
--- a/linden/indra/llimagej2coj/llimagej2coj.cpp
+++ b/linden/indra/llimagej2coj/llimagej2coj.cpp
@@ -152,13 +152,8 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
         /* open a byte stream */
         cio = opj_cio_open((opj_common_ptr)dinfo, base.getData(), base.getDataSize());
 
-        /* decode the stream and fill the image structure, also fill in an additional
-           structure to get the decoding result. This structure is a bit unusual in that
-           it is not received through opj, but still has some dynamically allocated fields
-           that need to be cleared up at the end by calling a destroy function. */
-        opj_codestream_info_t cinfo;
-        memset(&cinfo, 0, sizeof(opj_codestream_info_t));
-        image = opj_decode_with_info(dinfo, cio, &cinfo);
+        /* decode the stream and fill the image structure */
+        image = opj_decode(dinfo, cio);
 
         /* close the byte stream */
         opj_cio_close(cio);
@@ -175,6 +170,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
         if(!image) 
         {
                 LL_DEBUGS("Openjpeg")  << "ERROR -> decodeImpl: failed to decode image - no image" << LL_ENDL;
+                base.decodeFailed();
                 return TRUE; // done
         }
 
@@ -185,51 +181,35 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
                 LL_DEBUGS("Openjpeg") << "ERROR -> decodeImpl: failed to decode image wrong number of components: " << img_components << LL_ENDL;
                 if (image)
                 {
-                        opj_destroy_cstr_info(&cinfo);
                         opj_image_destroy(image);
                 }
 
+                base.decodeFailed();
                 return TRUE; // done
         }
 
         // sometimes we get bad data out of the cache - check to see if the decode succeeded
-        int decompdifference = 0;
-        if (cinfo.numdecompos) // sanity
+        for (S32 i = 0; i < img_components; i++)
         {
-                for (int comp = 0; comp < image->numcomps; comp++)
-                {       /* get maximum decomposition level difference, first field is from the COD header and the second
-                           is what is actually met in the codestream, NB: if everything was ok, this calculation will
-                           return what was set in the cp_reduce value! */
-                        decompdifference = llmax(decompdifference, cinfo.numdecompos[comp] - image->comps[comp].resno_decoded);
-                }
-                if (decompdifference < 0) // sanity
+                if (image->comps[i].factor != base.getRawDiscardLevel())
                 {
-                        decompdifference = 0;
+                        // if we didn't get the discard level we're expecting, fail
+                        if (image) //anyway somthing odd with the image, better check than crash
+                                opj_image_destroy(image);
+                        base.decodeFailed();
+                        return TRUE;
                 }
         }
         
-
-        /* if OpenJPEG failed to decode all requested decomposition levels
-           the difference will be greater than this level */
-        if (decompdifference > base.getRawDiscardLevel())
-        {
-                llwarns << "not enough data for requested discard level, setting mDecoding to FALSE, difference: " << (decompdifference - base.getRawDiscardLevel()) << llendl;
-                opj_destroy_cstr_info(&cinfo);
-                opj_image_destroy(image);
-                base.mDecoding = FALSE;
-                return TRUE;
-        }
-
         if(img_components <= first_channel)
         {
-                // sanity
                 LL_DEBUGS("Openjpeg") << "trying to decode more channels than are present in image: numcomps: " << img_components << " first_channel: " << first_channel << LL_ENDL;
                 if (image)
                 {
-                        opj_destroy_cstr_info(&cinfo);
                         opj_image_destroy(image);
                 }
                         
+                base.decodeFailed();
                 return TRUE;
         }
 
@@ -275,17 +255,16 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
                 else // Some rare OpenJPEG versions have this bug.
                 {
                         llwarns << "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)" << llendl;
-                        opj_destroy_cstr_info(&cinfo);
                         opj_image_destroy(image);
 
+                        base.decodeFailed();
                         return TRUE; // done
                 }
         }
 
-        /* free opj data structures */
+        /* free image data structure */
         if (image)
         {
-                opj_destroy_cstr_info(&cinfo);
                 opj_image_destroy(image);
         }
 
diff --git a/linden/indra/llinventory/lleconomy.cpp b/linden/indra/llinventory/lleconomy.cpp
index 4366d1e..2e98112 100644
--- a/linden/indra/llinventory/lleconomy.cpp
+++ b/linden/indra/llinventory/lleconomy.cpp
@@ -44,7 +44,7 @@ LLGlobalEconomy::LLGlobalEconomy()
         mPricePublicObjectDecay( -1 ),
         mPricePublicObjectDelete( -1 ),
         mPriceEnergyUnit( -1 ),
-        mPriceUpload( -1 ),
+        mPriceUpload( 0 ),
         mPriceRentLight( -1 ),
         mTeleportMinPrice( -1 ),
         mTeleportPriceExponent( -1 ),
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index c4c3f07..618048c 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -3583,7 +3583,7 @@ S32 LLVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
         if (face == -1) // ALL_SIDES
         {
                 start_face = 0;
-                end_face = getNumFaces() - 1;
+                end_face = getNumVolumeFaces() - 1;
         }
         else
         {
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h
index 0b9002f..77af2c4 100644
--- a/linden/indra/llmath/llvolume.h
+++ b/linden/indra/llmath/llvolume.h
@@ -949,9 +949,11 @@ public:
         LLVector3                       mLODScaleBias;          // vector for biasing LOD based on scale
         
         void sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level);
+
+        F32 sculptGetSurfaceArea();
+
 private:
         void sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type);
-        F32 sculptGetSurfaceArea();
         void sculptGeneratePlaceholder();
         void sculptCalcMeshResolution(U16 width, U16 height, U8 type, S32& s, S32& t);
 
diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt
index 9965191..b3f2b4c 100644
--- a/linden/indra/llmessage/CMakeLists.txt
+++ b/linden/indra/llmessage/CMakeLists.txt
@@ -98,6 +98,7 @@ set(llmessage_SOURCE_FILES
     patch_code.cpp
     patch_dct.cpp
     patch_idct.cpp
+    llsocks5.cpp
     sound_ids.cpp
     )
 
@@ -198,6 +199,7 @@ set(llmessage_HEADER_FILES
     patch_code.h
     patch_dct.h
     sound_ids.h
+    llsocks5.h
     )
 
 set_source_files_properties(${llmessage_HEADER_FILES}
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index 9ecfee4..b23ef33 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -56,6 +56,8 @@
 #include "llsdserialize.h"
 #include "llthread.h"
 
+#include "llsocks5.h"
+
 //////////////////////////////////////////////////////////////////////////////
 /*
         The trick to getting curl to do keep-alives is to reuse the
@@ -270,6 +272,25 @@ LLCurl::Easy* LLCurl::Easy::getEasy()
         // set no DMS caching as default for all easy handles. This prevents them adopting a
         // multi handles cache if they are added to one.
         curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 0);
+        
+        if (LLSocks::getInstance()->isHttpProxyEnabled())
+        {
+                std::string address = LLSocks::getInstance()->getHTTPProxy().getIPString();
+                U16 port = LLSocks::getInstance()->getHTTPProxy().getPort();
+                curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_PROXY,address.c_str());
+                curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_PROXYPORT,port);
+                if (LLSocks::getInstance()->getHttpProxyType() == LLPROXY_SOCKS)
+                {
+                        curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
+                        if(LLSocks::getInstance()->getSelectedAuthMethod()==METHOD_PASSWORD)
+                                curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_PROXYUSERPWD,LLSocks::getInstance()->getProxyUserPwd().c_str());
+                }
+                else
+                {
+                        curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+                }
+        }
+
         ++gCurlEasyCount;
         return easy;
 }
@@ -443,6 +464,24 @@ void LLCurl::Easy::prepRequest(const std::string& url,
 //      setopt(CURLOPT_VERBOSE, 1); // usefull for debugging
         setopt(CURLOPT_NOSIGNAL, 1);
 
+        if (LLSocks::getInstance()->isHttpProxyEnabled())
+        {
+                std::string address = LLSocks::getInstance()->getHTTPProxy().getIPString();
+                U16 port = LLSocks::getInstance()->getHTTPProxy().getPort();
+                setoptString(CURLOPT_PROXY, address.c_str());
+                setopt(CURLOPT_PROXYPORT, port);
+                if (LLSocks::getInstance()->getHttpProxyType() == LLPROXY_SOCKS)
+                {
+                        setopt(CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
+                        if(LLSocks::getInstance()->getSelectedAuthMethod()==METHOD_PASSWORD)
+                                setoptString(CURLOPT_PROXYUSERPWD,LLSocks::getInstance()->getProxyUserPwd());
+                }
+                else
+                {
+                        setopt(CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+                }
+        }
+
         mOutput.reset(new LLBufferArray);
         setopt(CURLOPT_WRITEFUNCTION, (void*)&curlWriteCallback);
         setopt(CURLOPT_WRITEDATA, (void*)this);
@@ -742,6 +781,7 @@ bool LLCurlRequest::getByteRange(const std::string& url,
         if (length > 0)
         {
                 std::string range = llformat("Range: bytes=%d-%d", offset,offset+length-1);
+                //llinfos << "http url: " << url << " " << range << llendl;
                 easy->slist_append(range.c_str());
         }
         easy->setHeaders();
diff --git a/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index 7f9617f..e7dad79 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/indra/llmessage/llpacketring.cpp
@@ -43,6 +43,15 @@
 #include "llmessagelog.h"
 #include "message.h"
 
+#include "llsocks5.h"
+
+#if LL_WINDOWS
+        #include <winsock2.h>
+#else
+        #include <sys/socket.h>
+        #include <netinet/in.h>
+#endif
+
 ///////////////////////////////////////////////////////////
 LLPacketRing::LLPacketRing () :
         mUseInThrottle(FALSE),
@@ -224,8 +233,25 @@ S32 LLPacketRing::receivePacket (S32 socket, char *datap)
         else
         {
                 // no delay, pull straight from net
-                packet_size = receive_packet(socket, datap);            
-                mLastSender = ::get_sender();
+                if (LLSocks::isEnabled())
+                {
+                        proxywrap_t * header;
+                        datap  = datap-10;
+                        header = (proxywrap_t *)datap;
+                        packet_size = receive_packet(socket, datap);
+                        mLastSender.setAddress(header->addr);
+                        mLastSender.setPort(ntohs(header->port));
+                        if (packet_size > 10)
+                        {
+                                packet_size -= 10;                      
+                        }
+                }
+                else
+                {
+                        packet_size = receive_packet(socket, datap);            
+                        mLastSender = ::get_sender();
+                }
+
                 mLastReceivingIF = ::get_receiving_interface();
 
                 if (packet_size)  // did we actually get a packet?
@@ -254,7 +280,7 @@ BOOL LLPacketRing::sendPacket(int h_socket, char * send_buffer, S32 buf_size, LL
         BOOL status = TRUE;
         if (!mUseOutThrottle)
         {
-                return send_packet(h_socket, send_buffer, buf_size, host.getAddress(), host.getPort() );
+                return doSendPacket(h_socket, send_buffer, buf_size, host );
         }
         else
         {
@@ -275,7 +301,7 @@ BOOL LLPacketRing::sendPacket(int h_socket, char * send_buffer, S32 buf_size, LL
                                 mOutBufferLength -= packetp->getSize();
                                 packet_size = packetp->getSize();
 
-                                status = send_packet(h_socket, packetp->getData(), packet_size, packetp->getHost().getAddress(), packetp->getHost().getPort());
+                                status = doSendPacket(h_socket, packetp->getData(), packet_size, packetp->getHost());
                                 
                                 delete packetp;
                                 // Update the throttle
@@ -284,7 +310,7 @@ BOOL LLPacketRing::sendPacket(int h_socket, char * send_buffer, S32 buf_size, LL
                         else
                         {
                                 // If the queue's empty, we can just send this packet right away.
-                                status = send_packet(h_socket, send_buffer, buf_size, host.getAddress(), host.getPort() );
+                                status =  doSendPacket(h_socket, send_buffer, buf_size, host );
                                 packet_size = buf_size;
 
                                 // Update the throttle
@@ -322,3 +348,23 @@ BOOL LLPacketRing::sendPacket(int h_socket, char * send_buffer, S32 buf_size, LL
 
         return status;
 }
+
+BOOL LLPacketRing::doSendPacket(int h_socket, const char * send_buffer, S32 buf_size, LLHost host)
+{
+        
+        if (!LLSocks::isEnabled())
+        {
+                return send_packet(h_socket, send_buffer, buf_size, host.getAddress(), host.getPort());
+        }
+
+        proxywrap_t *socks_header = (proxywrap_t *)&mProxyWrappedSendBuffer;
+        socks_header->rsv   = 0;
+        socks_header->addr  = host.getAddress();
+        socks_header->port  = htons(host.getPort());
+        socks_header->atype = ADDRESS_IPV4;
+        socks_header->frag  = 0;
+
+        memcpy(mProxyWrappedSendBuffer+10, send_buffer, buf_size);
+
+        return send_packet(h_socket,(const char*) mProxyWrappedSendBuffer, buf_size+10, LLSocks::getInstance()->getUDPPproxy().getAddress(), LLSocks::getInstance()->getUDPPproxy().getPort());
+}
diff --git a/linden/indra/llmessage/llpacketring.h b/linden/indra/llmessage/llpacketring.h
index 4408abe..5d2c246 100644
--- a/linden/indra/llmessage/llpacketring.h
+++ b/linden/indra/llmessage/llpacketring.h
@@ -88,6 +88,9 @@ protected:
 
         LLHost mLastSender;
         LLHost mLastReceivingIF;
+
+        BOOL doSendPacket(int h_socket, const char * send_buffer, S32 buf_size, LLHost host);
+        U8       mProxyWrappedSendBuffer[NET_BUFFER_SIZE];
 };
 
 
diff --git a/linden/indra/llmessage/llsocks5.cpp b/linden/indra/llmessage/llsocks5.cpp
new file mode 100644
index 0000000..7326e80
--- /dev/null
+++ b/linden/indra/llmessage/llsocks5.cpp
@@ -0,0 +1,210 @@
+/** 
+ * @file llsocks5.cpp
+ * @brief Socks 5 implementation
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
+ * Copyright (c) 2000-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 <string>
+
+#include "linden_common.h"
+#include "net.h"
+#include "llhost.h"
+#include "message.h"
+#include "llsocks5.h"
+
+// Static class variable instances
+
+// We want this to be static to avoid excessive indirection on every
+// incomming packet just to do a simple bool test. The getter for this
+// member is also static
+bool LLSocks::sUdpProxyEnabled;
+bool LLSocks::sHttpProxyEnabled;
+
+LLSocks::LLSocks()
+{
+        sUdpProxyEnabled  = false;
+        sHttpProxyEnabled = false;
+        mNeedUpdate       = false;
+}
+
+// Perform a Socks5 authentication and UDP assioacation to the proxy
+// specified by proxy, and assiocate UDP port message_port
+int LLSocks::proxyHandshake(LLHost proxy, U32 message_port)
+{
+        int result;
+
+        /* Socks 5 Auth request */
+        socks_auth_request_t  socks_auth_request;
+        socks_auth_response_t socks_auth_response;
+
+        socks_auth_request.version     = SOCKS_VERSION;       // Socks version 5
+        socks_auth_request.num_methods = 1;                   // Sending 1 method
+        socks_auth_request.methods     = mAuthMethodSelected; // send only the selected metho
+
+        result = tcp_handshake(hProxyControlChannel, (char*)&socks_auth_request, sizeof(socks_auth_request_t), (char*)&socks_auth_response, sizeof(socks_auth_response_t));
+        if (result != 0)
+        {
+                llwarns << "Socks authentication request failed, error on TCP control channel : " << result << llendl;
+                stopProxy();
+                return SOCKS_CONNECT_ERROR;
+        }
+        
+        if (socks_auth_response.method == AUTH_NOT_ACCEPTABLE)
+        {
+                llwarns << "Socks5 server refused all our authentication methods" << llendl;
+                stopProxy();
+                return SOCKS_NOT_ACCEPTABLE;
+        }
+
+        // SOCKS5 USERNAME/PASSWORD authentication
+        if (socks_auth_response.method == METHOD_PASSWORD)
+        {
+                // The server has requested a username/password combination
+                U32 request_size = mSocksUsername.size() + mSocksPassword.size() + 3;
+                char * password_auth = (char *)malloc(request_size);
+                password_auth[0] = 0x01;
+                password_auth[1] = mSocksUsername.size();
+                memcpy(&password_auth[2],mSocksUsername.c_str(), mSocksUsername.size());
+                password_auth[mSocksUsername.size()+2] = mSocksPassword.size();
+                memcpy(&password_auth[mSocksUsername.size()+3], mSocksPassword.c_str(), mSocksPassword.size());
+
+                authmethod_password_reply_t password_reply;
+
+                result = tcp_handshake(hProxyControlChannel, password_auth, request_size, (char*)&password_reply, sizeof(authmethod_password_reply_t));
+                free (password_auth);
+
+                if (result != 0)
+                {
+                llwarns << "Socks authentication failed, error on TCP control channel : " << result << llendl;
+                        stopProxy();
+                        return SOCKS_CONNECT_ERROR;
+                }
+
+                if (password_reply.status != AUTH_SUCCESS)
+                {
+                        llwarns << "Socks authentication failed" << llendl;
+                        stopProxy();
+                        return SOCKS_AUTH_FAIL;
+                }
+        }
+
+        /* SOCKS5 connect request */
+
+        socks_command_request_t  connect_request;
+        socks_command_response_t connect_reply;
+
+        connect_request.version = SOCKS_VERSION;         //Socks V5
+        connect_request.command = COMMAND_UDP_ASSOCIATE; // Associate UDP
+        connect_request.flag    = FIELD_RESERVED;
+        connect_request.atype   = ADDRESS_IPV4;
+        connect_request.address = 0; // 0.0.0.0 We are not fussy about address
+                                                             // UDP is promiscious receive for our protocol
+        connect_request.port    = 0; // Port must be 0 if you ever want to connect via NAT and your router does port rewrite for you
+
+        result = tcp_handshake(hProxyControlChannel, (char*)&connect_request, sizeof(socks_command_request_t), (char*)&connect_reply, sizeof(socks_command_response_t));
+        if (result != 0)
+        {
+                llwarns << "Socks connect request failed, error on TCP control channel : " << result << llendl;
+                stopProxy();
+                return SOCKS_CONNECT_ERROR;
+        }
+
+        if (connect_reply.reply != REPLY_REQUEST_GRANTED)
+        {
+                //Something went wrong
+                llwarns << "Connection to SOCKS5 server failed, UDP forward request not granted" << llendl;
+                stopProxy();
+                return SOCKS_UDP_FWD_NOT_GRANTED;
+        }
+
+        mUDPProxy.setPort(ntohs(connect_reply.port)); // reply port is in network byte order
+        mUDPProxy.setAddress(proxy.getAddress());
+        // All good now we have been given the UDP port to send requests that need forwarding.
+        llinfos << "Socks 5 UDP proxy connected on " << mUDPProxy << llendl;
+        return SOCKS_OK;
+}
+
+int LLSocks::startProxy(LLHost proxy, U32 message_port)
+{
+        int status;
+
+        mTCPProxy   = proxy;
+        mNeedUpdate = false;
+
+        stopProxy();
+        hProxyControlChannel = tcp_open_channel(proxy); 
+        if (hProxyControlChannel == -1)
+        {
+                return SOCKS_HOST_CONNECT_FAILED;
+        }
+
+        status = proxyHandshake(proxy, message_port);   
+        if (status == SOCKS_OK)
+        {
+                sUdpProxyEnabled=true;
+        }
+        return status;
+}
+
+int LLSocks::startProxy(std::string host, U32 port)
+{
+                mTCPProxy.setHostByName(host);
+                mTCPProxy.setPort(port);
+                return startProxy(mTCPProxy, (U32)gMessageSystem->mPort);
+}
+
+void LLSocks::stopProxy()
+{
+        sUdpProxyEnabled = false;
+
+        if (hProxyControlChannel)
+        {
+                tcp_close_channel(hProxyControlChannel);
+        }
+}
+
+void LLSocks::setAuthNone()
+{
+        mAuthMethodSelected = METHOD_NOAUTH;
+}
+
+
+void LLSocks::setAuthPassword(std::string username, std::string password)
+{
+        mAuthMethodSelected = METHOD_PASSWORD;
+        mSocksUsername      = username;
+        mSocksPassword      = password;
+}
+
+void LLSocks::EnableHttpProxy(LLHost httpHost, LLHttpProxyType type)
+{ 
+        sHttpProxyEnabled = true; 
+        mHTTPProxy        = httpHost; 
+        mProxyType        = type;
+}
diff --git a/linden/indra/llmessage/llsocks5.h b/linden/indra/llmessage/llsocks5.h
new file mode 100644
index 0000000..d422d20
--- /dev/null
+++ b/linden/indra/llmessage/llsocks5.h
@@ -0,0 +1,248 @@
+/** 
+ * @file llsocks5.h
+ * @brief Socks 5 implementation
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-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$
+ */
+
+#ifndef LL_SOCKS5_H
+#define LL_SOCKS5_H
+
+#include "llhost.h"
+#include "llmemory.h"
+#include <string>
+
+// Error codes returned from the StartProxy method
+
+#define SOCKS_OK 0
+#define SOCKS_CONNECT_ERROR -1
+#define SOCKS_NOT_PERMITTED -2
+#define SOCKS_NOT_ACCEPTABLE -3
+#define SOCKS_AUTH_FAIL -4
+#define SOCKS_UDP_FWD_NOT_GRANTED -5
+#define SOCKS_HOST_CONNECT_FAILED -6
+
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN          (255 + 1)               /* socks5: 255, +1 for len. */
+#endif
+
+#define SOCKS_VERSION   0x05 // we are using socks 5
+
+// socks 5 address/hostname types
+#define ADDRESS_IPV4    0x01
+#define ADDRESS_HOSTNAME 0x03
+#define ADDRESS_IPV6    0x04
+
+// Lets just use our own ipv4 struct rather than dragging in system
+// specific headers
+union ipv4_address_t {
+        unsigned char                   octects[4];
+        U32                                             addr32;
+};
+
+// Socks 5 control channel commands
+#define COMMAND_TCP_STREAM 0x01
+#define COMMAND_TCP_BIND 0x02
+#define COMMAND_UDP_ASSOCIATE 0x03
+
+// Socks 5 command replys
+#define REPLY_REQUEST_GRANTED 0x00
+#define REPLY_GENERAL_FAIL 0x01
+#define REPLY_RULESET_FAIL 0x02
+#define REPLY_NETWORK_UNREACHABLE 0x03
+#define REPLY_HOST_UNREACHABLE 0x04
+#define REPLY_CONNECTION_REFUSED 0x05
+#define REPLY_TTL_EXPIRED 0x06
+#define REPLY_PROTOCOL_ERROR 0x07
+#define REPLY_TYPE_NOT_SUPPORTED 0x08
+
+#define FIELD_RESERVED 0x00
+
+// The standard socks5 request packet
+// Push current alignment to stack and set alignment to 1 byte boundary
+// This enabled us to use structs directly to set up and receive network packets
+// into the correct fields, without fear of boundary alignment causing issues
+#pragma pack(push,1)
+
+// Socks5 command packet
+struct socks_command_request_t {
+        unsigned char                   version;
+        unsigned char                   command;
+        unsigned char                   flag;
+        unsigned char                   atype;
+        U32                                             address;
+        U16                                             port;
+};
+
+// Standard socks5 reply packet
+struct socks_command_response_t {
+        unsigned char                   version;
+        unsigned char                   reply;
+        unsigned char                   flag;
+        unsigned char                   atype;
+        unsigned char                   add_bytes[4];
+        U16                                             port;
+};
+
+#define AUTH_NOT_ACCEPTABLE 0xFF // reply if prefered methods are not avaiable
+#define AUTH_SUCCESS        0x00 // reply if authentication successfull
+
+// socks 5 authentication request, stating which methods the client supports
+struct socks_auth_request_t {
+        unsigned char   version;
+        unsigned char   num_methods;
+        unsigned char   methods; // We are only using a single method currently
+};
+
+// socks 5 authentication response packet, stating server prefered method
+struct socks_auth_response_t {
+        unsigned char   version;
+        unsigned char   method;
+};
+
+// socks 5 password reply packet
+struct authmethod_password_reply_t {
+        unsigned char   version;
+        unsigned char   status;
+};
+
+// socks 5 UDP packet header
+struct proxywrap_t {
+        U16             rsv;
+        U8              frag;
+        U8              atype;
+        U32             addr;
+        U16             port;
+};
+
+#pragma pack(pop)   /* restore original alignment from stack */
+
+
+// Currently selected http proxy type
+enum LLHttpProxyType 
+{
+        LLPROXY_SOCKS=0,
+        LLPROXY_HTTP=1
+};
+
+// Auth types
+enum LLSocks5AuthType
+{
+        METHOD_NOAUTH=0x00,             // Client supports no auth
+        METHOD_GSSAPI=0x01,     // Client supports GSSAPI (Not currently supported)
+        METHOD_PASSWORD=0x02    // Client supports username/password
+};
+
+class LLSocks: public LLSingleton<LLSocks>
+{
+public:
+        LLSocks();
+        
+        // Start a connection to the socks 5 proxy
+        int startProxy(std::string host,U32 port);
+        int startProxy(LLHost proxy,U32 messagePort);
+        
+        // Disconnect and clean up any connection to the socks 5 proxy
+        void stopProxy();
+        
+        // Set up to use Password auth when connecting to the socks proxy
+    void setAuthPassword(std::string username,std::string password);
+        
+        // Set up to use No Auth when connecting to the socks proxy;
+        void setAuthNone();
+
+        // get the currently selected auth method
+        LLSocks5AuthType getSelectedAuthMethod() { return mAuthMethodSelected; };
+        
+        // static check for enabled status for UDP packets
+        static bool isEnabled(){return sUdpProxyEnabled;};
+
+        // static check for enabled status for http packets
+        static bool isHttpProxyEnabled(){return sHttpProxyEnabled;};
+
+        // Proxy http packets via httpHost, which can be a Socks5 or a http proxy
+        // as specified in type
+        void EnableHttpProxy(LLHost httpHost,LLHttpProxyType type);
+
+        // Stop proxying http packets
+        void DisableHttpProxy() {sHttpProxyEnabled = false;};
+
+        // get the UDP proxy address and port
+        LLHost getUDPPproxy(){return mUDPProxy;};
+        // get the socks 5 TCP control channel address and port
+        LLHost getTCPProxy(){return mTCPProxy;};
+        //get the http proxy address and port
+        LLHost getHTTPProxy(){return mHTTPProxy;};
+
+        // get the currently selected http proxy type
+        LLHttpProxyType getHttpProxyType(){return mProxyType;};
+
+        // mark that we need an update due to a settings change
+        void updated() { mNeedUpdate = true; };
+        // report if the current settings are applied or dirty pending a startProxy
+        bool needsUpdate() { return mNeedUpdate; };
+
+        //Get the username password in a curl compatible format
+        std::string getProxyUserPwd(){ return (mSocksUsername+":"+mSocksPassword);};
+
+private:
+
+        // Open a communication channel to the socks5 proxy proxy, at port messagePort
+        int proxyHandshake(LLHost proxy,U32 messagePort);
+
+        // socket handle to proxy tcp control channel
+        S32 hProxyControlChannel;
+        
+        // is the UDP proxy enabled
+        static bool sUdpProxyEnabled;
+        // is the http proxy enabled
+        static bool sHttpProxyEnabled;
+
+        // Have all settings been applied
+        bool mNeedUpdate;
+
+        // currently selected http proxy type
+        LLHttpProxyType mProxyType;
+
+        // UDP proxy address and port
+        LLHost mUDPProxy;
+        // TCP Proxy control channel address and port
+        LLHost mTCPProxy;
+        // HTTP proxy address and port
+        LLHost mHTTPProxy;
+
+        // socks 5 auth method selected
+        LLSocks5AuthType mAuthMethodSelected;
+
+        // socks 5 username
+        std::string mSocksUsername;
+        // socks 5 password
+        std::string mSocksPassword;
+};
+
+#endif
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index 9a80d7b..3eda579 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -548,9 +548,9 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count, bool faked_message, U8 fak
                 S32 acks = 0;
                 S32 true_rcv_size = 0;
 
-                U8* buffer = mTrueReceiveBuffer;
+                U8* buffer = mTrueReceiveBuffer.buffer;
                 
-                mTrueReceiveSize = mPacketRing.receivePacket(mSocket, (char *)mTrueReceiveBuffer);
+                mTrueReceiveSize = mPacketRing.receivePacket(mSocket, (char *)mTrueReceiveBuffer.buffer);
                 // If you want to dump all received packets into SecondLife.log, uncomment this
                 //dumpPacketToLog();
                 // <edit>
@@ -622,7 +622,7 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count, bool faked_message, U8 fak
                                 for(S32 i = 0; i < acks; ++i)
                                 {
                                         true_rcv_size -= sizeof(TPACKETID);
-                                        memcpy(&mem_id, &mTrueReceiveBuffer[true_rcv_size], /* Flawfinder: ignore*/
+                                        memcpy(&mem_id, &buffer[true_rcv_size], /* Flawfinder: ignore*/
                                              sizeof(TPACKETID));
                                         packet_id = ntohl(mem_id);
                                         //LL_INFOS("Messaging") << "got ack: " << packet_id << llendl;
@@ -3386,7 +3386,7 @@ void LLMessageSystem::dumpPacketToLog()
         {
                 S32 offset = cur_line_pos * 3;
                 snprintf(line_buffer + offset, sizeof(line_buffer) - offset,
-                                 "%02x ", mTrueReceiveBuffer[i]);       /* Flawfinder: ignore */
+                                 "%02x ", mTrueReceiveBuffer.buffer[i]);        /* Flawfinder: ignore */
                 cur_line_pos++;
                 if (cur_line_pos >= 16)
                 {
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index 660cd2b..1ef15d2 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -66,6 +66,7 @@
 #include "llmessagesenderinterface.h"
 
 #include "llstoredmessage.h"
+#include "llsocks5.h"
 
 const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
 const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
@@ -774,7 +775,18 @@ private:
         LLMessagePollInfo                                               *mPollInfop;
 
         U8      mEncodedRecvBuffer[MAX_BUFFER_SIZE];
-        U8      mTrueReceiveBuffer[MAX_BUFFER_SIZE];
+
+// Push current alignment to stack and set alignment to 1 byte boundary
+#pragma pack(push,1)
+
+        struct ReceiveBuffer_t
+        {
+                proxywrap_t header;
+                U8                      buffer[MAX_BUFFER_SIZE];
+        } mTrueReceiveBuffer;
+
+#pragma pack(pop)   /* restore original alignment from stack */
+
         S32     mTrueReceiveSize;
 
         // Must be valid during decode
diff --git a/linden/indra/llmessage/net.cpp b/linden/indra/llmessage/net.cpp
index 7166271..fa51645 100644
--- a/linden/indra/llmessage/net.cpp
+++ b/linden/indra/llmessage/net.cpp
@@ -56,6 +56,7 @@
 #include "lltimer.h"
 #include "indra_constants.h"
 
+#include "llsocks5.h"
 
 // Globals
 #if LL_WINDOWS
@@ -179,7 +180,91 @@ U32 ip_string_to_u32(const char* ip_string)
 //////////////////////////////////////////////////////////////////////////////////////////
 
 #if LL_WINDOWS
- 
+
+int tcp_handshake(S32 handle, char * dataout, int outlen, char * datain, int maxinlen)
+{
+        int result;
+        result = send(handle, dataout, outlen, 0);
+        if (result != outlen)
+        {
+                S32 err = WSAGetLastError();
+                llwarns << "Error sending data to proxy control channel, number of bytes sent were " << result << " error code was " << err << llendl;
+                return -1;
+        }
+
+        result = recv(handle, datain, maxinlen, 0);
+        if (result != maxinlen)
+        {
+                S32 err = WSAGetLastError();
+                llwarns << "Error receiving data from proxy control channel, number of bytes received were " << result << " error code was " << err << llendl;
+                return -1;
+        }
+
+        return 0;
+}
+
+S32 tcp_open_channel(LLHost host)
+{
+        // Open a TCP channel
+        // Jump through some hoops to ensure that if the request hosts is down
+        // or not reachable connect() does not block
+
+        S32 handle;
+        handle = socket(AF_INET, SOCK_STREAM, 0);
+        if (!handle)
+        {
+                llwarns << "Error opening TCP control socket, socket() returned " << handle << llendl;
+                return -1;
+        }
+
+        struct sockaddr_in address;
+        address.sin_port        = htons(host.getPort());
+        address.sin_family      = AF_INET;
+        address.sin_addr.s_addr = host.getAddress();
+
+        // Non blocking 
+        WSAEVENT hEvent=WSACreateEvent();
+        WSAEventSelect(handle, hEvent, FD_CONNECT) ;
+        connect(handle, (struct sockaddr*)&address, sizeof(address)) ;
+        // Wait fot 5 seconds, if we can't get a TCP channel open in this
+        // time frame then there is something badly wrong.
+        WaitForSingleObject(hEvent, 1000*5); // 5 seconds time out
+
+        WSANETWORKEVENTS netevents;
+        WSAEnumNetworkEvents(handle,hEvent,&netevents);
+
+        // Check the async event status to see if we connected
+        if ((netevents.lNetworkEvents & FD_CONNECT) == FD_CONNECT)
+        {
+                if (netevents.iErrorCode[FD_CONNECT_BIT] != 0)
+                {
+                        llwarns << "Unable to open TCP channel, WSA returned an error code of " << netevents.iErrorCode[FD_CONNECT_BIT] << llendl;
+                        WSACloseEvent(hEvent);
+                        return -1;
+                }
+
+                // Now we are connected disable non blocking
+                // we don't need support an async interface as
+                // currently our only consumer (socks5) will make one round
+                // of packets then just hold the connection open
+                WSAEventSelect(handle, hEvent, NULL) ;
+                unsigned long NonBlock = 0;
+                ioctlsocket(handle, FIONBIO, &NonBlock);
+
+                return handle;
+        }
+
+        llwarns << "Unable to open TCP channel, Timeout is the host up?" << netevents.iErrorCode[FD_CONNECT_BIT] << llendl;
+        return -1;
+}
+
+void tcp_close_channel(S32 handle)
+{
+        llinfos << "Closing TCP channel" << llendl;
+        shutdown(handle, SD_BOTH);
+        closesocket(handle);
+}
+
 S32 start_net(S32& socket_out, int& nPort) 
 {                       
         // Create socket, make non-blocking
@@ -377,6 +462,77 @@ BOOL send_packet(int hSocket, const char *sendBuffer, int size, U32 recipient, i
 
 #else
 
+
+int tcp_handshake(S32 handle, char * dataout, int outlen, char * datain, int maxinlen)
+{
+        if (send(handle, dataout, outlen, 0) != outlen)
+        {
+                llwarns << "Error sending data to proxy control channel" << llendl;
+                return -1;
+        }
+
+        if (recv(handle, datain, maxinlen, 0) != maxinlen)
+        {
+                llwarns << "Error receiving data to proxy control channel" << llendl;           
+                return -1;
+        }
+
+        return 0;
+}
+
+S32 tcp_open_channel(LLHost host)
+{
+        S32 handle;
+        handle = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+        if (!handle)
+        {
+                llwarns << "Error opening TCP control socket, socket() returned " << handle << llendl;
+                return -1;
+        }
+
+        struct sockaddr_in address;
+        address.sin_port        = htons(host.getPort());
+        address.sin_family      = AF_INET;
+        address.sin_addr.s_addr = host.getAddress();
+
+        // Set the socket to non blocking for the connect()
+        int flags = fcntl(handle, F_GETFL, 0);
+        fcntl(handle, F_SETFL, flags | O_NONBLOCK);
+
+        S32 error = connect(handle, (sockaddr*)&address, sizeof(address));
+        if (error && (errno != EINPROGRESS))
+        {
+                        llwarns << "Unable to open TCP channel, error code: " << errno << llendl;
+                        return -1;
+        }
+
+        struct timeval timeout;
+        timeout.tv_sec  = 5; // Maximum time to wait for the connect() to complete
+        timeout.tv_usec = 0;
+    fd_set fds;
+        FD_ZERO(&fds);
+        FD_SET(handle, &fds);
+
+        // See if we have connectde or time out after 5 seconds
+        U32 rc = select(sizeof(fds)*8, NULL, &fds, NULL, &timeout);     
+        
+        if (rc != 1) // we require exactly one descriptor to be set
+        {
+                        llwarns << "Unable to open TCP channel" << llendl;
+                        return -1;
+        }
+
+        // Return the socket to blocking operations
+        fcntl(handle, F_SETFL, flags);
+
+        return handle;
+}
+
+void tcp_close_channel(S32 handle)
+{
+                close(handle);
+}
+
 //  Create socket, make non-blocking
 S32 start_net(S32& socket_out, int& nPort)
 {
diff --git a/linden/indra/llmessage/net.h b/linden/indra/llmessage/net.h
index 45b07a0..531b5c3 100644
--- a/linden/indra/llmessage/net.h
+++ b/linden/indra/llmessage/net.h
@@ -64,6 +64,9 @@ U32			ip_string_to_u32(const char* ip_string);	// Wrapper for inet_addr()
 
 extern const char* LOOPBACK_ADDRESS_STRING;
 
+void tcp_close_channel(S32 handle);
+S32 tcp_open_channel(LLHost host);
+int tcp_handshake(S32 handle, char * dataout, int outlen, char * datain, int maxinlen);
 
 // useful MTU consts
 
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index 7cd4dd7..c63d7ad 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -375,45 +375,54 @@ LLImageGL::~LLImageGL()
 
 void LLImageGL::init(BOOL usemipmaps)
 {
-#ifdef DEBUG_MISS
-        mMissed                         = FALSE;
-#endif
+        // keep these members in the same order as declared in llimagehl.h
+        // so that it is obvious by visual inspection if we forgot to
+        // init a field.
 
-        mPickMask                 = NULL;
-        mPickMaskSize     = 0;
-        mTextureState       = NO_DELETE ;
-        mTextureMemory    = 0;
-        mLastBindTime     = 0.f;
+        mTextureMemory = 0;
+        mLastBindTime = 0.f;
+
+        mPickMask = NULL;
+        mPickMaskSize = 0;
+        mUseMipMaps = usemipmaps;
+        mHasExplicitFormat = FALSE;
+        mAutoGenMips = FALSE;
+
+        mIsMask = FALSE;
+
+        mGLTextureCreated = false;
+        mTexName = 0;
+        mWidth = 0;
+        mHeight = 0;
+        mCurrentDiscardLevel = -1;      
         
         mTarget                   = GL_TEXTURE_2D;
         mBindTarget               = LLTexUnit::TT_TEXTURE;
-        mUseMipMaps               = usemipmaps;
         mHasMipMaps               = false;
-        mAutoGenMips      = FALSE;
-        mTexName          = 0;
-        mIsResident       = 0;
+
+        mIsResident = 0;
+
+        mComponents = 0;
+        mMaxDiscardLevel = MAX_DISCARD_LEVEL;
 
         mTexOptionsDirty = true;
         mAddressMode = LLTexUnit::TAM_WRAP;
         mFilterOption = LLTexUnit::TFO_ANISOTROPIC;
-        mWidth                          = 0;
-        mHeight                         = 0;
-        mComponents                     = 0;
-        
-        mMaxDiscardLevel = MAX_DISCARD_LEVEL;
-        mCurrentDiscardLevel = -1;
-        mDontDiscard = FALSE;
         
         mFormatInternal = -1;
         mFormatPrimary = (LLGLenum) 0;
         mFormatType = GL_UNSIGNED_BYTE;
         mFormatSwapBytes = FALSE;
-        mHasExplicitFormat = FALSE;
 
-        mGLTextureCreated = FALSE ;
+#ifdef DEBUG_MISS
+        mMissed                         = FALSE;
+#endif
 
-        mIsMask = FALSE;
         mCategory = -1 ;
+        
+        //LLTexture stuff
+        mDontDiscard = FALSE;
+        mTextureState       = NO_DELETE ;
 }
 
 void LLImageGL::cleanup()
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index a93dc9b..f3ef83e 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -591,6 +591,13 @@ void LLComboBox::updateLayout()
         }
 }
 
+
+void LLComboBox::getAllData(std::vector<LLScrollListItem*>& item_list) const
+{
+        item_list = mList->getAllData();
+}
+
+
 void* LLComboBox::getCurrentUserdata()
 {
         LLScrollListItem* item = mList->getFirstSelected();
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 596f659..f92fe44 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -169,6 +169,7 @@ public:
 
         //========================================================================
         
+        void                    getAllData(std::vector<LLScrollListItem*>& item_list) const;
         void*                   getCurrentUserdata();
 
         void                    setPrearrangeCallback( void (*cb)(LLUICtrl*,void*) ) { mPrearrangeCallback = cb; }
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index a21ad5d..453bb50 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -55,17 +55,24 @@
 #include "llui.h"
 #include "lluictrlfactory.h"
 #include "llclipboard.h"
+#include "llmemberlistener.h"
 
 #include "../newview/lgghunspell_wrapper.h"
 #include "../newview/lltranslate.h"
 #include "../newview/llviewercontrol.h"
 #include "../newview/lggautocorrect.h"
 
+
 //
 // Imported globals
 //
 
 //
+// Globals
+
+
+
+//
 // Constants
 //
 
@@ -90,6 +97,8 @@ static LLRegisterWidget<LLLineEditor> r1("line_editor");
 
 /* static */ LLPointer<LLUIImage> LLLineEditor::sImage;
 
+typedef LLMemberListener<LLView> text_edit_listener_t;
+
 //
 // Member functions
 //
@@ -214,46 +223,18 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
         }
         mImage = sImage;
 
-        // make the popup menu available
-        //LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_texteditor.xml", parent_view);
-        LLMenuGL* menu = new LLMenuGL("wot");
-        /*if (!menu)
-        {
-        menu = new LLMenuGL(LLStringUtil::null);
-        }*/
-
-        menu->append(new LLMenuItemCallGL("Cut", context_cut, context_enable_cut, this));
-        menu->append(new LLMenuItemCallGL("Copy", context_copy, context_enable_copy, this));
-        menu->append(new LLMenuItemCallGL("Paste", context_paste, context_enable_paste, this));
-        menu->append(new LLMenuItemCallGL("Delete", context_delete, context_enable_delete, this));
-        menu->append(new LLMenuItemCallGL("Select All", context_selectall, context_enable_selectall, this));
-
-        menu->appendSeparator("Transep");
-        LLMenuGL* translatemenu = new LLMenuGL("Translate To");
-        translatemenu->setCanTearOff(FALSE);
-        translatemenu->append(new LLMenuItemCallGL("en", "English", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("da", "Danish", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("de", "Deutsch(German)", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("es", "Spanish", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("fr", "French", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("it", "Italian", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("hu", "Hungarian", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("nl", "Dutch", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("pl", "Polish", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("pt", "Portugese", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("ru", "Russian", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("tr", "Turkish", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("uk", "Ukrainian", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("zh", "Chinese", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("ja", "Japanese", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("ko", "Korean", context_translate, context_enable_translate, this));
-
-        menu->appendMenu(translatemenu);
-        menu->appendSeparator("Spelsep");
-        //menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
-        menu->setCanTearOff(FALSE);
-        menu->setVisible(FALSE);
+
+        LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_rightclick_text.xml",this);
+        if (!menu)
+        {
+                  menu = new LLMenuGL(LLStringUtil::null);
+        }
+
+        defineMenuCallbacks(menu);
         mPopupMenuHandle = menu->getHandle();
+        menu->setBorderColor(gColors.getColor("MenuItemDisabledColor"));
+        menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
+
 }
 
 
@@ -556,7 +537,7 @@ void LLLineEditor::context_translate(void * data)
 {
         LLLineEditor* line = (LLLineEditor*)data;
         LLMenuGL* menu = line ? (LLMenuGL*)(line->mPopupMenuHandle.get()) : NULL;
-        LLMenuGL* translate_menu = menu ? menu->getChildMenuByName("Translate To", TRUE) : NULL;
+        LLMenuGL* translate_menu = menu ? menu->getChildMenuByName("Translation Options", TRUE) : NULL;
         if (!translate_menu)
         {
                 return;
@@ -599,9 +580,9 @@ void LLLineEditor::spell_show(void * data)
         }
 }
 
-std::vector<S32> LLLineEditor::getMisspelledWordsPositions()
+void LLLineEditor::getMisspelledWordsPositions(std::vector<S32>& misspell_positions)
 {
-        std::vector<S32> thePosesOfBadWords;
+        misspell_positions.clear();
     const LLWString& text = mText.getWString();
 
         //llinfos << "end of box is at " << cursorloc << " and end of text is at " << text.length() << llendl;
@@ -623,26 +604,28 @@ std::vector<S32> LLLineEditor::getMisspelledWordsPositions()
                         {
                                 wordEnd++;
                         }       
-                        //got a word :D
-                        std::string selectedWord(std::string(text.begin(), 
-                                text.end()).substr(wordStart,wordEnd-wordStart));
                         
-                        if(!glggHunSpell->isSpelledRight(selectedWord))
-                        {       
-                                //misspelled word here, and you have just right clicked on it!
-                                //get the center of this word..
-                                //S32 center =  llround( (wordEnd-wordStart)/2 ) + wordStart;
-                                //turn this cursor position into a pixel pos
-                                //center = findPixelNearestPos(center-getCursor());
+                        //got a word? -- MC
+                        if (wordStart != wordEnd)
+                        {
+                                std::string selectedWord(std::string(text.begin(), 
+                                        text.end()).substr(wordStart,wordEnd-wordStart));
+                                
+                                if(!selectedWord.empty() && !glggHunSpell->isSpelledRight(selectedWord))
+                                {       
+                                        //misspelled word here, and you have just right clicked on it!
+                                        //get the center of this word..
+                                        //S32 center =  llround( (wordEnd-wordStart)/2 ) + wordStart;
+                                        //turn this cursor position into a pixel pos
+                                        //center = findPixelNearestPos(center-getCursor());
 
-                                thePosesOfBadWords.push_back(
-                                        wordStart);
-                                thePosesOfBadWords.push_back(wordEnd);
+                                        misspell_positions.push_back(wordStart);
+                                        misspell_positions.push_back(wordEnd);
+                                }
                         }
                 }
                 wordEnd++;
         }
-        return thePosesOfBadWords;
 }
 
 void LLLineEditor::spell_add(void* data)
@@ -1318,6 +1301,67 @@ BOOL LLLineEditor::canCut() const
         return !mReadOnly && !mDrawAsterixes && hasSelection();
 }
 
+// method to define the associated callbacks
+void LLLineEditor::defineMenuCallbacks(LLMenuGL* menu) {
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Cut Text",
+                              this,
+                              (void*)context_enable_cut);
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                              "Cut Text",
+                              this,
+                              (void*)context_cut);
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Copy Text",
+                              this,
+                              (void*)context_enable_copy);
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                              "Copy Text",
+                              this,
+                              (void*)context_copy);
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Paste Text",
+                              this,
+                              (void*)context_enable_paste);
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                              "Paste Text",
+                              this,
+                              (void*)context_paste);
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Delete Text",
+                              this,
+                              (void*)context_enable_delete);
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                              "Delete Text",
+                              this,
+                              (void*)context_delete);
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Select All Text",
+                              this,
+                              (void*)context_enable_selectall);
+        menu->setCtrlResponse(1+LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                              "Select All Text",
+                              this,
+                              (void*)context_selectall);
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Translate Text",
+                              this,
+                              (void*)context_enable_translate);
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_TRANSLATE,
+                              "Translate Text",
+                              this,
+                              (void*)context_translate);
+
+
+
+}
+
 // cut selection to clipboard
 void LLLineEditor::cut()
 {
@@ -1994,7 +2038,7 @@ void LLLineEditor::autoCorrectText()
         }
 }
 
-void LLLineEditor::drawMisspelled(LLRect background)
+void LLLineEditor::drawMisspelled(const LLRect& background)
 {
         if (!mReadOnly && mSpellCheckable)
         {
@@ -2010,16 +2054,16 @@ void LLLineEditor::drawMisspelled(LLRect background)
                                 mStartSpellHere = newStartSpellHere;
                                 mEndSpellHere = newStopSpellHere;
                                 resetSpellDirty();
-                                misspellLocations=getMisspelledWordsPositions();
+                                getMisspelledWordsPositions(mMisspellLocations);
                         }
                 }
 
-                if (glggHunSpell->getSpellCheckHighlight())
+                if (!mMisspellLocations.empty() && glggHunSpell->getSpellCheckHighlight())
                 {
-                        for (int i =0; i<(int)misspellLocations.size(); i++)
+                        for (int i =0; i<(int)mMisspellLocations.size(); i++)
                         {
-                                S32 wstart =findPixelNearestPos( misspellLocations[i]-getCursor());
-                                S32 wend = findPixelNearestPos(misspellLocations[++i]-getCursor());
+                                S32 wstart =findPixelNearestPos( mMisspellLocations[i]-getCursor());
+                                S32 wend = findPixelNearestPos(mMisspellLocations[++i]-getCursor());
                                 S32 maxw = getRect().getWidth();
 
                                 if (wend > maxw)
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 43ce869..b3e21ce 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -55,6 +55,7 @@
 class LLFontGL;
 class LLLineEditorRollback;
 class LLButton;
+class LLMenuGL;
 
 typedef BOOL (*LLLinePrevalidateFunc)(const LLWString &wstr);
 
@@ -112,7 +113,8 @@ public:
         virtual BOOL canTranslate() const;
         virtual void insert(std::string what,S32 wher);
 
-        // LLEditMenuHandler overrides
+        // LLEditMenuHandler overrides and menu set up methods.
+                void    defineMenuCallbacks(LLMenuGL* menu);
         virtual void    cut();
         virtual BOOL    canCut() const;
 
@@ -152,11 +154,12 @@ public:
         static void spell_show(void* data);
         static void spell_add(void* data);
 
-        std::vector<S32> getMisspelledWordsPositions();
+        void getMisspelledWordsPositions(std::vector<S32>& misspell_positions);
+
         // view overrides
         virtual void    draw();
         void autoCorrectText();
-        void drawMisspelled(LLRect background);
+        void drawMisspelled(const LLRect& background);
         virtual void    reshape(S32 width,S32 height,BOOL called_from_parent=TRUE);
         virtual void    onFocusReceived();
         virtual void    onFocusLost();
@@ -303,7 +306,7 @@ protected:
         std::string             mPrevText;                              // Saved string for 'ESC' revert
         LLUIString              mLabel;                                 // text label that is visible when no user text provided
         std::string             mPrevSpelledText;               // saved string so we know whether to respell or not
-        std::vector<S32> misspellLocations;     // where all the mispelled words are
+        std::vector<S32> mMisspellLocations;     // where all the mispelled words are
         S32                             mStartSpellHere;                // the position of the first char on the screen, stored so we know when to update
         S32                             mEndSpellHere;                  // the location of the last char on the screen
         BOOL                    mSpellCheckable;                // set in xui as "spell_check". Default value for a field
@@ -468,4 +471,6 @@ private:
 
 };
 
+
+
 #endif  // LL_LINEEDITOR_
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 91bb581..d5e1186 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -149,6 +149,18 @@ LLMenuItemGL::LLMenuItemGL( const std::string& name, const std::string& label, K
         setLabel( label );
 }
 
+LLMenuItemGL::~LLMenuItemGL() {
+
+  // Delete all the entries in the mFutureCallbackRequests vector
+  for(std::vector<LLCallbackInformation*>::iterator iter= mFutureCallbackRequests.begin();
+      iter!=mFutureCallbackRequests.end();
+      ++iter) {
+    delete (*iter);
+  }
+
+}
+
+
 // virtual
 LLXMLNodePtr LLMenuItemGL::getXML(bool save_children) const
 {
@@ -517,6 +529,18 @@ BOOL LLMenuItemGL::setLabelArg( const std::string& key, const LLStringExplicit&
         return TRUE;
 }
 
+
+void LLMenuItemGL::addCallbackType(U8 theType,
+                                       const std::string& name,
+                                       const std::string& userdata) {
+
+  // Add the new callback information to the list of callbacks that are being tracked.
+  mFutureCallbackRequests.push_back(new LLCallbackInformation(theType,name,userdata));
+
+}
+
+
+
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLMenuItemSeparatorGL
 //
@@ -541,6 +565,12 @@ public:
         virtual BOOL handleHover(S32 x, S32 y, MASK mask);
 
         virtual U32 getNominalHeight( void ) const { return SEPARATOR_HEIGHT_PIXELS; }
+
+        virtual BOOL setCtrlResponse(U8 llMenuItemCallType,
+                                     const std::string& name,
+                                     void* user_data,
+                                     void *callback_fcn) { return FALSE; } ;
+
 };
 
 LLMenuItemSeparatorGL::LLMenuItemSeparatorGL( const std::string &name ) :
@@ -726,6 +756,11 @@ public:
         }
         virtual void doIt( void ) {}
         virtual void draw( void ) {}
+        virtual BOOL setCtrlResponse(U8 llMenuItemCallType,
+                                     const std::string& name,
+                                     void* user_data,
+                                     void *callback_fcn) { return FALSE; } ;
+
 };
 
 
@@ -805,6 +840,8 @@ LLMenuItemCallGL::LLMenuItemCallGL(const std::string& name,
         if(!enabled) setEnabled(FALSE);
 }
 
+
+
 void LLMenuItemCallGL::setEnabledControl(std::string enabled_control, LLView *context)
 {
         // Register new listener
@@ -921,6 +958,53 @@ BOOL LLMenuItemCallGL::handleAcceleratorKey( KEY key, MASK mask )
         return LLMenuItemGL::handleAcceleratorKey(key, mask);
 }
 
+
+
+// Method to add a callback function for the given type and name.
+BOOL LLMenuItemCallGL::setCtrlResponse(U8 llMenuItemCallType,
+                                       const std::string& name,
+                                       void* user_data,
+                                       void *callback_fcn) {
+
+  // Loop through all of the menu items and check to see which ones
+  // match the name and callback type given.
+       BOOL result = FALSE;
+       std::vector<LLCallbackInformation*>::iterator item_iter;
+       for (item_iter  = mFutureCallbackRequests.begin();
+            item_iter != mFutureCallbackRequests.end();
+            ++item_iter)
+       {
+               if( ((*item_iter)->getTypeOfCallback()==llMenuItemCallType) &&
+                   ((*item_iter)->getCallbackName()==name)) {
+
+                 // Found a match. Set the user data and then determine what type it is.
+                 setUserData(user_data);
+
+                 if(llMenuItemCallType == LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK)
+                   {
+                     setMenuCallback((menu_callback)callback_fcn,user_data);
+                   }
+
+                 else if (llMenuItemCallType == LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE)
+                   {
+                     setEnabledCallback((enabled_callback)callback_fcn);
+                   }
+
+                 else if (llMenuItemCallType == LLCallbackInformation::LL_MENU_ITEM_CALL_GL_TRANSLATE) {
+                   setName((*item_iter)->getCallbackUserData());
+                   setMenuCallback((menu_callback)callback_fcn,user_data);
+                 }
+
+               }
+       }
+
+
+        return result;
+
+}
+
+
+
 ///============================================================================
 /// Class LLMenuItemCheckGL
 ///============================================================================
@@ -1379,6 +1463,17 @@ void LLMenuItemBranchGL::openMenu()
 }
 
 
+BOOL LLMenuItemBranchGL::setCtrlResponse(U8 llMenuItemCallType,
+                                         const std::string& name,
+                                         void* user_data,
+                                         void *callback_fcn) {
+
+         // Get the menu branch and set the callback functions on all its children.
+         return(getBranch()->setCtrlResponse(llMenuItemCallType,name,user_data,callback_fcn));
+
+}
+
+
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLMenuItemBranchDownGL
 //
@@ -1982,13 +2077,31 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 
                                                 LLSimpleListener* callback = parent->getListenerByName(callback_name);
 
-                                                if (!callback)
+                                                if (callback)
                                                 {
-                                                        lldebugs << "Ignoring \"on_click\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << llendl;
-                                                        continue;
+                                                  new_item->addListener(callback, "on_click", callback_data);
+                                                }
+                                                else {
+
+                                                  // A callback for this item has not yet been
+                                                  // specified. Add it to the list of options
+                                                  // that do not yet have callbacks.
+                                                  if (call_child->hasAttribute("translate"))
+                                                    {
+                                                      new_item->addCallbackType
+                                                        (LLCallbackInformation::LL_MENU_ITEM_CALL_GL_TRANSLATE,
+                                                         item_name,
+                                                         callback_data);
+                                                    }
+
+                                                  else
+                                                    {
+                                                      new_item->addCallbackType
+                                                        (LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                                                         item_name,
+                                                         callback_data);
+                                                    }
                                                 }
-
-                                                new_item->addListener(callback, "on_click", callback_data);
                                         }
                                         if (call_child->hasName("on_enable"))
                                         {
@@ -2016,13 +2129,22 @@ void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory
 
                                                         LLSimpleListener* callback = parent->getListenerByName(callback_name);
 
-                                                        if (!callback)
+                                                        if (callback)
                                                         {
-                                                                lldebugs << "Ignoring \"on_enable\" \"" << item_name << "\" because \"" << callback_name << "\" is not registered" << llendl;
-                                                                continue;
+                                                          new_item->addListener(callback, "on_build", userdata);
+                                                        } else {
+
+                                                          // A callback for this item has not yet been
+                                                          // specified. Add it to the list of options
+                                                          // that do not yet have callbacks.
+
+                                                          new_item->addCallbackType
+                                                            (LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                                                             item_name,
+                                                             callback_data);
                                                         }
 
-                                                        new_item->addListener(callback, "on_build", userdata);
+
                                                 }
                                                 else if (call_child->hasAttribute("control"))
                                                 {
@@ -2188,7 +2310,7 @@ LLView* LLMenuGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
         LLColor4 color(0,0,0,1);
         if (opaque && LLUICtrlFactory::getAttributeColor(node,"color", color))
         {
-                menu->setBackgroundColor(color);
+                menu->setBackgroundColor(color);
         }
 
         BOOL create_jump_keys = FALSE;
@@ -2977,7 +3099,8 @@ void LLMenuGL::draw( void )
 
         if( mBgVisible )
         {
-                gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0, mBackgroundColor );
+                gl_rect_2d( -1, getRect().getHeight()+2, getRect().getWidth()+2, -2, mBorderColor,FALSE);
+                gl_rect_2d(  0, getRect().getHeight(),   getRect().getWidth(),   0, mBackgroundColor );
         }
         LLView::draw();
 }
@@ -3033,6 +3156,41 @@ LLMenuGL* LLMenuGL::getChildMenuByName(const std::string& name, BOOL recurse) co
         return NULL;
 }
 
+
+void LLMenuGL::setBackgroundColor( const LLColor4& color ) {
+
+  mBackgroundColor = color;
+  item_list_t::iterator item_iter;
+  for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
+    {
+              if((*item_iter)->getType()=="menu")
+                 {
+                   LLMenuItemBranchGL *menuBranchItem = (LLMenuItemBranchGL*)(*item_iter);
+                   menuBranchItem->getBranch()->setBackgroundColor(color);
+                 }
+    }
+
+
+}
+
+
+void LLMenuGL::setBorderColor( const LLColor4& color ) {
+
+  mBorderColor = color;
+  item_list_t::iterator item_iter;
+  for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
+    {
+              if((*item_iter)->getType()=="menu")
+                 {
+                   LLMenuItemBranchGL *menuBranchItem = (LLMenuItemBranchGL*)(*item_iter);
+                   menuBranchItem->getBranch()->setBorderColor(color);
+                 }
+    }
+
+
+}
+
+
 BOOL LLMenuGL::clearHoverItem()
 {
         for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
@@ -3098,6 +3256,26 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
         menu->getParent()->sendChildToFront(menu);
 }
 
+
+BOOL LLMenuGL::setCtrlResponse(U8 llMenuItemCallType,
+                               const std::string& name,
+                               void* user_data,
+                               void *callback_fcn)
+{
+
+       // Go through all of the children on this menu and set the callback function.
+       BOOL result = FALSE;
+       item_list_t::iterator item_iter;
+       for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
+       {
+                 result |= (*item_iter)->setCtrlResponse(llMenuItemCallType,name,user_data,callback_fcn);
+       }
+
+        return result;
+}
+
+
+
 //-----------------------------------------------------------------------------
 // class LLPieMenuBranch
 // A branch to another pie menu
@@ -3117,6 +3295,12 @@ public:
 
         LLPieMenu* getBranch() { return mBranch; }
 
+        virtual BOOL setCtrlResponse(U8 llMenuItemCallType,
+                                     const std::string& name,
+                                     void* user_data,
+                                     void *callback_fcn) { return FALSE; } ;
+
+
 protected:
         LLPieMenu* mBranch;
 };
@@ -4581,3 +4765,16 @@ void LLTearOffMenu::onClose(bool app_quitting)
         destroy();
 }
 
+
+///============================================================================
+/// Class LLCallbackInformation
+///============================================================================
+
+LLCallbackInformation::LLCallbackInformation(U8 theType,
+                        const std::string& theName,
+                        const std::string& userData)
+  : callbackName(theName),
+    callbackUserData(userData)
+{
+    setTypeOfCallback(theType);
+}
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 63f9d55..9a9d1b0 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -70,6 +70,57 @@ typedef BOOL (*check_callback)(void*);
 // contents. Put the contents of the label in the provided parameter.
 typedef void (*label_callback)(std::string&,void*);
 
+
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLCallbackInformation
+//
+// The LLCallbackInformation class is used to keep track of callback
+// information for menus that might be requested at a future time.
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLCallbackInformation
+{
+
+public :
+
+  // Constants used for keeping track of what type of callback is required.
+  static const U8 LL_MENU_ITEM_CALL_GL_NONE      = 0;
+  static const U8 LL_MENU_ITEM_CALL_GL_ON_CLICK  = 1;
+  static const U8 LL_MENU_ITEM_CALL_GL_ON_ENABLE = 2;
+  static const U8 LL_MENU_ITEM_CALL_GL_TRANSLATE = 3;
+
+
+  LLCallbackInformation(U8 theType=LLCallbackInformation::LL_MENU_ITEM_CALL_GL_NONE,
+                        const std::string& theName = LLStringUtil::null,
+                        const std::string& userData = LLStringUtil::null);
+  ~LLCallbackInformation() {};
+
+  void setTypeOfCallback(U8 theType) {typeOfCallback = theType; }
+  void setCallbackName(const std::string& name) {callbackName = name; }
+  void setCallbackUserData(const std::string& userdata) {callbackUserData = userdata; }
+
+  U8                 getTypeOfCallback() {return(typeOfCallback); }
+  const std::string& getCallbackName() {return(callbackName); }
+  const std::string& getCallbackUserData() {return(callbackUserData); }
+
+  BOOL isTypeMatch(U8 type) { return(type == typeOfCallback);}
+  BOOL isNameMatch(const std::string& name) { return(name == callbackName);}
+
+protected:
+
+private:
+
+  U8 typeOfCallback;
+  std::string callbackName;
+  std::string callbackUserData;
+
+};
+
+
+
+
+
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLMenuItemGL
 //
@@ -79,6 +130,7 @@ typedef void (*label_callback)(std::string&,void*);
 class LLMenuItemGL : public LLView
 {
 public:
+
         // static functions to control the global color scheme.
         static void setEnabledColor( const LLColor4& color ) { sEnabledColor = color; }
         static const LLColor4& getEnabledColor() { return sEnabledColor; }
@@ -90,7 +142,7 @@ public:
         static const LLColor4& getHighlightFGColor() { return sHighlightForeground; }
 
         LLMenuItemGL( const std::string& name, const std::string& label, KEY key = KEY_NONE, MASK = MASK_NONE );
-        virtual ~LLMenuItemGL() {};
+        virtual ~LLMenuItemGL();
 
         virtual void setValue(const LLSD& value) { setLabel(value.asString()); }
 
@@ -174,6 +226,14 @@ public:
         void setDrawTextDisabled(BOOL disabled) { mDrawTextDisabled = disabled; }
         BOOL getDrawTextDisabled() const { return mDrawTextDisabled; }
 
+        // functionality for adding callbacks after the menu is constucted
+        void addCallbackType(U8 theType,const std::string& name,const std::string& userdata);
+
+        virtual BOOL setCtrlResponse(U8 llMenuItemCallType,
+                                     const std::string& name,
+                                     void* user_data,
+                                     void *callback_fcn) = 0;
+
 protected:
         void setHover(BOOL hover) { mGotHover = hover; }
 
@@ -194,6 +254,11 @@ protected:
         LLUIString mDrawBranchLabel;
 
         BOOL mHighlight;
+
+        // variables used for tracking callback types that will be
+        // requested after the widget is in place.
+        std::vector<LLCallbackInformation*> mFutureCallbackRequests;
+
 private:
         static LLColor4 sEnabledColor;
         static LLColor4 sDisabledColor;
@@ -214,6 +279,7 @@ private:
         BOOL mDrawTextDisabled;
 
         KEY mJumpKey;
+
 };
 
 
@@ -262,6 +328,7 @@ public:
                                           KEY key = KEY_NONE, MASK mask = MASK_NONE,
                                           BOOL enabled = TRUE,
                                           on_disabled_callback on_disabled_c = NULL);
+
         virtual LLXMLNodePtr getXML(bool save_children = true) const;
 
         virtual std::string getType() const     { return "call"; }
@@ -288,6 +355,13 @@ public:
 
         //virtual void draw();
 
+        // Functionality for tracking callback types for setting after widget is in place.
+        virtual BOOL setCtrlResponse(U8 llMenuItemCallType,
+                                     const std::string& name,
+                                     void* user_data,
+                                     void *callback_fcn);
+
+
 
 private:
         menu_callback                   mCallback;
@@ -382,6 +456,12 @@ public:
         // LLView Functionality
         //virtual void draw( void );
 
+        virtual BOOL setCtrlResponse(U8 llMenuItemCallType,
+                                     const std::string& name,
+                                     void* user_data,
+                                     void *callback_fcn) { return FALSE; } ;
+
+
 private:
         BOOL* mToggle;
 };
@@ -434,8 +514,10 @@ public:
 
         // background colors
         static void setDefaultBackgroundColor( const LLColor4& color ) { sDefaultBackgroundColor = color; }
-        void setBackgroundColor( const LLColor4& color ) { mBackgroundColor = color; }
+        void setBackgroundColor( const LLColor4& color );
+        void setBorderColor( const LLColor4& color );
         const LLColor4& getBackgroundColor() const { return mBackgroundColor; }
+        const LLColor4& getBorderColor() const { return mBorderColor; }
         void setBackgroundVisible( BOOL b )     { mBgVisible = b; }
         void setCanTearOff(BOOL tear_off, LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>());
 
@@ -525,6 +607,8 @@ public:
         static BOOL getKeyboardMode() { return sKeyboardMode; }
 
         static class LLMenuHolderGL* sMenuContainer;
+
+        BOOL setCtrlResponse(U8 llMenuItemCallType,const std::string& name,void* user_data,void *callback_fcn);
         
 protected:
         void createSpilloverBranch();
@@ -547,6 +631,7 @@ private:
         static BOOL             sKeyboardMode;
 
         LLColor4                mBackgroundColor;
+        LLColor4                mBorderColor;
         BOOL                    mBgVisible;
         LLMenuItemGL*   mParentMenuItem;
         LLUIString              mLabel;
@@ -623,6 +708,12 @@ public:
 
         virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
 
+        virtual BOOL setCtrlResponse(U8 llMenuItemCallType,
+                                     const std::string& name,
+                                     void* user_data,
+                                     void *callback_fcn);
+
+
 private:
         LLHandle<LLView> mBranch;
 }; // end class LLMenuItemBranchGL
@@ -668,6 +759,12 @@ public:
         void show(S32 x, S32 y, BOOL mouse_down);
         void hide(BOOL item_selected);
 
+        virtual BOOL setCtrlResponse(U8 llMenuItemCallType,
+                                     const std::string& name,
+                                     void* user_data,
+                                     void *callback_fcn) { return FALSE; } ;
+
+
 private:
         LLMenuItemGL *pieItemFromXY(S32 x, S32 y);
         S32                       pieItemIndexFromXY(S32 x, S32 y);
@@ -729,6 +826,12 @@ public:
 
         void resetMenuTrigger() { mAltKeyTrigger = FALSE; }
 
+        virtual BOOL setCtrlResponse(U8 llMenuItemCallType,
+                                     const std::string& name,
+                                     void* user_data,
+                                     void *callback_fcn) { return FALSE; } ;
+
+
 private:
         void checkMenuTrigger();
 
@@ -814,6 +917,12 @@ public:
         virtual void draw(void);
         virtual U32 getNominalHeight() const;
 
+        virtual BOOL setCtrlResponse(U8 llMenuItemCallType,
+                                     const std::string& name,
+                                     void* user_data,
+                                     void *callback_fcn) { return FALSE; } ;
+
+
 private:
         LLHandle<LLFloater> mParentHandle;
 };
@@ -832,4 +941,5 @@ private:
         LLEditMenuHandlerMgr() {};
 };
 
+
 #endif // LL_LLMENUGL_H
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 40dafcd..28859b1 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -385,43 +385,18 @@ LLTextEditor::LLTextEditor(
         mHTML.clear();
 
         // make the popup menu available
-        //LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_texteditor.xml", parent_view);
-        LLMenuGL* menu = new LLMenuGL("wot");
-        /*if (!menu)
-        {
-                        menu = new LLMenuGL(LLStringUtil::null);
-        }*/
-        menu->append(new LLMenuItemCallGL("Cut", context_cut, context_enable_cut, this));
-        menu->append(new LLMenuItemCallGL("Copy", context_copy, context_enable_copy, this));
-        menu->append(new LLMenuItemCallGL("Paste", context_paste, context_enable_paste, this));
-        menu->append(new LLMenuItemCallGL("Delete", context_delete, context_enable_delete, this));
-        menu->append(new LLMenuItemCallGL("Select All", context_selectall, context_enable_selectall, this));
-        menu->appendSeparator("Transep");
-        LLMenuGL* translatemenu = new LLMenuGL("Translate To");
-        translatemenu->setCanTearOff(FALSE);
-        translatemenu->append(new LLMenuItemCallGL("en", "English", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("da", "Danish", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("de", "Deutsch(German)", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("es", "Spanish", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("fr", "French", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("it", "Italian", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("hu", "Hungarian", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("nl", "Dutch", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("pl", "Polish", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("pt", "Portugese", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("ru", "Russian", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("tr", "Turkish", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("uk", "Ukrainian", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("zh", "Chinese", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("ja", "Japanese", context_translate, context_enable_translate, this));
-        translatemenu->append(new LLMenuItemCallGL("ko", "Korean", context_translate, context_enable_translate, this));
-        
-        menu->appendMenu(translatemenu);
-        menu->appendSeparator("Spelsep");
-        //menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
-        menu->setCanTearOff(FALSE);
-        menu->setVisible(FALSE);
+
+        LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_rightclick_text.xml",this);
+        if (!menu)
+        {
+                  menu = new LLMenuGL(LLStringUtil::null);
+        }
+
+        defineMenuCallbacks(menu);
         mPopupMenuHandle = menu->getHandle();
+        menu->setBorderColor(gColors.getColor("MenuItemDisabledColor"));
+        menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
+
 }
 
 LLTextEditor::~LLTextEditor()
@@ -476,7 +451,7 @@ void LLTextEditor::context_translate(void * data)
 {
         LLTextEditor* line = (LLTextEditor*)data;
         LLMenuGL* menu = line ? (LLMenuGL*)(line->mPopupMenuHandle.get()) : NULL;
-        LLMenuGL* translate_menu = menu ? menu->getChildMenuByName("Translate To", TRUE) : NULL;
+        LLMenuGL* translate_menu = menu ? menu->getChildMenuByName("Translation Options", TRUE) : NULL;
         if (!translate_menu)
         {
                 return;
@@ -530,10 +505,10 @@ void LLTextEditor::spell_show(void * data)
         }
 }
 
-std::vector<S32> LLTextEditor::getMisspelledWordsPositions()
+void LLTextEditor::getMisspelledWordsPositions(std::vector<S32>& misspell_positions)
 {
         resetSpellDirty();
-        std::vector<S32> thePosesOfBadWords;
+        misspell_positions.clear();
         LLWString& text = mWText;
         S32 wordStart=0;
         S32 wordEnd=spellStart;//start at the scroll start
@@ -552,23 +527,26 @@ std::vector<S32> LLTextEditor::getMisspelledWordsPositions()
                         {
                                 wordEnd++;
                         }       
-                        //got a word :D
-
-                        std::string regText(text.begin(),text.end());
-                        std::string selectedWord(regText.substr(wordStart,wordEnd-wordStart));
                         
-                        if(!glggHunSpell->isSpelledRight(selectedWord))
-                        {       
-                                //misspelled word here, and you have just right clicked on it
+                        //got a word? -- MC
+                        if (wordStart != wordEnd)
+                        {
+                                std::string regText(text.begin(),text.end());
+                                std::string selectedWord(regText.substr(wordStart,wordEnd-wordStart));
+                                
+                                if(!selectedWord.empty() && !glggHunSpell->isSpelledRight(selectedWord))
+                                {       
+                                        //misspelled word here, and you have just right clicked on it
 
-                                thePosesOfBadWords.push_back(wordStart);
-                                thePosesOfBadWords.push_back(wordEnd);
+                                        misspell_positions.push_back(wordStart);
+                                        misspell_positions.push_back(wordEnd);
+                                }
                         }
                 }
                 wordEnd++;
         }
-        return thePosesOfBadWords;
 }
+
 void LLTextEditor::spell_add(void* data)
 {
         SpellMenuBind* tempBind = (SpellMenuBind*)data;
@@ -615,6 +593,68 @@ void LLTextEditor::context_selectall(void* data)
         if(line)line->selectAll();
 }
 
+// method to define the associated callbacks
+void LLTextEditor::defineMenuCallbacks(LLMenuGL* menu) {
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Cut Text",
+                              this,
+                              (void*)context_enable_cut);
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                              "Cut Text",
+                              this,
+                              (void*)context_cut);
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Copy Text",
+                              this,
+                              (void*)context_enable_copy);
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                              "Copy Text",
+                              this,
+                              (void*)context_copy);
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Paste Text",
+                              this,
+                              (void*)context_enable_paste);
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                              "Paste Text",
+                              this,
+                              (void*)context_paste);
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Delete Text",
+                              this,
+                              (void*)context_enable_delete);
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                              "Delete Text",
+                              this,
+                              (void*)context_delete);
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Select All Text",
+                              this,
+                              (void*)context_enable_selectall);
+        menu->setCtrlResponse(1+LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_CLICK,
+                              "Select All Text",
+                              this,
+                              (void*)context_selectall);
+
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_ON_ENABLE,
+                              "Translate Text",
+                              this,
+                              (void*)context_enable_translate);
+        menu->setCtrlResponse(LLCallbackInformation::LL_MENU_ITEM_CALL_GL_TRANSLATE,
+                              "Translate Text",
+                              this,
+                              (void*)context_translate);
+
+
+
+}
+
+
 void LLTextEditor::setTrackColor( const LLColor4& color )
 { 
         mScrollbar->setTrackColor(color); 
@@ -3240,16 +3280,16 @@ void LLTextEditor::drawMisspelled()
                         {
                                 spellEnd = newSpellEnd;
                                 spellStart = newSpellStart;
-                                misspellLocations = getMisspelledWordsPositions();
+                                getMisspelledWordsPositions(mMisspellLocations);
                         }
                 }
                 //draw
-                if (glggHunSpell->getSpellCheckHighlight())
+                if (!mMisspellLocations.empty() && glggHunSpell->getSpellCheckHighlight())
                 {
-                        for (int i = 0; i<(int)misspellLocations.size() ;i++)
+                        for (int i = 0; i<(int)mMisspellLocations.size() ;i++)
                         {
-                                S32 wstart = misspellLocations[i];
-                                S32 wend = misspellLocations[++i];
+                                S32 wstart = mMisspellLocations[i];
+                                S32 wend = mMisspellLocations[++i];
                                 //start curor code mod
                                 const LLWString &text = mWText;
                                 const S32 text_len = getLength();
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index f2a831b..759cd69 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -166,7 +166,10 @@ public:
         static void spell_correct(void* data);
         static void spell_add(void* data);
         static void spell_show(void* data);
-        std::vector<S32> getMisspelledWordsPositions();
+
+        void getMisspelledWordsPositions(std::vector<S32>& misspell_positions);
+
+    void defineMenuCallbacks(LLMenuGL* menu);
 
         void                    selectNext(const std::string& search_text_in, BOOL case_insensitive, BOOL wrap = TRUE);
         BOOL                    replaceText(const std::string& search_text, const std::string& replace_text, BOOL case_insensitive, BOOL wrap = TRUE);
@@ -534,7 +537,7 @@ private:
         LLWString               mPrevSpelledText;               // saved string so we know whether to respell or not
         S32 spellStart;
         S32 spellEnd;
-        std::vector<S32> misspellLocations;     // where all the mispelled words are
+        std::vector<S32> mMisspellLocations;     // where all the mispelled words are
         BOOL                    mSpellCheckable;                        // set in xui as "spell_check". Default value for a field
         BOOL                    mAllowTranslate;                // set in xui as "allow_translate".
         
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index f4c3755..3127299 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -154,6 +154,7 @@ set(viewer_SOURCE_FILES
     llfloaterassetbrowser.cpp
     llfloaterauction.cpp
     llfloateravatarinfo.cpp
+    llfloateravatarlist.cpp
     llfloateravatarpicker.cpp
     llfloateravatartextures.cpp
     llfloaterbeacons.cpp
@@ -616,6 +617,7 @@ set(viewer_HEADER_FILES
     llfloaterassetbrowser.h
     llfloaterauction.h
     llfloateravatarinfo.h
+    llfloateravatarlist.h
     llfloateravatarpicker.h
     llfloateravatartextures.h
     llfloaterbeacons.h
diff --git a/linden/indra/newview/app_settings/cloud.xml b/linden/indra/newview/app_settings/cloud.xml
index e62bcf1..fdc420a 100644
--- a/linden/indra/newview/app_settings/cloud.xml
+++ b/linden/indra/newview/app_settings/cloud.xml
@@ -49,8 +49,9 @@
     <key>ParticleMaxAge</key><!-- how long a single particle can live with 0 forever -->
         <real>4</real>
 
-    <key>PartImageID</key> <!--This setting is ignored for the cloud, used instead for now is the hardcoded -->
-        <string>0000000000000-0000-0000-000000000000</string><!-- skins/default/textures/cloud-particle.j2c -->
+    <key>PartImageID</key> 
+        <!--if this is a NULL UUID the hardcoded skins/default/textures/cloud-particle.j2c is used-->
+        <string>0000000000000-0000-0000-000000000000</string>
 
     <key>StartColor</key><!-- RGBA -->
         <array>
diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index c6360d4..bea272d 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -1,7 +1,7 @@
 <llsd>
   <array>
     <map>
-      <key>default_grids_version</key><string>32</string>
+      <key>default_grids_version</key><string>33</string>
     </map>
 
     <!-- Second Life -->
@@ -191,17 +191,17 @@
 
     <!-- InWorldz -->
     <map>
-      <key>gridname</key>  <string>Inworldz</string>
+      <key>gridname</key>  <string>InWorldz</string>
       <key>gridnick</key>  <string>inworldz</string>
       <key>platform</key>  <string>OpenSim</string>
       <key>loginuri</key>  <string>http://inworldz.com:8002/</string>
       <key>loginpage</key> <string>http://inworldz.com/loginscreen.php</string>
       <key>helperuri</key> <string>http://inworldz.com/</string>
-      <key>password</key>  <string>http://inworldz.com/wpassword</string>
-      <key>register</key>  <string>http://inworldz.com/register</string>
-      <key>support</key>   <string>http://inworldz.com/help</string>
-      <key>website</key>   <string>http://inworldz.com/about/</string>
-      <key>version</key>   <string>1</string>
+      <key>password</key>  <string>http://inworldz.com/loginerror.php?error=2</string>
+      <key>register</key>  <string>http://inworldz.com/register.php</string>
+      <key>support</key>   <string>http://inworldz.com/support.php</string>
+      <key>website</key>   <string>http://inworldz.com/</string>
+      <key>version</key>   <string>2</string>
     </map> 
 
     <!-- meta 7 -->
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index d0b8108..833f191 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2,7 +2,9 @@
 <llsd>
 <map>
 
-<!-- for Aurora Sim -->
+  <!-- BEGIN IMPRUDENCE-SPECIFIC SETTINGS -->
+  
+  <!-- begin Aurora-specific settings -->
 
   <key>TimeOffset</key>
   <map>
@@ -48,7 +50,8 @@
     <key>Value</key>
     <string>SLVoice</string>
   </map>
-  <!-- Imprudence-specific settings -->
+  
+  <!-- end Aurora-specific settings -->
 
   <key>AllowEditingOfTrees</key>
   <map>
@@ -135,6 +138,17 @@
       <real>1</real>
     </array>
   </map>
+  <key>HeadFollowsMouse</key>
+  <map>
+    <key>Comment</key>
+    <string>IF your avatars head follows your mouse movements (then the extend is defined in YawFromMousePosition  and PitchFromMousePosition</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>HighlightOwnNameInChat</key>
   <map>
     <key>Comment</key>
@@ -913,6 +927,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>PreviewAvatarAsCloud</key>
+  <map>
+    <key>Comment</key>
+    <string>Turns your avatar into the paricle clud if true</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>PrivateLookAtTarget</key>
   <map>
     <key>Comment</key>
@@ -946,6 +971,17 @@
     <key>Value</key>
     <real>0.0</real>
   </map>
+  <key>SaveSearchResults</key>
+  <map>
+    <key>Comment</key>
+    <string>Saves search results when closing search window rather than clearing resources</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>ShowLookAtNames</key>
   <map>
     <key>Comment</key>
@@ -1667,6 +1703,23 @@
   </map>
 
   <!-- Begin: Client Name Tag -->
+
+  <key>ImprudenceTagColor</key>
+  <map>
+    <key>Comment</key>
+    <string>Color of Imprudence tags (displayed only locally)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Color4</string>
+    <key>Value</key>
+    <array>
+      <real>0.79</real>
+      <real>0.44</real>
+      <real>0.88</real>
+      <real>1</real>
+    </array>
+  </map>
   <key>ShowClientColor</key>
   <map>
     <key>Comment</key>
@@ -2069,6 +2122,8 @@
   </map>
   
   <!-- End: Spellcheck & Translation -->
+  
+  <!-- Begin: RLVa -->
 
   <key>RestrainedLove</key>
   <map>
@@ -2246,6 +2301,224 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+
+  <!-- End: RLVa -->
+  
+  <!-- Begin: socks5 -->
+
+  <key>Socks5ProxyEnabled</key>
+  <map>
+    <key>Comment</key>
+    <string>Use Socks5 Proxy</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>Socks5HttpProxyType</key>
+  <map>
+    <key>Comment</key>
+    <string>Proxy type to use for HTTP operations</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <integer>None</integer>
+  </map>
+  <key>Socks5ProxyHost</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Proxy Host</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string />
+  </map>
+  <key>Socks5ProxyPort</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Proxy Port</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>1080</integer>
+  </map>
+  <key>Socks5Username</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Username</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
+  <key>Socks5Password</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Password</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
+  <key>Socks5AuthType</key>
+  <map>
+    <key>Comment</key>
+    <string>Selected Auth mechanism for Socks5</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>None</string>
+  </map>
+
+  <!-- End: socks5 -->
+
+  <!-- Begin: full radar (Advanced menu) -->
+
+  <key>ShowRadar</key>
+  <map>
+    <key>Comment</key>
+    <string>Show the radar floater</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>FloaterRadarRect</key>
+  <map>
+    <key>Comment</key>
+    <string>Rectangle for Radar</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Rect</string>
+    <key>Value</key>
+    <array>
+      <integer>0</integer>
+      <integer>400</integer>
+      <integer>200</integer>
+      <integer>0</integer>
+    </array>
+  </map>
+  <key>RadarKeepOpen</key>
+  <map>
+    <key>Comment</key>
+    <string>Keeps radar updates running in background</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarUpdateRate</key>
+  <map>
+    <key>Comment</key>
+    <string>Radar update rate (0 = high, 1 = medium, 2 = low)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>RadarAlertSim</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether the radar emits chat alerts for avatars entering/exiting sim</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarAlertDraw</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether the radar emits chat alerts for avatars entering/exiting draw distance</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarAlertShoutRange</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether the radar emits chat alerts for avatars entering/exiting shout range</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarAlertChatRange</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether the radar emits chat alerts for avatars entering/exiting chat range</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>RadarChatAlerts</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether the radar emits chat alerts regarding the status of avatars it displays</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarChatKeys</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable private chat alerts for avatars entering the region</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarChatKeysChannel</key>
+  <map>
+    <key>Comment</key>
+    <string>Private channel used to broadcast the key of incoming avatars</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <integer>-8888888</integer>
+  </map>
+  
+  <!-- End: full radar (Advanced menu) -->
+
+  <!-- END IMPRUDENCE-SPECIFIC SETTINGS -->
+  
   <key>AFKTimeout</key>
   <map>
     <key>Comment</key>
@@ -3002,7 +3275,7 @@
   <key>BrowserProxyAddress</key>
   <map>
     <key>Comment</key>
-    <string>Address for the Web Proxy]</string>
+    <string>Address for the Web Proxy</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -5619,17 +5892,6 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  <key>FirstName</key>
-  <map>
-    <key>Comment</key>
-    <string>Login first name</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>String</string>
-    <key>Value</key>
-    <string />
-  </map>
   <key>FirstPersonAvatarVisible</key>
   <map>
     <key>Comment</key>
@@ -7530,17 +7792,6 @@
       <key>Value</key>
       <string>find_all_panel</string>
     </map>
-    <key>LastName</key>
-    <map>
-      <key>Comment</key>
-      <string>Login last name</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string />
-    </map>
     <key>LastPrefTab</key>
     <map>
       <key>Comment</key>
@@ -7915,17 +8166,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>Marker</key>
-    <map>
-      <key>Comment</key>
-      <string>[NOT USED]</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string />
-    </map>
     <key>MaxDragDistance</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index a220cf2..051f2a3 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -20,6 +20,6 @@ need to be changed manually - MC
   <viewer version_patch="0" />
 
   <!--string-->
-  <viewer version_test="Experimental 2011.04.02" />
+  <viewer version_test="Experimental 2011.04.19" />
   
 </viewer_version>
diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index b5a7e8c..9777114 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -367,7 +367,10 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                                         {
                                                 gOverlayBar->toggleMusicPlay(gOverlayBar);
                                         }
-                                        gAudioStream->startInternetStream(status);
+                                        if (gAudioStream)
+                                        {
+                                                gAudioStream->startInternetStream(status);
+                                        }
                                         return false;
                                 }
                         }
diff --git a/linden/indra/newview/floatergriddefault.cpp b/linden/indra/newview/floatergriddefault.cpp
index 6a2526d..b89674f 100644
--- a/linden/indra/newview/floatergriddefault.cpp
+++ b/linden/indra/newview/floatergriddefault.cpp
@@ -49,26 +49,7 @@ FloaterGridDefault::~FloaterGridDefault()
 BOOL FloaterGridDefault::postBuild()
 {
         // populate the grid chooser
-        LLScrollListCtrl* grid_list = getChild<LLScrollListCtrl>("grid_list");
-        grid_list->deleteAllItems();
-
-        LLSD element;
-
-        for (HippoGridManager::GridIterator it = gHippoGridManager->beginGrid(); it != gHippoGridManager->endGrid(); ++it) 
-        {
-                std::string grid_nick = it->second->getGridNick();
-                // There's no reason why empty grids nicks should be in this list, ugh
-                if (!grid_nick.empty()) 
-                {
-                        element["id"] = grid_nick;
-                        element["columns"][0]["column"] = "grid";
-                        element["columns"][0]["type"] = "text";
-                        element["columns"][0]["value"] = grid_nick;
-                        grid_list->addElement(element, ADD_BOTTOM);
-                }
-        }
-
-        grid_list->setFocus(TRUE);
+        refreshGridList();
 
         childSetAction("btn_ok", onClickOK, this);
         childSetAction("btn_cancel", onClickCancel, this);
@@ -99,3 +80,39 @@ void FloaterGridDefault::onClickCancel(void* userdata)
         FloaterGridDefault* self = (FloaterGridDefault*)userdata;
         self->close();
 }
+
+// static
+void FloaterGridDefault::refreshGridList()
+{
+        LLScrollListCtrl* grid_list = FloaterGridDefault::getInstance()->getChild<LLScrollListCtrl>("grid_list");
+        if (grid_list)
+        {
+                grid_list->deleteAllItems();
+
+                LLSD element;
+
+                for (HippoGridManager::GridIterator it = gHippoGridManager->beginGrid(); 
+                        it != gHippoGridManager->endGrid(); ++it) 
+                {
+                        std::string grid_nick = it->second->getGridNick();
+                        // There's no reason why empty grids nicks should be in this list...
+                        if (grid_nick.empty()) 
+                        {
+                                continue;
+                        }
+                        else
+                        {
+                                element["id"] = grid_nick;
+                                element["columns"][0]["column"] = "grid_nick";
+                                element["columns"][0]["type"] = "text";
+                                element["columns"][0]["value"] = grid_nick;
+                                element["columns"][1]["column"] = "grid_name";
+                                element["columns"][1]["type"] = "text";
+                                element["columns"][1]["value"] = it->second->getGridName();
+                                grid_list->addElement(element, ADD_BOTTOM);
+                        }
+                }
+
+                grid_list->setFocus(TRUE);
+        }
+}
diff --git a/linden/indra/newview/floatergriddefault.h b/linden/indra/newview/floatergriddefault.h
index 009e23f..5c07efe 100644
--- a/linden/indra/newview/floatergriddefault.h
+++ b/linden/indra/newview/floatergriddefault.h
@@ -41,6 +41,9 @@ public:
 
         /*virtual*/ BOOL postBuild();
 
+        // refresh the default grid list selection. Steals focus
+        void refreshGridList();
+
 private:
         static void onClickOK(void* userdata);
         static void onClickCancel(void* userdata);
diff --git a/linden/indra/newview/floatergridmanager.cpp b/linden/indra/newview/floatergridmanager.cpp
index 298fe35..257c210 100644
--- a/linden/indra/newview/floatergridmanager.cpp
+++ b/linden/indra/newview/floatergridmanager.cpp
@@ -1,54 +1,66 @@
-/*
- *  floatergridmanager.cpp
- *  This is Meerkats grid manager.
- *  -Patrick Sapinski (Monday, August 17, 2009)
- *
- *  Modified by McCabe Maxsted for Imprudence
- */
+/**
+* @file floatergridmanager.cpp
+* @brief UI for managing grid information
+*
+* $LicenseInfo:firstyear=2011&license=viewergpl$
+*
+* Copyright (c) 2011, McCabe Maxsted
+* based on Meerkat's grid manager by Patrick Sapinski
+*
+* Imprudence Viewer Source Code
+* 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.
+* $/LicenseInfo$
+*/
 
 #include "llviewerprecompiledheaders.h"
 
 #include "floatergridmanager.h"
 
 #include <boost/algorithm/string.hpp>
+#include "floatergriddefault.h"
 #include "llviewercontrol.h"
 #include "llcombobox.h"
 #include "llscrolllistctrl.h"
 #include "llmd5.h"
+#include "llnotifications.h"
 #include "llurlsimstring.h"
 #include "lluictrlfactory.h"
 #include "hippogridmanager.h"
 #include "llviewernetwork.h"
 #include "llpanellogin.h"
 
-#define PASSWORD_FILLER "123456789!123456"
-
-LoginController* FloaterGridManager::sController = NULL;
-bool FloaterGridManager::sIsInitialLogin;
-std::string FloaterGridManager::sGrid;
+const std::string PASSWORD_FILLER = "123456789!123456";
 
 FloaterGridManager::FloaterGridManager(const LLSD& key)
-:       mState(NORMAL),
-        mCurGrid(gHippoGridManager->getCurrentGridNick()),
-        mIncomingPassword(""),
-        mMungedPassword("")
+        :       
+        mState(GRID_STATE_NORMAL),
+        mCurGrid("")
 {
         llinfos << "Opening grid manager" << llendl;
 
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_grid_manager.xml");
         center();
-
-        LLLineEditor* edit = getChild<LLLineEditor>("avatar_password_edit");
-        if (edit)
-        {
-                edit->setDrawAsterixes(TRUE);
-        }
 }
 
-
 FloaterGridManager::~FloaterGridManager()
 {
-        FloaterGridManager::sController = NULL;
 }
 
 BOOL FloaterGridManager::postBuild()
@@ -64,105 +76,117 @@ BOOL FloaterGridManager::postBuild()
         childSetAction("btn_copy", onClickCopy, this);
         childSetAction("btn_ok", onClickOk, this);
         childSetAction("btn_apply", onClickApply, this);
-        // childSetAction("set_default", onClickDefault, this); // We use the last selected grid as the default
         childSetAction("btn_cancel", onClickCancel, this);
         childSetAction("btn_clear", onClickClear, this);
         childSetAction("btn_gridinfo", onClickGridInfo, this);
-        // childSetAction("btn_help_render_compat", onClickHelpRenderCompat, this); // Ugly ugly ugly
 
         childSetCommitCallback("grid_selector", onSelectGrid, this);
         LLScrollListCtrl* combo = getChild<LLScrollListCtrl>("grid_selector");
         combo->setFocus(TRUE);
 
+        clearGridInfo(true);
+
         refreshGrids();
 
-        return TRUE;
-}
+        // We use the last selected grid as the default
+        HippoGridInfo* first_selected = gHippoGridManager->getGrid(mCurGrid);
+        if (first_selected)
+        {
+                getChild<LLLineEditor>("first_name")->setVisible(!first_selected->isUsernameCompat());
+                getChild<LLLineEditor>("last_name")->setVisible(!first_selected->isUsernameCompat());
+                getChild<LLLineEditor>("username")->setVisible(first_selected->isUsernameCompat());
+        }
+        getChild<LLLineEditor>("gridnick")->setEnabled(false);
 
-void FloaterGridManager::clearInfo()
-{
-        //getChild<LLScrollListCtrl>("grid_selector")->clear();
-        //getChild<LLLineEditor>("gridnick")->clear();
-        //getChild<LLLineEditor>("gridname")->clear();
-        //getChild<LLLineEditor>("loginuri")->clear();
-        getChild<LLLineEditor>("loginpage")->clear();
-        getChild<LLLineEditor>("helperuri")->clear();
-        getChild<LLLineEditor>("website")->clear();
-        getChild<LLLineEditor>("support")->clear();
-        getChild<LLLineEditor>("register")->clear();
-        getChild<LLLineEditor>("password")->clear();
-        //getChild<LLLineEditor>("first_name")->clear();
-        //getChild<LLLineEditor>("last_name")->clear();
-        //getChild<LLLineEditor>("avatar_password")->clear();
-        getChild<LLLineEditor>("search")->clear();
-        //getChild<LLButton>("btn_delete");
-        //getChild<LLButton>("btn_add")
-        //getChild<LLButton>("btn_copy");
-        //getChild<LLButton>("set_default")->setEnabled(FALSE);
-        getChild<LLButton>("btn_gridinfo")->setEnabled(TRUE);
-        //getChild<LLButton>("btn_clear");
-        //getChild<LLButton>("btn_help_render_compat")->setEnabled(FALSE);
+        return TRUE;
 }
 
 void FloaterGridManager::draw()
 {
         refresh();
-
         LLFloater::draw();
 }
 
 void FloaterGridManager::refresh()
 {
-        //TODO: these should just be set in a prompt
-        bool can_edit = (!getChild<LLLineEditor>("gridnick")->getText().empty() &&
-                                         !getChild<LLLineEditor>("loginuri")->getText().empty() &&
-                                         getChild<LLLineEditor>("gridnick")->getText() != "<required>" &&
-                                         getChild<LLLineEditor>("loginuri")->getText() != "<required>");
+        //TODO: new grid creation should just be set in a popup
+        bool can_edit = (!(getChild<LLLineEditor>("gridnick")->getText().empty()) &&
+                                         !(getChild<LLLineEditor>("gridname")->getText().empty()) &&
+                                         !(getChild<LLLineEditor>("loginuri")->getText().empty()));
 
-        //getChild<LLLineEditor>("gridname");
         getChild<LLLineEditor>("loginpage")->setEnabled(can_edit);
         getChild<LLLineEditor>("helperuri")->setEnabled(can_edit);
         getChild<LLLineEditor>("website")->setEnabled(can_edit);
         getChild<LLLineEditor>("support")->setEnabled(can_edit);
         getChild<LLLineEditor>("register")->setEnabled(can_edit);
         getChild<LLLineEditor>("password")->setEnabled(can_edit);
-        //getChild<LLLineEditor>("first_name")->setEnabled(can_edit);
-        //getChild<LLLineEditor>("last_name")->setEnabled(can_edit);
-        //getChild<LLLineEditor>("avatar_password")->setEnabled(can_edit);
+        getChild<LLLineEditor>("first_name")->setEnabled(can_edit);
+        getChild<LLLineEditor>("last_name")->setEnabled(can_edit);
+        getChild<LLLineEditor>("username")->setEnabled(can_edit);
+        getChild<LLLineEditor>("avatar_password")->setEnabled(can_edit);
         getChild<LLLineEditor>("search")->setEnabled(can_edit);
         getChild<LLButton>("btn_delete")->setEnabled(can_edit);
-        //getChild<LLButton>("btn_add")
         //getChild<LLButton>("btn_copy")->setEnabled(can_edit);
-        //getChild<LLButton>("set_default")->setEnabled(can_dit);
         getChild<LLButton>("btn_gridinfo")->setEnabled(can_edit);
         getChild<LLButton>("btn_clear")->setEnabled(can_edit);
-        //getChild<LLButton>("btn_help_render_compat")->setEnabled(can_edit);
+
+        getChild<LLTextBox>("loginpage_text")->setEnabled(can_edit);
+        getChild<LLTextBox>("helperuri_text")->setEnabled(can_edit);
+        getChild<LLTextBox>("website_text")->setEnabled(can_edit);
+        getChild<LLTextBox>("support_text")->setEnabled(can_edit);
+        getChild<LLTextBox>("register_text")->setEnabled(can_edit);
+        getChild<LLTextBox>("password_text")->setEnabled(can_edit);
+        getChild<LLTextBox>("first_name_text")->setEnabled(can_edit);
+        getChild<LLTextBox>("last_name_text")->setEnabled(can_edit);
+        getChild<LLTextBox>("username_text")->setEnabled(can_edit);
+        getChild<LLTextBox>("avatar_password_text")->setEnabled(can_edit);
+        getChild<LLTextBox>("search_text")->setEnabled(can_edit);
 }
 
 void FloaterGridManager::refreshGrids()
 {
-        LLScrollListCtrl *grids = FloaterGridManager::getInstance()->getChild<LLScrollListCtrl>("grid_selector");
+        // no need to update the list while editing
+        if (FloaterGridManager::getInstance()->getGridState() >= GRID_STATE_NEW)
+        {
+                return;
+        }
+
+        LLScrollListCtrl* grid_list = FloaterGridManager::getInstance()->getChild<LLScrollListCtrl>("grid_selector");
         std::string lastSelectedItem;
         LLSD element;
 
-        if (grids->getFirstSelected())
+        if (grid_list->getFirstSelected())
         {
-                lastSelectedItem = grids->getFirstSelected()->getValue().asString();
+                // grid NICK
+                lastSelectedItem = grid_list->getFirstSelected()->getColumn(0)->getValue().asString();
         }
 
-        grids->deleteAllItems();
+        grid_list->deleteAllItems();
 
-        for (HippoGridManager::GridIterator it = gHippoGridManager->beginGrid(); it != gHippoGridManager->endGrid(); ++it) 
+        // Grids should really have UUIDs, but we'll use their nicks to keep track of 'em instead
+        for (HippoGridManager::GridIterator it = gHippoGridManager->beginGrid(); 
+                 it != gHippoGridManager->endGrid(); ++it) 
         {
                 std::string grid_nick = it->second->getGridNick();
-                // There's no reason why empty grids nicks should be in this list, ugh
-                if (!grid_nick.empty() && grid_nick != gHippoGridManager->getCurrentGridNick()) 
+                
+                if (grid_nick.empty())
+                {
+                        // shouldn't ever happen
+                        continue;
+                }
+                
+                // Note: default sorted by grid NAME in the XUI
+                if (grid_nick != gHippoGridManager->getCurrentGridNick()) 
                 {
                         element["id"] = grid_nick;
-                        element["columns"][0]["column"] = "grid";
+                        element["columns"][0]["column"] = "grid_nick";
                         element["columns"][0]["type"] = "text";
                         element["columns"][0]["value"] = grid_nick;
-                        grids->addElement(element, ADD_BOTTOM);
+                        element["columns"][1]["column"] = "grid_name";
+                        element["columns"][1]["type"] = "text";
+                        element["columns"][1]["value"] = it->second->getGridName();
+
+                        grid_list->addElement(element, ADD_BOTTOM);
                 }
         }
 
@@ -172,368 +196,367 @@ void FloaterGridManager::refreshGrids()
         if (!gHippoGridManager->getCurrentGridNick().empty()) 
         {
                 element["id"] = gHippoGridManager->getCurrentGridNick();
-                element["columns"][0]["column"] = "grid";
+                element["columns"][0]["column"] = "grid_nick";
                 element["columns"][0]["type"] = "text";
                 element["columns"][0]["font-style"] = "BOLD";
                 element["columns"][0]["value"] = gHippoGridManager->getCurrentGridNick();
-                grids->addElement(element, ADD_TOP);
+                element["columns"][1]["column"] = "grid_name";
+                element["columns"][1]["type"] = "text";
+                element["columns"][1]["value"] = gHippoGridManager->getCurrentGrid()->getGridName();
+
+                grid_list->addElement(element, ADD_TOP);
         }
 
         // Reselect the item if we had one selected
         if (lastSelectedItem.empty())
         {
-                grids->selectItemByLabel(gHippoGridManager->getCurrentGridNick());
+                grid_list->selectItemByLabel(gHippoGridManager->getCurrentGridNick());
+                FloaterGridManager::getInstance()->setCurGrid(gHippoGridManager->getCurrentGridNick());
         }
         else
         {
-                grids->selectItemByLabel(lastSelectedItem);
-        }
-
-        // TODO: get rid of all this state junk
-        if ((FloaterGridManager::getInstance()->getState() == ADD_NEW) || (FloaterGridManager::getInstance()->getState() == ADD_COPY)) 
-        {
-                grids->addElement("<new>", ADD_BOTTOM);
+                grid_list->selectItemByLabel(lastSelectedItem);
+                FloaterGridManager::getInstance()->setCurGrid(lastSelectedItem);
         }
 
         //if (selectIndex >= 0) 
         //{
-        //      grids->setCurrentByIndex(selectIndex);
+        //      grid_list->setCurrentByIndex(selectIndex);
         //} 
         //else 
         //{
-        //      grids->setLabel(LLStringExplicit(""));  // LLComboBox::removeall() does not clear the label
+        //      grid_list->setLabel(LLStringExplicit(""));  // LLComboBox::removeall() does not clear the label
         //}
-                        
-        // FloaterGridManager::getInstance()->childSetTextArg("default_grid", "[DEFAULT]", (defaultGrid != "")? defaultGrid: " ");
 
-        FloaterGridManager::getInstance()->childSetEnabled("btn_delete", grids->getItemCount() > 0);
+        FloaterGridManager::getInstance()->childSetEnabled("btn_delete", grid_list->getItemCount() > 0);
+        FloaterGridManager::getInstance()->childSetEnabled("btn_copy", grid_list->getItemCount() > 0);
 
-        FloaterGridManager::getInstance()->childSetEnabled("btn_copy", (FloaterGridManager::getInstance()->getState() == NORMAL) && (grids->getItemCount() > 0));
-        // FloaterGridManager::getInstance()->childSetEnabled("set_default", (FloaterGridManager::getInstance()->getState() == NORMAL) && (grids->getItemCount() > 0));
-        FloaterGridManager::getInstance()->childSetEnabled("gridnick", (FloaterGridManager::getInstance()->getState() == ADD_NEW) || (FloaterGridManager::getInstance()->getState() == ADD_COPY));
-
-        if (FloaterGridManager::getInstance()->getState() == NORMAL) 
+        HippoGridInfo *gridInfo = gHippoGridManager->getGrid(FloaterGridManager::getInstance()->mCurGrid);
+        if (gridInfo) 
         {
-                HippoGridInfo *gridInfo = gHippoGridManager->getGrid(FloaterGridManager::getInstance()->getCurGrid());
-                if (gridInfo) 
+                // Remember: NEVER let users change an existing grid's nick. Bad juju awaits if you do
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("gridnick")->setText(gridInfo->getGridNick());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("gridname")->setText(gridInfo->getGridName());
+
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("loginuri")->setText(gridInfo->getLoginURI());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("loginpage")->setText(gridInfo->getLoginPage());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("helperuri")->setText(gridInfo->getHelperURI());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("website")->setText(gridInfo->getWebSite());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("support")->setText(gridInfo->getSupportURL());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("register")->setText(gridInfo->getRegisterURL());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("password")->setText(gridInfo->getPasswordURL());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("first_name")->setText(gridInfo->getFirstName());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("last_name")->setText(gridInfo->getLastName());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("username")->setText(gridInfo->getUsername());
+
+                if (gridInfo->getPassword().empty())
                 {
-                        FloaterGridManager::getInstance()->childSetText("gridnick", gridInfo->getGridNick());
-                        //FloaterGridManager::getInstance()->childSetText("grid_name", gridInfo->getGridName());
-                        FloaterGridManager::getInstance()->childSetText("loginuri", gridInfo->getLoginUri());
-                        FloaterGridManager::getInstance()->childSetText("loginpage", gridInfo->getLoginPage());
-                        FloaterGridManager::getInstance()->childSetText("helperuri", gridInfo->getHelperUri());
-                        FloaterGridManager::getInstance()->childSetText("website", gridInfo->getWebSite());
-                        FloaterGridManager::getInstance()->childSetText("support", gridInfo->getSupportUrl());
-                        FloaterGridManager::getInstance()->childSetText("register", gridInfo->getRegisterUrl());
-                        FloaterGridManager::getInstance()->childSetText("password", gridInfo->getPasswordUrl());
-
-                        // FloaterGridManager::getInstance()->childSetText("first_name", gridInfo->getFirstName());
-                        // FloaterGridManager::getInstance()->childSetText("last_name", gridInfo->getLastName());
-                        // if(gridInfo->getAvatarPassword().length() == 32)
-                        //      FloaterGridManager::getInstance()->childSetText("avatar_password", std::string(PASSWORD_FILLER));
-                        // else if(gridInfo->getPasswordUrl().empty())
-                        //      FloaterGridManager::getInstance()->childSetText("avatar_password", std::string(""));
-
-                         if (gridInfo->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) 
-                         {
-                                FloaterGridManager::getInstance()->childSetEnabled("search", false);
-                                FloaterGridManager::getInstance()->childSetText("search", LLStringUtil::null);
-                                //childSetEnabled("render_compat", false);
-                                //childSetValue("render_compat", false);
-                         } 
-                         else 
-                         {
-                                FloaterGridManager::getInstance()->childSetEnabled("search", true);
-                                FloaterGridManager::getInstance()->childSetText("search", gridInfo->getSearchUrl());
-                                //childSetEnabled("render_compat", true);
-                                //childSetValue("render_compat", gridInfo->isRenderCompat());
-                         }
-
-                }       
-                else 
+                        FloaterGridManager::getInstance()->getChild<LLLineEditor>("avatar_password")->setText(LLStringExplicit(""));
+                }
+                else
                 {
-                        FloaterGridManager::getInstance()->childSetText("gridnick", LLStringUtil::null);
-                        FloaterGridManager::getInstance()->childSetText("gridname", LLStringUtil::null);
-                        FloaterGridManager::getInstance()->childSetText("loginuri", LLStringUtil::null);
-                        FloaterGridManager::getInstance()->childSetText("loginpage", LLStringUtil::null);
-                        FloaterGridManager::getInstance()->childSetText("helperuri", LLStringUtil::null);
-                        FloaterGridManager::getInstance()->childSetText("website", LLStringUtil::null);
-                        FloaterGridManager::getInstance()->childSetText("support", LLStringUtil::null);
-                        FloaterGridManager::getInstance()->childSetText("register", LLStringUtil::null);
-                        FloaterGridManager::getInstance()->childSetText("password", LLStringUtil::null);
-                        // FloaterGridManager::getInstance()->childSetText("first_name", LLStringUtil::null);
-                        // FloaterGridManager::getInstance()->childSetText("last_name", LLStringUtil::null);
-                        // FloaterGridManager::getInstance()->childSetText("avatar_password", LLStringUtil::null);
-                        FloaterGridManager::getInstance()->childSetText("search", LLStringUtil::null);
+                        FloaterGridManager::getInstance()->getChild<LLLineEditor>("avatar_password")->setText(PASSWORD_FILLER);
                 }
-        } 
-        else if (FloaterGridManager::getInstance()->getState() == ADD_NEW) 
-        {
-                llinfos << "mState == ADD_NEW" << llendl;
-                std::string required = "<required>";
-                FloaterGridManager::getInstance()->childSetText("gridnick", required);
-                FloaterGridManager::getInstance()->childSetText("gridname", LLStringUtil::null);
-                FloaterGridManager::getInstance()->childSetText("loginuri", required);
-                FloaterGridManager::getInstance()->childSetText("loginpage", LLStringUtil::null);
-                FloaterGridManager::getInstance()->childSetText("helperuri", LLStringUtil::null);
-                FloaterGridManager::getInstance()->childSetText("website", LLStringUtil::null);
-                FloaterGridManager::getInstance()->childSetText("support", LLStringUtil::null);
-                FloaterGridManager::getInstance()->childSetText("register", LLStringUtil::null);
-                FloaterGridManager::getInstance()->childSetText("password", LLStringUtil::null);
-                // FloaterGridManager::getInstance()->childSetText("first_name", LLStringUtil::null);
-                // FloaterGridManager::getInstance()->childSetText("last_name", LLStringUtil::null);
-                // FloaterGridManager::getInstance()->childSetText("avatar_password", LLStringUtil::null);
-                //childSetEnabled("search", true);
-                FloaterGridManager::getInstance()->childSetText("search", LLStringUtil::null);
-        } 
-        else if (FloaterGridManager::getInstance()->getState() == ADD_COPY) 
-        {
-                llinfos << "mState == ADD_COPY" << llendl;
-                FloaterGridManager::getInstance()->childSetText("gridnick", LLStringExplicit("<required>"));
-        } 
+                
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("first_name")->setVisible(!gridInfo->isUsernameCompat());
+                FloaterGridManager::getInstance()->getChild<LLTextBox>("first_name_text")->setVisible(!gridInfo->isUsernameCompat());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("last_name")->setVisible(!gridInfo->isUsernameCompat());
+                FloaterGridManager::getInstance()->getChild<LLTextBox>("last_name_text")->setVisible(!gridInfo->isUsernameCompat());
+                FloaterGridManager::getInstance()->getChild<LLLineEditor>("username")->setVisible(gridInfo->isUsernameCompat());
+                FloaterGridManager::getInstance()->getChild<LLTextBox>("username_text")->setVisible(gridInfo->isUsernameCompat());
+
+                if (gridInfo->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) 
+                {
+                        FloaterGridManager::getInstance()->childSetEnabled("search", false);
+                        FloaterGridManager::getInstance()->getChild<LLLineEditor>("search")->setText(LLStringExplicit(""));
+                } 
+                else 
+                {
+                         FloaterGridManager::getInstance()->childSetEnabled("search", true);
+                         FloaterGridManager::getInstance()->getChild<LLLineEditor>("search")->setText(gridInfo->getSearchURL());
+                }               
+        }       
         else 
         {
-                llwarns << "Illegal state " << FloaterGridManager::getInstance()->getState() << llendl;         
+                // should never happen, but if so default to creating a new entry
+                FloaterGridManager::getInstance()->setupNewGridEntry();
         }
-        return;
-}
+} 
 
 void FloaterGridManager::update()
 {
-        setState(NORMAL);
-        setCurGrid(gHippoGridManager->getCurrentGridNick());
+        // no need to update the list until we need to
+        if (getGridState() >= GRID_STATE_NEW)
+        {
+                return;
+        }
         refreshGrids();
-        //KOW gHippoLimits->setLimits();
 }
 
 void FloaterGridManager::applyChanges()
-{ 
-        HippoGridInfo* gridInfo = gHippoGridManager->getGrid(mCurGrid);
-        if (gridInfo) 
+{
+        // When we apply changes, we update based on the state
+        // of the UI. This is ugly and could really be improved
+
+        // Note: nick and loginuri are required
+        std::string grid_nick = childGetValue("gridnick").asString();
+        if (grid_nick.empty()) 
+        {
+                LLNotifications::instance().add("GridsNoNick");
+                return;
+        }
+
+        if (childGetValue("loginuri").asString().empty()) 
         {
-                if (gridInfo->getGridNick() == childGetValue("gridnick").asString()) 
+                LLSD args;
+                args["[NAME]"] = grid_nick;
+                LLNotifications::instance().add("GridsNoLoginURI", args);
+                return ;
+        }
+
+        HippoGridInfo* grid = NULL;
+
+        // Note: we disable the scroll list during grid creation to prevent conflicts
+        if (getGridState() == GRID_STATE_NEW || getGridState() == GRID_STATE_COPY)
+        {
+                if (gHippoGridManager->hasGridNick(grid_nick)) 
                 {
-                        gridInfo->setGridName(childGetValue("gridname"));
-                        gridInfo->setLoginUri(childGetValue("loginuri"));
-                        gridInfo->setLoginPage(childGetValue("loginpage"));
-                        gridInfo->setHelperUri(childGetValue("helperuri"));
-                        gridInfo->setWebSite(childGetValue("website"));
-                        gridInfo->setSupportUrl(childGetValue("support"));
-                        gridInfo->setRegisterUrl(childGetValue("register"));
-                        gridInfo->setPasswordUrl(childGetValue("password"));
-                        gridInfo->setSearchUrl(childGetValue("search"));
-                        gridInfo->setRenderCompat(childGetValue("render_compat"));
-                        
-                        // gridInfo->setFirstName(childGetValue("first_name"));
-                        // gridInfo->setLastName(childGetValue("last_name"));
-                        // if(childGetValue("avatar_password").asString().empty())
-                        //      gridInfo->setAvatarPassword(std::string(""));
-                        // else if(childGetValue("avatar_password").asString() != std::string(PASSWORD_FILLER))
-                        // {
-                        //      // store account authentication data
-                        //      std::string auth_password = childGetValue("avatar_password");
-                        //      std::string hashed_password;
-                        //      hashPassword(auth_password, hashed_password);
-                        //      gridInfo->setAvatarPassword(hashed_password);
-                        // }
-
-                        //this bug was a feature -Patrick Sapinski (Friday, August 21, 2009)
-                        //LLPanelLogin::setFields(gridInfo->getFirstName(), gridInfo->getLastName(),
-                        //                                              gridInfo->getAvatarPassword(), true);
-                } 
-                else 
+                        LLSD args;
+                        args["[NAME]"] = grid_nick;
+                        LLNotifications::instance().add("GridExists", args);
+                        return;
+                }
+                else
                 {
-                        llwarns << "Grid nickname mismatch, ignoring changes." << llendl;
+                        grid = new HippoGridInfo(grid_nick);
+                }
+        }
+        else // updating grid
+        {
+                if (!gHippoGridManager->hasGridNick(grid_nick))
+                {
+                        llwarns << "Can't update info for a grid we don't know, ignoring changes." << llendl;
+                        return;
+                }
+                else
+                {
+                        grid = gHippoGridManager->getGrid(grid_nick);
                 }
         }
-}
 
+        grid->setGridName(childGetValue("gridname"));
+        grid->setLoginURI(childGetValue("loginuri"));
+        grid->setLoginPage(childGetValue("loginpage"));
+        grid->setHelperURI(childGetValue("helperuri"));
+        grid->setWebSite(childGetValue("website"));
+        grid->setSupportURL(childGetValue("support"));
+        grid->setRegisterURL(childGetValue("register"));
+        grid->setPasswordURL(childGetValue("password"));
+        grid->setSearchURL(childGetValue("search"));
+        grid->setFirstName(childGetValue("first_name"));
+        grid->setLastName(childGetValue("last_name"));
+        grid->setUsername(childGetValue("username"));
+
+        // don't allow users to set their password as PASSWORD_FILLER
+        // would be nice to get grid-specific rules on password formatting, too
+        // passwords are remembered by default when entered in the grid manager (good default?)
+        std::string password_new = childGetValue("avatar_password").asString();
+        std::string password_old = grid->getPassword(); // initialized to ""
+        if (password_new != PASSWORD_FILLER && password_new != password_old)
+        {
+                // store account authentication data
+                grid->setPassword(password_new);
+        }
 
-bool FloaterGridManager::createNewGrid()
-{
-        // check nickname
-        std::string gridnick = childGetValue("gridnick");
-        if (gridnick == "<required>") 
+        FloaterGridManager::getInstance()->getChild<LLScrollListCtrl>("grid_selector")->setEnabled(true);
+        FloaterGridManager::getInstance()->getChild<LLLineEditor>("gridnick")->setEnabled(false);
+
+        if (getGridState() == GRID_STATE_NEW || getGridState() == GRID_STATE_COPY)
         {
-                gridnick = "";
+                gHippoGridManager->addGrid(grid);
+                refreshGrids();
+                FloaterGridManager::getInstance()->getChild<LLScrollListCtrl>("grid_selector")->selectByValue(LLSD(grid_nick));
         }
 
-        if (gridnick.empty()) 
+        // just in case
+        gHippoGridManager->setCurrentGrid(grid_nick);
+
+        // should this be settable?
+        if (grid->isUsernameCompat())
         {
-                LLNotifications::instance().add("GridsNoNick");
-                return false;
+                LLPanelLogin::setFields(grid->getUsername(), grid->getPassword());
         }
-
-        if (gHippoGridManager->getGrid(gridnick)) 
+        else
         {
-                LLSD args;
-                args["[NAME]"] = gridnick;
-                LLNotifications::instance().add("GridExists", args);
-                return false;
+                LLPanelLogin::setFields(grid->getFirstName(), grid->getLastName(), grid->getPassword());
         }
 
-        // check login URI
-        std::string loginuri = childGetValue("loginuri");
-        if ((loginuri.empty()) || (loginuri == "<required>")) 
+        if (FloaterGridDefault::instanceVisible())
         {
-                LLSD args;
-                args["[NAME]"] = gridnick;
-                LLNotifications::instance().add("GridsNoLoginUri", args);
-                return false;
+                FloaterGridDefault::getInstance()->refreshGridList();
         }
 
-        // create new grid
-        HippoGridInfo* grid = new HippoGridInfo(gridnick);
-        grid->setGridName(childGetValue("gridname"));
-        grid->setLoginUri(loginuri);
-        grid->setLoginPage(childGetValue("loginpage"));
-        grid->setHelperUri(childGetValue("helperuri"));
-        grid->setWebSite(childGetValue("website"));
-        grid->setSupportUrl(childGetValue("support"));
-        grid->setRegisterUrl(childGetValue("register"));
-        grid->setPasswordUrl(childGetValue("password"));
-        grid->setSearchUrl(childGetValue("search"));
-        grid->setRenderCompat(childGetValue("render_compat"));
-        gHippoGridManager->addGrid(grid);
-        
-        // grid->setFirstName(childGetValue("first_name"));
-        // grid->setLastName(childGetValue("last_name"));
-        // if(childGetValue("avatar_password").asString().empty())
-        //      grid->setAvatarPassword(std::string(""));
-        // else
-        // {
-        //      std::string hashed_password;
-        //      hashPassword(childGetValue("avatar_password"), hashed_password);
-        //      grid->setAvatarPassword(hashed_password);
-        // }
-        
-        setCurGrid(gridnick);
-        return true;
+        setGridState(GRID_STATE_NORMAL);
 }
 
-void FloaterGridManager::retrieveGridInfo()
+void FloaterGridManager::clearGridInfo(bool clear_all)
 {
-        std::string loginuri = childGetValue("loginuri");
-        if ((loginuri == "") || (loginuri == "<required>")) 
-        {
-                LLNotifications::instance().add("GridInfoNoLoginUri");
-                return;
+        if (clear_all)
+        {
+                getChild<LLLineEditor>("gridnick")->clear();
+                getChild<LLLineEditor>("gridname")->clear();
+                getChild<LLLineEditor>("loginuri")->clear();
+                getChild<LLLineEditor>("password")->clear();
+                getChild<LLLineEditor>("first_name")->clear();
+                getChild<LLLineEditor>("last_name")->clear();
+                getChild<LLLineEditor>("username")->clear();
+                getChild<LLLineEditor>("avatar_password")->clear();
         }
 
-        HippoGridInfo* grid = 0;
-        bool cleanupGrid = false;
+        getChild<LLLineEditor>("loginpage")->clear();
+        getChild<LLLineEditor>("helperuri")->clear();
+        getChild<LLLineEditor>("website")->clear();
+        getChild<LLLineEditor>("support")->clear();
+        getChild<LLLineEditor>("register")->clear();
+        getChild<LLLineEditor>("search")->clear();
+
+        getChild<LLButton>("btn_gridinfo")->setEnabled(TRUE);
+}
 
-        if (mState == NORMAL) 
+void FloaterGridManager::createNewGrid()
+{
+        // warn us if anything's dirty
+        if (getChild<LLLineEditor>("gridnick")->isDirty() ||
+                getChild<LLLineEditor>("gridname")->isDirty() ||
+                getChild<LLLineEditor>("loginuri")->isDirty() ||
+                getChild<LLLineEditor>("loginpage")->isDirty() ||
+                getChild<LLLineEditor>("helperuri")->isDirty() ||
+                getChild<LLLineEditor>("website")->isDirty() ||
+                getChild<LLLineEditor>("support")->isDirty() ||
+                getChild<LLLineEditor>("register")->isDirty() ||
+                getChild<LLLineEditor>("password")->isDirty() ||
+                getChild<LLLineEditor>("first_name")->isDirty() ||
+                getChild<LLLineEditor>("last_name")->isDirty() ||
+                getChild<LLLineEditor>("username")->isDirty() ||
+                getChild<LLLineEditor>("avatar_password")->isDirty() ||
+                getChild<LLLineEditor>("search")->isDirty())
+        {
+                LLNotifications::instance().add("GridInfoDirty", LLSD(), LLSD(), newGridCreationCallback);
+        }
+        else
         {
-                grid = gHippoGridManager->getGrid(mCurGrid);
-        } 
-        else if ((mState == ADD_NEW) || (mState == ADD_COPY)) 
+                // This clears the form. Until an entry is entered, we keep the UI open and blank
+                // This is clearly undesirable if you want to cancel, but redoing this window is
+                // a WIP -- MC
+                setupNewGridEntry();
+        }
+}
+
+void FloaterGridManager::setupNewGridEntry()
+{
+                // disable scroll list until we can use it again
+                getChild<LLScrollListCtrl>("grid_selector")->setEnabled(false);
+
+                getChild<LLLineEditor>("gridnick")->setEnabled(true);
+                clearGridInfo(true);
+
+                setGridState(GRID_STATE_NEW);
+}
+
+bool FloaterGridManager::newGridCreationCallback(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if (option == 0)
         {
-                grid = new HippoGridInfo("");
-                cleanupGrid = true;
-        } 
-        else 
+                FloaterGridManager::getInstance()->setupNewGridEntry();
+        }
+        return false;
+}
+
+void FloaterGridManager::setupCopyGridEntry()
+{
+        // disable scroll list until we can use it again
+        getChild<LLScrollListCtrl>("grid_selector")->setEnabled(false);
+
+        getChild<LLLineEditor>("gridnick")->setEnabled(true);
+        getChild<LLLineEditor>("gridnick")->clear();
+        getChild<LLLineEditor>("gridname")->clear();
+        getChild<LLLineEditor>("loginuri")->clear();
+
+        setGridState(GRID_STATE_COPY);
+}
+
+void FloaterGridManager::retrieveGridInfo()
+{
+        std::string loginuri = childGetValue("loginuri");
+        if (loginuri.empty())
         {
-                llerrs << "Illegal state " << mState << '.' << llendl;
+                LLNotifications::instance().add("GridInfoNoLoginURI");
                 return;
         }
+
+        // this can be clicked even for grids we haven't saved yet
+        HippoGridInfo* grid = gHippoGridManager->getGrid(childGetValue("gridnick"));
+        bool del_temp_grid = false;
         if (!grid) 
         {
-                llerrs << "Internal error retrieving grid info." << llendl;
-                return;
+                // easier than fixing the hippo grid manager
+                HippoGridInfo* temp = new HippoGridInfo("");
+                if (temp)
+                {
+                        del_temp_grid = true;
+                        grid = temp;
+                }
         }
 
-        grid->setLoginUri(loginuri);
+        grid->setLoginURI(loginuri);
         if (grid->retrieveGridInfo()) 
         {
-                if (grid->getGridNick() != "") childSetText("gridnick", grid->getGridNick());
-                if (grid->getGridName() != "") childSetText("gridname", grid->getGridName());
-                if (grid->getLoginUri() != "") childSetText("loginuri", grid->getLoginUri());
-                if (grid->getLoginPage() != "") childSetText("loginpage", grid->getLoginPage());
-                if (grid->getHelperUri() != "") childSetText("helperuri", grid->getHelperUri());
-                if (grid->getWebSite() != "") childSetText("website", grid->getWebSite());
-                if (grid->getSupportUrl() != "") childSetText("support", grid->getSupportUrl());
-                if (grid->getRegisterUrl() != "") childSetText("register", grid->getRegisterUrl());
-                if (grid->getPasswordUrl() != "") childSetText("password", grid->getPasswordUrl());
-                if (grid->getSearchUrl() != "") childSetText("search", grid->getSearchUrl());
-        } 
-        else 
+                // just in case
+                if (!(grid->getGridNick().empty())) 
+                        getChild<LLLineEditor>("gridnick")->setText(grid->getGridNick());
+                if (!(grid->getLoginURI().empty()))
+                        getChild<LLLineEditor>("loginuri")->setText(grid->getLoginURI());
+                getChild<LLLineEditor>("gridname")->setText(grid->getGridName());
+                getChild<LLLineEditor>("loginpage")->setText(grid->getLoginPage());
+                getChild<LLLineEditor>("helperuri")->setText(grid->getHelperURI());
+                getChild<LLLineEditor>("website")->setText(grid->getWebSite());
+                getChild<LLLineEditor>("support")->setText(grid->getSupportURL());
+                getChild<LLLineEditor>("register")->setText(grid->getRegisterURL());
+                getChild<LLLineEditor>("password")->setText(grid->getPasswordURL());
+                getChild<LLLineEditor>("search")->setText(grid->getSearchURL());
+        }
+        else
         {
                 LLNotifications::instance().add("GridInfoError");
         }
-
-        if (cleanupGrid) delete grid;
+        
+        if (del_temp_grid)
+        {
+                delete grid;
+        }
 }
 
 void FloaterGridManager::apply()
 {
-        if (mState == NORMAL) 
-        {
-                applyChanges();
-        } 
-        else if ((mState == ADD_NEW) || (mState == ADD_COPY)) 
-        {
-                if (!createNewGrid()) return;
-        } 
-        else 
-        {
-                llwarns << "Illegal state " << mState << '.' << llendl;
-                return;
-        }
-        //gHippoGridManager->setCurrentGrid(mCurGrid);
-        //gHippoGridManager->setDefaultGrid(mCurGrid);
+        // where all the magic happens! 
+        applyChanges();
+
         gHippoGridManager->saveFile();
         LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel());
+        LLPanelLogin::loadLoginForm();
+        LLPanelLogin::loadLoginPage();
 }
 
-//void FloaterGridManager::setDefault()
-//{
-//      if (mState == NORMAL) 
-//      {
-//              applyChanges();
-//      } 
-//      else if ((mState == ADD_NEW) || (mState == ADD_COPY)) 
-//      {
-//              if (!createNewGrid()) return;
-//      } 
-//      else 
-//      {
-//              llwarns << "Illegal state " << mState << '.' << llendl;
-//              return;
-//      }
-//      gHippoGridManager->setCurrentGrid(mCurGrid);
-//      gHippoGridManager->setDefaultGrid(mCurGrid);
-//      gHippoGridManager->saveFile();
-//      LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel());
-//}
-
+// static
 void FloaterGridManager::onSelectGrid(LLUICtrl* ctrl, void* data)
 {
         FloaterGridManager* self = (FloaterGridManager*)data;
-        if (self->getState() == NORMAL) 
-        {
-                self->applyChanges();
-        } 
-        else if ((self->getState() == ADD_NEW) || (self->getState() == ADD_COPY)) 
+        if (self)
         {
-                if (self->createNewGrid()) 
-                {
-                        self->setState(NORMAL);
-                } 
-                else 
-                {
-                        //LLScrollListCtrl *grids = self->getChild<LLScrollListCtrl>("grid_selector");
-                        //grids->setCurrentByIndex(grids->getItemCount() - 1);
-                        return;
-                }
-        } 
-        else 
-        {
-                llwarns << "Illegal state " << self->getState() << llendl;
-                return;
+                self->setCurGrid(ctrl->getValue().asString());
+                self->refreshGrids();
         }
-        self->setCurGrid(ctrl->getValue().asString());
-        self->refreshGrids();
 }
 
 //static
@@ -541,7 +564,7 @@ void FloaterGridManager::onClickDelete(void* data)
 {
         //llinfos << "onClickDelete" << llendl;
         FloaterGridManager* self = (FloaterGridManager*)data;
-        if (self->getState() == NORMAL)
+        if (self)
         {
                 gHippoGridManager->deleteGrid(self->getCurGrid());
         }
@@ -553,71 +576,80 @@ void FloaterGridManager::onClickAdd(void* data)
 {
         //llinfos << "onClickAdd" << llendl;
         FloaterGridManager* self = (FloaterGridManager*)data;
-        self->setState(ADD_NEW);
-        self->refreshGrids();
+        if (self)
+        {
+                self->createNewGrid();
+        }
 }
 
 
 //static
 void FloaterGridManager::onClickCopy(void* data)
 {
-        //llinfos << "onClickCopy" << llendl;
         FloaterGridManager* self = (FloaterGridManager*)data;
-        self->setState(ADD_COPY);
-        self->refreshGrids();
+        if (self)
+        {
+                self->setupCopyGridEntry();
+        }
 }
 
 // static
 void FloaterGridManager::onClickOk(void* data)
 {
-        FloaterGridManager::getInstance()->apply();
-        FloaterGridManager::getInstance()->close();
+        FloaterGridManager* self = (FloaterGridManager*)data;
+        if (self)
+        {
+                self->apply();
+                self->close();
+        }
 }
 
 //static
 void FloaterGridManager::onClickApply(void* data)
 {
-        FloaterGridManager::getInstance()->apply();
+        FloaterGridManager* self = (FloaterGridManager*)data;
+        if (self)
+        {
+                self->apply();
+        }
         refreshGrids();
 }
 
 // static
 void FloaterGridManager::onClickClear(void* data)
 {
-        FloaterGridManager::getInstance()->clearInfo();
+        FloaterGridManager* self = (FloaterGridManager*)data;
+        if (self)
+        {
+                self->clearGridInfo(false);
+        }
 }
 
 //static
-//void FloaterGridManager::onClickDefault(void* data)
-//{
-//      FloaterGridManager::getInstance()->setDefault();
-//      FloaterGridManager::getInstance()->refreshGrids();
-//}
-
-//static
 void FloaterGridManager::onClickGridInfo(void* data)
 {
-        //HippoPanelGrids* self = (HippoPanelGrids*)data;
-        FloaterGridManager::getInstance()->retrieveGridInfo();
+        FloaterGridManager* self = (FloaterGridManager*)data;
+        if (self)
+        {
+                self->retrieveGridInfo();
+        }
 }
 
 //static
 void FloaterGridManager::onClickCancel(void* data)
 {
-        FloaterGridManager::getInstance()->close();
+        FloaterGridManager* self = (FloaterGridManager*)data;
+        if (self)
+        {
+                self->close();
+        }
 }
 
-//void FloaterGridManager::setAlwaysRefresh(bool refresh)
-//{
-//      // wargames 2: dead code, LLPanelLogin compatibility
-//      return;
-//}
-
-//void FloaterGridManager::refreshLocation( bool force_visible )
+//void FloaterGridManager::refreshLocation(bool force_visible)
 //{
 //      llinfos << "refreshLocation called" << llendl;
 //      
-//      if (!FloaterGridManager::getInstance()) 
+//      if (!FloaterGridManager::instanceVisible()) 
 //      {
 //              return;
 //      }
@@ -645,41 +677,10 @@ void FloaterGridManager::onClickCancel(void* data)
         //FloaterGridManager::getInstance()->childSetVisible("server_combo", TRUE);
 //}
 
-//void FloaterGridManager::setFocus(BOOL b)
-//{
-//      if(b != hasFocus())
-//      {
-//              if(b)
-//              {
-//                      FloaterGridManager::giveFocus();
-//              }
-//              else
-//              {
-//                      LLPanel::setFocus(b);
-//              }
-//      }
-//}
-//
-//void FloaterGridManager::giveFocus()
-//{
-//      LLScrollListCtrl *combo = NULL;
-//      
-//      if (!FloaterGridManager::getInstance())
-//      {
-//              llinfos << "giveFocus has no FloaterGridManager instance. FloaterGridManager::getInstance()=" << FloaterGridManager::getInstance() << llendl;
-//              return;
-//      }
-//      
-//      // for our combo box approach, selecting the combo box is almost always
-//      // the right thing to do on the floater receiving focus
-//      combo = FloaterGridManager::getInstance()->getChild<LLScrollListCtrl>("grid_selector");
-//      combo->setFocus(TRUE);
-//}
-
 BOOL FloaterGridManager::isGridComboDirty()
 {
         BOOL user_picked = FALSE;
-        if (!FloaterGridManager::getInstance())
+        if (!FloaterGridManager::instanceVisible())
         {
                 llwarns << "Attempted getServer with no login view shown" << llendl;
         }
@@ -691,78 +692,14 @@ BOOL FloaterGridManager::isGridComboDirty()
         return user_picked;
 }
 
-void FloaterGridManager::getLocation(std::string &location)
-{
-        if (!FloaterGridManager::getInstance())
-        {
-                llwarns << "Attempted getLocation with no login view shown" << llendl;
-                return;
-        }
-        
-        LLComboBox* combo = FloaterGridManager::getInstance()->getChild<LLComboBox>("start_location_combo");
-        location = combo->getValue().asString();
-}
-
-std::string& FloaterGridManager::getPassword()
-{
-        return mMungedPassword;
-}
-
-void FloaterGridManager::setPassword(std::string &password)
-{
-        mMungedPassword = password;
-}
-
-bool FloaterGridManager::isSamePassword(std::string &password)
-{
-        return mMungedPassword == password;
-}
-
-//void FloaterGridManager::addServer(const std::string& server, S32 domain_name)
+//void FloaterGridManager::getLocation(std::string& location)
 //{
-//      if (!FloaterGridManager::getInstance())
+//      if (!FloaterGridManager::instanceVisible())
 //      {
-//              llwarns << "Attempted addServer with no login view shown" << llendl;
+//              llwarns << "Attempted getLocation with no login view shown" << llendl;
 //              return;
 //      }
 //      
-//      /*LLComboBox* combo = FloaterGridManager::getInstance()->getChild<LLComboBox>("server_combo");
-//      combo->add(server, LLSD(domain_name) );
-//      combo->setCurrentByIndex(0);*/
+//      LLComboBox* combo = FloaterGridManager::getInstance()->getChild<LLComboBox>("start_location_combo");
+//      location = combo->getValue().asString();
 //}
-
-//void FloaterGridManager::cancel_old()
-//{
-//      if (!FloaterGridManager::getInstance())
-//      {
-//              return;
-//      }
-//
-//      if (FloaterGridManager::getInstance()->sIsInitialLogin)
-//      {
-//              // send a callback that indicates we're quitting or closing
-//              if (FloaterGridManager::getInstance()->mCallback)
-//                      FloaterGridManager::getInstance()->mCallback(LOGIN_OPTION_QUIT, FloaterGridManager::getInstance()->mCallbackData);
-//              return;
-//      }
-//      
-//      FloaterGridManager::getInstance()->close();
-//}
-
-void FloaterGridManager::hashPassword(const std::string& password, std::string& hashedPassword)
-{
-        // Max "actual" password length is 16 characters.
-        // Hex digests are always 32 characters.
-        if (password.length() == 32)
-        {
-                hashedPassword = password;
-        }
-        else
-        {
-                // this is a normal text password
-                LLMD5 pass((unsigned char *)password.c_str());
-                char munged_password[MD5HEX_STR_SIZE];
-                pass.hex_digest(munged_password);
-                hashedPassword = munged_password;
-        }
-}
diff --git a/linden/indra/newview/floatergridmanager.h b/linden/indra/newview/floatergridmanager.h
index 55517f5..985a905 100644
--- a/linden/indra/newview/floatergridmanager.h
+++ b/linden/indra/newview/floatergridmanager.h
@@ -1,22 +1,39 @@
-/*
- *  floatergridmanager.h
- *  This is Meerkats grid manager.
- *  -Patrick Sapinski (Monday, August 17, 2009)
- *
- *  Modified by McCabe Maxsted for Imprudence
- */
+/**
+* @file floatergridmanager.h
+* @brief UI for managing grid information
+*
+* $LicenseInfo:firstyear=2011&license=viewergpl$
+*
+* Copyright (c) 2011, McCabe Maxsted
+* based on Meerkat's grid manager by Patrick Sapinski
+*
+* Imprudence Viewer Source Code
+* 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.
+* $/LicenseInfo$
+*/
 
 #ifndef PL_floaterlogin_H
 #define PL_floaterlogin_H
 
-#define LOGIN_OPTION_CONNECT 0
-#define LOGIN_OPTION_QUIT 1
-
 #include "llfloater.h"
 
-class LoginController;
-class AuthenticationModel;
-
 class FloaterGridManager : public LLFloater, public LLFloaterSingleton<FloaterGridManager>
 {
 public:
@@ -27,57 +44,40 @@ public:
 
         static void refreshGrids();
         void apply();
-        //void setDefault();
         void cancel();
 
-        void clearInfo();
-
         virtual void draw();
 
         void refresh();
 
-        // new-style login methods
-        virtual std::string& getPassword();
-        virtual void setPassword(std::string &password);
-        virtual bool isSamePassword(std::string &password);
-        static void getFields(std::string &loginname, std::string &password,
-                                                  BOOL &remember);
-        static void setFields(const std::string &loginname, const std::string &password,
-                                                  BOOL remember);
+        // clears either the loginuri fetched info or all the info in the grid manager
+        void clearGridInfo(bool clear_all);
         
-        // LLLoginPanel compatibility
-        /*static void setAlwaysRefresh(bool refresh);
-        static void refreshLocation(bool force_visible);
-        virtual void setFocus(BOOL b);
-        static void giveFocus();*/
-        static void getLocation(std::string &location);
+        //static void getLocation(std::string &location);
+        //void refreshLocation(bool force_visible)
         static BOOL isGridComboDirty();
-        //static void addServer(const std::string& server, S32 domain_name);
-        static void hashPassword(const std::string& password, std::string& hashedPassword);
-protected:
-        static bool sIsInitialLogin;
-        static std::string sGrid;
+
 private:
-        enum State 
+
+        enum EGridState 
         { 
-                NORMAL, 
-                ADD_NEW, 
-                ADD_COPY 
+                GRID_STATE_NORMAL, 
+                GRID_STATE_NEW, 
+                GRID_STATE_COPY 
         };
 
-        State mState;
-        void setState(const State& state) { mState = state; }
-        State getState() { return mState; }
-
+        void setGridState(EGridState state) { mState = state; }
+        EGridState getGridState() { return mState; }
+        EGridState mState;
         std::string mCurGrid;
-        void setCurGrid(const std::string& grid) { mCurGrid = grid; }
-        std::string getCurGrid() { return mCurGrid; }
 
-        std::string mIncomingPassword;
-        std::string mMungedPassword;
+        void setCurGrid(std::string grid) { mCurGrid = grid; }
+        std::string getCurGrid() { return mCurGrid; }
         
         void applyChanges();
-        bool createNewGrid();
+        void createNewGrid();
+        void setupNewGridEntry();
+        void setupCopyGridEntry();
         void update();
         void retrieveGridInfo();
 
@@ -87,13 +87,11 @@ private:
         static void onClickCopy(void* data);
         static void onClickOk(void* data);
         static void onClickApply(void* data);
-        static void onClickDefault(void* data);
         static void onClickGridInfo(void* data);
         static void onClickCancel(void* data);
         static void onClickClear(void* data);
 
-        static LoginController* sController;
-        static AuthenticationModel* sModel;
+        static bool newGridCreationCallback(const LLSD& notification, const LLSD& response);
 };
 
 #endif // PL_floaterlogin_H
diff --git a/linden/indra/newview/floatervoicelicense.cpp b/linden/indra/newview/floatervoicelicense.cpp
index 5397590..d422f7a 100644
--- a/linden/indra/newview/floatervoicelicense.cpp
+++ b/linden/indra/newview/floatervoicelicense.cpp
@@ -128,8 +128,16 @@ BOOL FloaterVoiceLicense::postBuild()
                 // start to observe it so we see navigate complete events
                 web_browser->addObserver( this );
 
-                gResponsePtr = LLIamHereVoice::build( this );
-                LLHTTPClient::get( getString( "real_url" ), gResponsePtr );
+                std::string url = getString( "real_url" );
+                if (url.substr(0,4) == "http") 
+                {
+                        gResponsePtr = LLIamHereVoice::build( this );
+                        LLHTTPClient::get( url, gResponsePtr );
+                }
+                else 
+                {
+                        setSiteIsAlive(false);
+                }
         }
 
         return TRUE;
diff --git a/linden/indra/newview/hippogridmanager.cpp b/linden/indra/newview/hippogridmanager.cpp
index c08709d..6f28d87 100644
--- a/linden/indra/newview/hippogridmanager.cpp
+++ b/linden/indra/newview/hippogridmanager.cpp
@@ -1,4 +1,33 @@
-// Ported to Imprudence from the Hippo OpenSim Viewer by Jacek Antonelli
+/**
+* @file hippogridmanager.cpp
+* @brief stores grid information
+*
+* $LicenseInfo:firstyear=2011&license=viewergpl$
+*
+* Copyright (c) 2011
+* Ported to Imprudence from the Hippo OpenSim Viewer by Jacek Antonelli
+*
+* Imprudence Viewer Source Code
+* 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.
+* $/LicenseInfo$
+*/
 
 #include "llviewerprecompiledheaders.h"
 
@@ -12,10 +41,14 @@
 #include <llerror.h>
 #include <llfile.h>
 #include <llhttpclient.h>
+#include "llmd5.h"
 #include <llsdserialize.h>
+
 #include "lltrans.h"
 #include "llviewercontrol.h"
+#include "llviewernetwork.h" // gMacAddress
 #include "llweb.h"
+#include "llxorcipher.h"        // saved password, MAC address
 
 #include "hipporestrequest.h"
 
@@ -43,150 +76,41 @@ HippoGridInfo::HippoGridInfo(const std::string& gridNick) :
         mPlatform(PLATFORM_OPENSIM),
         mGridNick(gridNick),
         mGridName(LLStringUtil::null),
-        mLoginUri(LLStringUtil::null),
+        mLoginURI(LLStringUtil::null),
         mLoginPage(LLStringUtil::null),
-        mHelperUri(LLStringUtil::null),
+        mHelperURI(LLStringUtil::null),
         mWebSite(LLStringUtil::null),
-        mSupportUrl(LLStringUtil::null),
-        mRegisterUrl(LLStringUtil::null),
-        mPasswordUrl(LLStringUtil::null),
-        mSearchUrl(LLStringUtil::null),
+        mSupportURL(LLStringUtil::null),
+        mRegisterURL(LLStringUtil::null),
+        mPasswordURL(LLStringUtil::null),
+        mSearchURL(LLStringUtil::null),
         mFirstName(LLStringUtil::null),
         mLastName(LLStringUtil::null),
-        mAvatarPassword(LLStringUtil::null),
+        mPasswordAvatar(LLStringUtil::null),
         mXmlState(XML_VOID),
         mVoiceConnector("SLVoice"),
         mRenderCompat(true),
         mMaxAgentGroups(-1),
         mCurrencySymbol("OS$"),
         mRealCurrencySymbol("US$"),
-        mDirectoryFee(30)
+        mDirectoryFee(30),
+        mUsername(LLStringUtil::null),
+        mUsernameCompat(false)
 {
         std::string nick = gridNick;
-        mGridNick = sanitizeGridNick( nick );
-}
-
-
-// ********************************************************************
-// Getters
-
-HippoGridInfo::Platform HippoGridInfo::getPlatform()
-{
-        return mPlatform;
-}
-
-bool HippoGridInfo::isOpenSimulator() const
-{
-        return (mPlatform == HippoGridInfo::PLATFORM_OPENSIM);
-}
-
-bool HippoGridInfo::isSecondLife() const
-{
-        return (mPlatform == HippoGridInfo::PLATFORM_SECONDLIFE);
-}
-
-const std::string& HippoGridInfo::getGridNick() const
-{
-        return mGridNick;
-}
-
-const std::string& HippoGridInfo::getGridName() const
-{
-        return mGridName;
-}
-
-const std::string& HippoGridInfo::getLoginUri() const
-{
-        return mLoginUri;
-}
-
-const std::string& HippoGridInfo::getLoginPage() const
-{
-        return mLoginPage;
-}
-
-const std::string& HippoGridInfo::getHelperUri() const
-{
-        return mHelperUri;
-}
-
-const std::string& HippoGridInfo::getWebSite() const
-{
-        return mWebSite;
-}
-
-const std::string& HippoGridInfo::getSupportUrl() const
-{
-        return mSupportUrl;
-}
-
-const std::string& HippoGridInfo::getRegisterUrl() const
-{
-        return mRegisterUrl;
-}
-
-const std::string& HippoGridInfo::getPasswordUrl() const
-{
-        return mPasswordUrl;
-}
-
-const std::string& HippoGridInfo::getSearchUrl() const
-{
-        return mSearchUrl;
-}
-
-const std::string& HippoGridInfo::getFirstName() const
-{
-        return mFirstName;
-}
-
-const std::string& HippoGridInfo::getLastName() const
-{
-        return mLastName;
-}
-
-const std::string& HippoGridInfo::getAvatarPassword() const
-{
-        return mAvatarPassword;
-}
-
-bool HippoGridInfo::isRenderCompat() const
-{
-        return mRenderCompat;
+        mGridNick = sanitizeGridNick(nick);
 }
 
-const std::string& HippoGridInfo::getCurrencySymbol() const
-{
-        return mCurrencySymbol;
-}
-
-const std::string& HippoGridInfo::getRealCurrencySymbol() const
-{
-        return mRealCurrencySymbol;
-}
-
-bool HippoGridInfo::isUsernameCompat() const
-{
-        // currently only SecondLife grids support username-style logins
-        // but Aurora is working on implementing it -- MC
-        return (mPlatform == HippoGridInfo::PLATFORM_SECONDLIFE);
-}
-
-
-
-// ********************************************************************
-// Setters
-
 void HippoGridInfo::setPlatform(Platform platform)
 {
         mPlatform = platform;
         if (mPlatform == PLATFORM_SECONDLIFE)
         {
                 mCurrencySymbol = "L$";
+                mUsernameCompat = true;
         }
 }
 
-
 void HippoGridInfo::setPlatform(const std::string& platform)
 {
         std::string tmp = platform;
@@ -208,96 +132,25 @@ void HippoGridInfo::setPlatform(const std::string& platform)
         }
 }
 
-void HippoGridInfo::setGridName(const std::string& gridName)
-{
-        mGridName = gridName;
-}
-
-void HippoGridInfo::setLoginUri(const std::string& loginUri)
-{
-        std::string uri = loginUri;
-        mLoginUri = sanitizeUri(uri);
-}
-
-void HippoGridInfo::setLoginPage(const std::string& loginPage)
+void HippoGridInfo::setLoginURI(const std::string& loginURI)
 {
-        mLoginPage = loginPage;
+        std::string uri = loginURI;
+        mLoginURI = sanitizeURI(uri);
 }
 
-void HippoGridInfo::setHelperUri(const std::string& helperUri)
+void HippoGridInfo::setHelperURI(const std::string& helperURI)
 {
-        std::string uri = helperUri;
-        mHelperUri = sanitizeUri(uri);
+        std::string uri = helperURI;
+        mHelperURI = sanitizeURI(uri);
 }
 
-void HippoGridInfo::setWebSite(const std::string& website)
-{
-        mWebSite = website;
-}
-
-void HippoGridInfo::setSupportUrl(const std::string& url)
-{
-        mSupportUrl = url;
-}
-
-void HippoGridInfo::setRegisterUrl(const std::string& url)
-{
-        mRegisterUrl = url;
-}
-
-void HippoGridInfo::setPasswordUrl(const std::string& url)
-{
-        mPasswordUrl = url;
-}
-
-void HippoGridInfo::setSearchUrl(const std::string& url)
-{
-        mSearchUrl = url;
-}
-
-void HippoGridInfo::setFirstName(const std::string& firstName)
-{
-        mFirstName = firstName;
-}
-
-void HippoGridInfo::setLastName(const std::string& lastName)
-{
-        mLastName = lastName;
-}
-
-void HippoGridInfo::setAvatarPassword(const std::string& avatarPassword)
-{
-        mAvatarPassword = avatarPassword;
-}
-
-void HippoGridInfo::setRenderCompat(bool compat)
-{
-        mRenderCompat = compat;
-}
-
-void HippoGridInfo::setCurrencySymbol(const std::string& sym)
-{
-        mCurrencySymbol = sym.substr(0, 3);
-}
-
-void HippoGridInfo::setRealCurrencySymbol(const std::string& sym)
-{
-        mRealCurrencySymbol = sym.substr(0, 3);
-}
-
-void HippoGridInfo::setDirectoryFee(int fee)
-{
-        mDirectoryFee = fee;
-}
-
-
 
 // ********************************************************************
 // Grid Info
 
-std::string HippoGridInfo::getSearchUrl(SearchType ty, bool is_web) const
+std::string HippoGridInfo::getSearchURL(SearchType ty, bool is_web) const
 {
-        // Don't worry about whether or not mSearchUrl is empty here anymore -- MC
+        // Don't worry about whether or not mSearchURL is empty here anymore -- MC
         if (is_web)
         {
                 if (mPlatform == PLATFORM_SECONDLIFE) 
@@ -321,16 +174,16 @@ std::string HippoGridInfo::getSearchUrl(SearchType ty, bool is_web) const
                                 return "";
                         }
                 }
-                else if (!mSearchUrl.empty())
+                else if (!mSearchURL.empty())
                 {
                         // Search url sent to us in the login response
                         if (ty == SEARCH_ALL_EMPTY) 
                         {
-                                return (mSearchUrl);
+                                return (mSearchURL);
                         } 
                         else if (ty == SEARCH_ALL_QUERY) 
                         {
-                                return (mSearchUrl + "q=[QUERY]&s=[COLLECTION]&");
+                                return (mSearchURL + "q=[QUERY]&s=[COLLECTION]&");
                         } 
                         else if (ty == SEARCH_ALL_TEMPLATE) 
                         {
@@ -369,11 +222,11 @@ std::string HippoGridInfo::getSearchUrl(SearchType ty, bool is_web) const
         // Use the old search all
         if (ty == SEARCH_ALL_EMPTY) 
                 {
-            return (mSearchUrl + "panel=All&");
+            return (mSearchURL + "panel=All&");
         } 
                 else if (ty == SEARCH_ALL_QUERY) 
                 {
-            return (mSearchUrl + "q=[QUERY]&s=[COLLECTION]&");
+            return (mSearchURL + "q=[QUERY]&s=[COLLECTION]&");
         } 
                 else if (ty == SEARCH_ALL_TEMPLATE) 
                 {
@@ -424,7 +277,7 @@ void HippoGridInfo::onXmlElementEnd(void* userData, const XML_Char* name)
 }
 
 //static
-void HippoGridInfo::onXmlCharacterData(void* userData, const XML_Char* s, int len)
+void HippoGridInfo::onXmlCharacterData(void* userData, const XML_Char* s, S32 len)
 {
         HippoGridInfo* self = (HippoGridInfo*)userData;
         switch (self->mXmlState) 
@@ -446,30 +299,30 @@ void HippoGridInfo::onXmlCharacterData(void* userData, const XML_Char* s, int le
                 case XML_LOGINURI: 
                 {
                         std::string loginuri(s, len);
-                        self->mLoginUri = sanitizeUri( loginuri );
+                        self->mLoginURI = sanitizeURI( loginuri );
                         break;
                 }
 
                 case XML_HELPERURI: 
                 {
                         std::string helperuri(s, len);
-                        self->mHelperUri = sanitizeUri( helperuri );
+                        self->mHelperURI = sanitizeURI( helperuri );
                         break;
                 }
 
                 case XML_SEARCH: 
                 {
-                        self->mSearchUrl.assign(s, len);
-                        //sanitizeQueryUrl(mSearchUrl);
+                        self->mSearchURL.assign(s, len);
+                        //sanitizeQueryURL(mSearchURL);
                         break;
                 }
 
                 case XML_GRIDNAME: self->mGridName.assign(s, len); break;
                 case XML_LOGINPAGE: self->mLoginPage.assign(s, len); break;
                 case XML_WEBSITE: self->mWebSite.assign(s, len); break;
-                case XML_SUPPORT: self->mSupportUrl.assign(s, len); break;
-                case XML_REGISTER: self->mRegisterUrl.assign(s, len); break;
-                case XML_PASSWORD: self->mPasswordUrl.assign(s, len); break;
+                case XML_SUPPORT: self->mSupportURL.assign(s, len); break;
+                case XML_REGISTER: self->mRegisterURL.assign(s, len); break;
+                case XML_PASSWORD: self->mPasswordURL.assign(s, len); break;
 
                 case XML_VOID: break;
         }
@@ -478,16 +331,16 @@ void HippoGridInfo::onXmlCharacterData(void* userData, const XML_Char* s, int le
 
 bool HippoGridInfo::retrieveGridInfo()
 {
-        if (mLoginUri == "") return false;
+        if (mLoginURI == "") return false;
 
         // If last character in uri is not "/"
-        std::string uri = mLoginUri;
+        std::string uri = mLoginURI;
         if (uri.compare(uri.length()-1, 1, "/") != 0) 
         {
                 uri += '/';
         }
         std::string reply;
-        int result = HippoRestRequest::getBlocking(uri + "get_grid_info", &reply);
+        S32 result = HippoRestRequest::getBlocking(uri + "get_grid_info", &reply);
         if (result != 200) return false;
 
         llinfos << "Received: " << reply << llendl;
@@ -508,6 +361,14 @@ bool HippoGridInfo::retrieveGridInfo()
         return success;
 }
 
+const std::string& HippoGridInfo::getGridName() const
+{
+        if (mGridName.empty())
+        {
+                return mGridNick;
+        }
+        return mGridName;
+}
 
 std::string HippoGridInfo::getUploadFee() const
 {
@@ -531,7 +392,7 @@ std::string HippoGridInfo::getDirectoryFee() const
         return fee;
 }
 
-void HippoGridInfo::formatFee(std::string &fee, int cost, bool showFree) const
+void HippoGridInfo::formatFee(std::string &fee, S32 cost, bool showFree) const
 {
         if (showFree && (cost == 0)) 
         {
@@ -544,6 +405,92 @@ void HippoGridInfo::formatFee(std::string &fee, int cost, bool showFree) const
 }
 
 
+void HippoGridInfo::setPassword(const std::string& unhashed_password)
+{
+        if (unhashed_password.empty())
+        {
+                mPasswordAvatar = "";
+                return;
+        }
+
+        if (unhashed_password == mPasswordAvatar)
+        {
+                return;
+        }
+
+        std::string hashed_password("");
+
+        // Max "actual" password length is 16 characters.
+        // Hex digests are always 32 characters.
+        if (unhashed_password.length() == 32)
+        {
+                hashed_password = unhashed_password;
+        }
+        else
+        {
+                // this is a user-entered plaintext password
+                LLMD5 pass((unsigned char *)unhashed_password.c_str());
+                char munged_password[MD5HEX_STR_SIZE];
+                pass.hex_digest(munged_password);
+                hashed_password = munged_password;
+        }
+
+        // need to fix the bug in this
+        /*
+
+        // Encipher with MAC address
+        const S32 HASHED_LENGTH = 32;
+        U8 buffer[HASHED_LENGTH+1];
+
+        LLStringUtil::copy((char*)buffer, hashed_password.c_str(), HASHED_LENGTH+1);
+
+        LLXORCipher cipher(gMACAddress, 6);
+        cipher.encrypt(buffer, HASHED_LENGTH);
+
+        mPasswordAvatar.assign((char*)buffer);
+        */
+        mPasswordAvatar.assign(hashed_password);
+}
+
+
+std::string HippoGridInfo::getPassword() const
+{
+        // need to fix the bug in this
+        /*
+        if (mPasswordAvatar.empty() || mPasswordAvatar.length() == 32)
+        {
+                return mPasswordAvatar;
+        }
+
+        std::string hashed_password("");
+
+        // UUID is 16 bytes, written into ASCII is 32 characters
+        // without trailing \0
+        const S32 HASHED_LENGTH = 32;
+        U8 buffer[HASHED_LENGTH+1];
+
+        LLStringUtil::copy((char*)buffer, mPasswordAvatar.c_str(), HASHED_LENGTH+1);
+        
+        // Decipher with MAC address
+        LLXORCipher cipher(gMACAddress, 6);
+        cipher.decrypt(buffer, HASHED_LENGTH);
+
+        buffer[HASHED_LENGTH] = '\0';
+
+        // Check to see if the mac address generated a bad hashed
+        // password. It should be a hex-string or else the mac adress has
+        // changed. This is a security feature to make sure that if you
+        // get someone's grid_info.xml file, you cannot hack their account.
+        if (is_hex_string(buffer, HASHED_LENGTH))
+        {
+                hashed_password.assign((char*)buffer);
+        }
+
+        return hashed_password;
+        */
+        return mPasswordAvatar;
+}
+
 // ********************************************************************
 // Static Helpers
 
@@ -556,7 +503,9 @@ const char* HippoGridInfo::getPlatformString(Platform platform)
         };
 
         if ((platform < PLATFORM_OTHER) || (platform >= PLATFORM_LAST))
+        {
                 platform = PLATFORM_OTHER;
+        }
         return platformStrings[platform];
 }
 
@@ -565,8 +514,8 @@ const char* HippoGridInfo::getPlatformString(Platform platform)
 std::string HippoGridInfo::sanitizeGridNick(std::string &gridnick)
 {
         std::string tmp;
-        int size = gridnick.size();
-        for (int i=0; i<size; i++) 
+        S32 size = gridnick.size();
+        for (S32 i=0; i<size; i++) 
         {
                 char c = gridnick[i];
                 if ((c == '_') || isalnum(c)) 
@@ -582,8 +531,10 @@ std::string HippoGridInfo::sanitizeGridNick(std::string &gridnick)
 }
 
 // static
-std::string HippoGridInfo::sanitizeUri(std::string &uri)
+std::string HippoGridInfo::sanitizeURI(std::string &uri)
 {
+        // Why don't we do this anymore? -- MC
+
         // if (uri.empty()) {
         //      return "";
         // }
@@ -603,8 +554,8 @@ void HippoGridInfo::initFallback()
         FALLBACK_GRIDINFO.mGridNick = "localhost";
         FALLBACK_GRIDINFO.setPlatform(PLATFORM_OPENSIM);
         FALLBACK_GRIDINFO.setGridName("Local Host");
-        FALLBACK_GRIDINFO.setLoginUri("http://127.0.0.1:9000/");
-        FALLBACK_GRIDINFO.setHelperUri("http://127.0.0.1:9000/");
+        FALLBACK_GRIDINFO.setLoginURI("http://127.0.0.1:9000/");
+        FALLBACK_GRIDINFO.setHelperURI("http://127.0.0.1:9000/");
 }
 
 
@@ -683,7 +634,7 @@ HippoGridInfo* HippoGridManager::getGrid(const std::string& grid) const
 
 HippoGridInfo* HippoGridManager::getConnectedGrid() const
 {
-        return (mConnectedGrid)? mConnectedGrid: getCurrentGrid();
+        return (mConnectedGrid) ? mConnectedGrid : getCurrentGrid();
 }
 
 
@@ -700,11 +651,6 @@ HippoGridInfo* HippoGridManager::getCurrentGrid() const
         }
 }
 
-const std::string& HippoGridManager::getDefaultGridNick() const
-{
-        return mDefaultGrid;
-}
-
 const std::string& HippoGridManager::getCurrentGridNick() const
 {
         if (mCurrentGrid.empty())
@@ -714,12 +660,6 @@ const std::string& HippoGridManager::getCurrentGridNick() const
         return mCurrentGrid;
 }
 
-void HippoGridManager::setCurrentGridAsConnected()
-{
-        mConnectedGrid = getCurrentGrid();
-}
-
-
 void HippoGridManager::addGrid(HippoGridInfo* grid)
 {
         if (!grid) return;
@@ -743,17 +683,25 @@ void HippoGridManager::addGrid(HippoGridInfo* grid)
 void HippoGridManager::deleteGrid(const std::string& grid)
 {
         GridIterator it = mGridInfo.find(grid);
-        if (it == mGridInfo.end()) {
+        if (it == mGridInfo.end()) 
+        {
                 llwarns << "Trying to delete non-existing grid " << grid << '.' << llendl;
                 return;
         }
+
         mGridInfo.erase(it);
+
         llinfos << "Number of grids now: " << mGridInfo.size() << llendl;
+
         if (mGridInfo.empty()) llinfos << "Grid info map is empty." << llendl;
         if (grid == mDefaultGrid)
+        {
                 setDefaultGrid(LLStringUtil::null);  // sets first grid, if map not empty
+        }
         if (grid == mCurrentGrid)
+        {
                 mCurrentGrid = mDefaultGrid;
+        }
 }
 
 
@@ -796,6 +744,18 @@ void HippoGridManager::setCurrentGrid(const std::string& grid)
         }
 }
 
+bool HippoGridManager::hasGridNick(const std::string& grid_nick)
+{
+        for (GridIterator it = beginGrid(); it != endGrid(); ++it) 
+        {
+                if (grid_nick == it->second->getGridNick())
+                {
+                        return true;
+                }
+        }
+        return false;
+}
+
 
 // ********************************************************************
 // Persistent Store
@@ -813,7 +773,7 @@ void HippoGridManager::loadFromFile()
                 std::string update_list = gSavedSettings.getString("GridUpdateList");
                 if (!update_list.empty())
                 {
-                        parseUrl(update_list, !mGridInfo.empty());
+                        parseURL(update_list, !mGridInfo.empty());
                 }
                 else
                 {
@@ -828,7 +788,7 @@ void HippoGridManager::loadFromFile()
 }
 
 
-void HippoGridManager::parseUrl(const std::string url, bool mergeIfNewer)
+void HippoGridManager::parseURL(const std::string url, bool mergeIfNewer)
 {
         llinfos << "Loading grid info from '" << url << "'." << llendl;
 
@@ -882,7 +842,7 @@ void HippoGridManager::parseData(LLSD &gridInfo, bool mergeIfNewer)
                         LLSD gridMap = *it;
                         if (gridMap.has("default_grids_version")) 
                         {
-                                int version = gridMap["default_grids_version"];
+                                S32 version = gridMap["default_grids_version"];
                                 if (version <= mDefaultGridsVersion) return;
                                 else break;
                         }
@@ -920,20 +880,22 @@ void HippoGridManager::parseData(LLSD &gridInfo, bool mergeIfNewer)
                                 // update existing grid info
                                 grid = it->second;
                         }
-                        grid->setLoginUri(gridMap["loginuri"]);
+                        grid->setLoginURI(gridMap["loginuri"]);
                         if (gridMap.has("platform")) grid->setPlatform(gridMap["platform"]);
                         if (gridMap.has("gridname")) grid->setGridName(gridMap["gridname"]);
                         if (gridMap.has("loginpage")) grid->setLoginPage(gridMap["loginpage"]);
-                        if (gridMap.has("helperuri")) grid->setHelperUri(gridMap["helperuri"]);
+                        if (gridMap.has("helperuri")) grid->setHelperURI(gridMap["helperuri"]);
                         if (gridMap.has("website")) grid->setWebSite(gridMap["website"]);
-                        if (gridMap.has("support")) grid->setSupportUrl(gridMap["support"]);
-                        if (gridMap.has("register")) grid->setRegisterUrl(gridMap["register"]);
-                        if (gridMap.has("password")) grid->setPasswordUrl(gridMap["password"]);
-                        if (gridMap.has("search")) grid->setSearchUrl(gridMap["search"]);
+                        if (gridMap.has("support")) grid->setSupportURL(gridMap["support"]);
+                        if (gridMap.has("register")) grid->setRegisterURL(gridMap["register"]);
+                        if (gridMap.has("password")) grid->setPasswordURL(gridMap["password"]);
+                        if (gridMap.has("search")) grid->setSearchURL(gridMap["search"]);
                         if (gridMap.has("render_compat")) grid->setRenderCompat(gridMap["render_compat"]);
-                        // if (gridMap.has("firstname")) grid->setFirstName(gridMap["firstname"]);
-                        // if (gridMap.has("lastname")) grid->setLastName(gridMap["lastname"]);
-                        // if (gridMap.has("avatarpassword")) grid->setAvatarPassword(gridMap["avatarpassword"]);
+                        if (gridMap.has("firstname")) grid->setFirstName(gridMap["firstname"]);
+                        if (gridMap.has("lastname")) grid->setLastName(gridMap["lastname"]);
+                        if (gridMap.has("avatarpassword")) grid->setPassword(gridMap["avatarpassword"]);
+                        if (gridMap.has("username")) grid->setUsername(gridMap["username"]);
+                        if (gridMap.has("username_compat")) grid->setUsernameCompat(gridMap["username_compat"]);
                         if (newGrid) addGrid(grid);
                 }
         }
@@ -958,19 +920,22 @@ void HippoGridManager::saveFile()
                 gridInfo[i]["gridnick"] = grid->getGridNick();
                 gridInfo[i]["platform"] = HippoGridInfo::getPlatformString(grid->getPlatform());
                 gridInfo[i]["gridname"] = grid->getGridName();
-                gridInfo[i]["loginuri"] = grid->getLoginUri();
+                gridInfo[i]["loginuri"] = grid->getLoginURI();
                 gridInfo[i]["loginpage"] = grid->getLoginPage();
-                gridInfo[i]["helperuri"] = grid->getHelperUri();
+                gridInfo[i]["helperuri"] = grid->getHelperURI();
                 gridInfo[i]["website"] = grid->getWebSite();
-                gridInfo[i]["support"] = grid->getSupportUrl();
-                gridInfo[i]["register"] = grid->getRegisterUrl();
-                gridInfo[i]["password"] = grid->getPasswordUrl();
-                // gridInfo[i]["firstname"] = grid->getFirstName();
-                // gridInfo[i]["lastname"] = grid->getLastName();
-                // gridInfo[i]["avatarpassword"] = grid->getAvatarPassword();
+                gridInfo[i]["support"] = grid->getSupportURL();
+                gridInfo[i]["register"] = grid->getRegisterURL();
+                gridInfo[i]["password"] = grid->getPasswordURL();
+                gridInfo[i]["firstname"] = grid->getFirstName();
+                gridInfo[i]["lastname"] = grid->getLastName();
+                gridInfo[i]["avatarpassword"] = grid->getPassword();
                 
-                gridInfo[i]["search"] = grid->getSearchUrl();
+                gridInfo[i]["search"] = grid->getSearchURL();
                 gridInfo[i]["render_compat"] = grid->isRenderCompat();
+
+                gridInfo[i]["username"] = grid->getUsername();
+                gridInfo[i]["username_compat"] = grid->isUsernameCompat();
         }
 
         // write client grid info file
diff --git a/linden/indra/newview/hippogridmanager.h b/linden/indra/newview/hippogridmanager.h
index 1b6fbc5..c983c9d 100644
--- a/linden/indra/newview/hippogridmanager.h
+++ b/linden/indra/newview/hippogridmanager.h
@@ -1,3 +1,34 @@
+/**
+* @file hippogridmanager.h
+* @brief stores grid information
+*
+* $LicenseInfo:firstyear=2011&license=viewergpl$
+*
+* Copyright (c) 2011
+* Ported to Imprudence from the Hippo OpenSim Viewer by Jacek Antonelli
+*
+* Imprudence Viewer Source Code
+* 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.
+* $/LicenseInfo$
+*/
+
 #ifndef __HIPPO_GRID_MANAGER_H__
 #define __HIPPO_GRID_MANAGER_H__
 
@@ -35,57 +66,61 @@ public:
 
         explicit HippoGridInfo(const std::string& gridNick);
 
-        Platform           getPlatform();
-        bool isOpenSimulator() const;
-        bool isSecondLife() const;
-        const std::string& getGridNick()        const;
-        const std::string& getGridName()        const;
-        const std::string& getLoginUri()        const;
-        const std::string& getLoginPage()       const;
-        const std::string& getHelperUri()       const;
-        const std::string& getWebSite()         const;
-        const std::string& getSupportUrl()      const;
-        const std::string& getRegisterUrl()     const;
-        const std::string& getPasswordUrl()     const;
+        Platform getPlatform()                                                    { return mPlatform; }
+        bool isOpenSimulator()                                          const { return (mPlatform == PLATFORM_OPENSIM); }
+        bool isSecondLife()                                                     const { return (mPlatform == PLATFORM_SECONDLIFE); }
+        bool isRenderCompat()                                           const { return mRenderCompat; }
+        // currently only SecondLife grids support username-style logins but Aurora is working on implementing it
+        bool isUsernameCompat()                                         const { return mUsernameCompat; }
+
+        const std::string& getGridNick()                        const { return mGridNick; }
+        // returns grid nick if no grid name is available
+        const std::string& getGridName()                        const;
+        const std::string& getLoginURI()                        const { return mLoginURI; }
+        const std::string& getLoginPage()                       const { return mLoginPage; }
+        const std::string& getHelperURI()                       const { return mHelperURI; }
+        const std::string& getWebSite()                         const { return mWebSite; }
+        const std::string& getSupportURL()                      const { return mSupportURL; }
+        const std::string& getRegisterURL()                     const { return mRegisterURL; }
+        const std::string& getPasswordURL()                     const { return mPasswordURL; }
         // Returns the url base used for the Web Search tab
-        const std::string& getSearchUrl()       const;
-        const std::string& getFirstName()       const;
-        const std::string& getLastName()        const;
-        const std::string& getAvatarPassword()  const;
-        const std::string& getVoiceConnector()  const { return mVoiceConnector; }
-        std::string getSearchUrl(SearchType ty, bool is_web) const;
-        bool isRenderCompat()                   const;
-        bool isUsernameCompat()                                 const;
-        int getMaxAgentGroups() const { return mMaxAgentGroups; }
-
-        const std::string& getCurrencySymbol()     const;
-        const std::string& getRealCurrencySymbol() const;
-        std::string getUploadFee()                 const;
-        std::string getGroupCreationFee()          const;
-        std::string getDirectoryFee()              const;
+        const std::string& getSearchURL()                       const { return mSearchURL; }
+        const std::string& getFirstName()                       const { return mFirstName; }
+        const std::string& getLastName()                        const { return mLastName; }
+        const std::string& getUsername()                        const { return mUsername; }
+        std::string getPassword()                               const;
+        const std::string& getVoiceConnector()          const { return mVoiceConnector; }
+        S32 getMaxAgentGroups()                                         const { return mMaxAgentGroups; }
+        const std::string& getCurrencySymbol()          const { return mCurrencySymbol; }
+        const std::string& getRealCurrencySymbol()      const { return mRealCurrencySymbol; }
+        std::string getUploadFee()                                      const;
+        std::string getGroupCreationFee()                       const;
+        std::string getDirectoryFee()                           const;
+        std::string getSearchURL(SearchType ty, bool is_web) const;
 
         void setPlatform (const std::string& platform);
         void setPlatform (Platform platform);
-        void setGridName (const std::string& gridName);
-        void setLoginUri (const std::string& loginUri);
-        void setLoginPage(const std::string& loginPage);
-        void setHelperUri(const std::string& helperUri);
-        void setWebSite  (const std::string& website);
-        void setSupportUrl(const std::string& url);
-        void setRegisterUrl(const std::string& url);
-        void setPasswordUrl(const std::string& url);
+        void setGridName (const std::string& gridName)                          { mGridName = gridName; }
+        void setLoginURI (const std::string& loginURI);
+        void setLoginPage(const std::string& loginPage)                         { mLoginPage = loginPage; }
+        void setHelperURI(const std::string& helperURI);
+        void setWebSite  (const std::string& website)                           { mWebSite = website; }
+        void setSupportURL(const std::string& url)                                      { mSupportURL = url; }
+        void setRegisterURL(const std::string& url)                                     { mRegisterURL = url; }
+        void setPasswordURL(const std::string& url)                                     { mPasswordURL = url; }
         // sets the url base used for the Web Search tab
-        void setSearchUrl(const std::string& url);
-        void setRenderCompat(bool compat);
-        void setMaxAgentGroups(int max)                   { mMaxAgentGroups = max;   }
-        void setFirstName(const std::string& firstName);
-        void setLastName(const std::string& lastName);
-        void setAvatarPassword(const std::string& avatarPassword);
-        void setVoiceConnector(const std::string& vc)     { mVoiceConnector = vc;    }
-
-        void setCurrencySymbol(const std::string& sym);
-        void setRealCurrencySymbol(const std::string& sym);
-        void setDirectoryFee(int fee);
+        void setSearchURL(const std::string& url)                                       { mSearchURL = url; }
+        void setRenderCompat(bool compat)                                                       { mRenderCompat = compat; }
+        void setMaxAgentGroups(S32 max)                                                         { mMaxAgentGroups = max;   }
+        void setFirstName(const std::string& firstName)                         { mFirstName = firstName; }
+        void setLastName(const std::string& lastName)                           { mLastName = lastName; }
+        void setPassword(const std::string& unhashed_password);
+        void setVoiceConnector(const std::string& vc)                           { mVoiceConnector = vc; }
+        void setCurrencySymbol(const std::string& sym)                          { mCurrencySymbol = sym.substr(0, 3); }
+        void setRealCurrencySymbol(const std::string& sym)                      { mRealCurrencySymbol = sym.substr(0, 3); }
+        void setDirectoryFee(U32 fee)                                                           { mDirectoryFee = fee; }
+        void setUsername(const std::string& username)                           { mUsername = username; }
+        void setUsernameCompat(bool compat)                                                     { mUsernameCompat = compat; }
 
         bool retrieveGridInfo();
 
@@ -96,27 +131,30 @@ public:
         static void initFallback();
 
 private:
-        Platform mPlatform;
+        Platform        mPlatform;
         std::string mGridNick;
         std::string mGridName;
-        std::string mLoginUri;
+        std::string mLoginURI;
         std::string mLoginPage;
-        std::string mHelperUri;
+        std::string mHelperURI;
         std::string mWebSite;
-        std::string mSupportUrl;
-        std::string mRegisterUrl;
-        std::string mPasswordUrl;
-        std::string mSearchUrl;
+        std::string mSupportURL;
+        std::string mRegisterURL;
+        std::string mPasswordURL;
+        std::string mSearchURL;
         std::string mVoiceConnector;
         std::string mFirstName;
         std::string mLastName;
-        std::string mAvatarPassword;
-        bool mRenderCompat;
-        int mMaxAgentGroups;
+        std::string mPasswordAvatar;
+        bool            mRenderCompat;
+        S32                     mMaxAgentGroups;
+
+        std::string mUsername;
+        bool            mUsernameCompat;
 
         std::string mCurrencySymbol;
         std::string mRealCurrencySymbol;
-        int mDirectoryFee;
+        U32 mDirectoryFee;
 
         // for parsing grid info XML
         enum XmlState 
@@ -127,12 +165,12 @@ private:
         };
         XmlState mXmlState;
 
-        static std::string sanitizeUri(std::string &uri);
-        void formatFee(std::string &fee, int cost, bool showFree) const;
+        static std::string sanitizeURI(std::string &uri);
+        void formatFee(std::string &fee, S32 cost, bool showFree) const;
 
         static void onXmlElementStart(void* userData, const XML_Char* name, const XML_Char** atts);
         static void onXmlElementEnd(void* userData, const XML_Char* name);
-        static void onXmlCharacterData(void* userData, const XML_Char* s, int len);
+        static void onXmlCharacterData(void* userData, const XML_Char* s, S32 len);
 };
 
 
@@ -149,31 +187,34 @@ public:
         HippoGridInfo* getGrid(const std::string& grid) const;
         HippoGridInfo* getConnectedGrid()               const;
         HippoGridInfo* getCurrentGrid()                 const;
-        const std::string& getDefaultGridNick()         const;
+        const std::string& getDefaultGridNick()         const { return mDefaultGrid; }
         const std::string& getCurrentGridNick()         const;
 
         void setDefaultGrid(const std::string& grid);
         void setCurrentGrid(const std::string& grid);
-        void setCurrentGridAsConnected();
+        void setCurrentGridAsConnected()                                      { mConnectedGrid = getCurrentGrid(); }
 
         void addGrid(HippoGridInfo* grid);
         void deleteGrid(const std::string& grid);
 
         typedef std::map<std::string, HippoGridInfo*>::iterator GridIterator;
-        GridIterator beginGrid() { return mGridInfo.begin(); }
-        GridIterator endGrid() { return mGridInfo.end(); }
+        GridIterator beginGrid()                                                          { return mGridInfo.begin(); }
+        GridIterator endGrid()                                                            { return mGridInfo.end(); }
+
+        // returns true if the grid manager knows of a nickname
+        bool hasGridNick(const std::string& grid_nick);
 
 private:
         std::map<std::string, HippoGridInfo*> mGridInfo;
         std::string mDefaultGrid;
         std::string mCurrentGrid;
         HippoGridInfo* mConnectedGrid;
-        int mDefaultGridsVersion;
+        S32 mDefaultGridsVersion;
 
         void cleanup();
         void loadFromFile();
         void parseFile(const std::string& fileName, bool mergeIfNewer);
-        void parseUrl(const std::string url, bool mergeIfNewer);
+        void parseURL(const std::string url, bool mergeIfNewer);
         void parseData(LLSD &gridInfo, bool mergeIfNewer);
 };
 
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
index d89a074..398c26d 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
@@ -8,11 +8,11 @@
 
 ; These will change
 AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
-AppName=Imprudence Viewer Experimental Release
+AppName=Imprudence Viewer Experimental
 AppVerName=Imprudence Viewer 1.4.0 Experimental 2011.03.20
 DefaultDirName={pf}\ImprudenceExperimental
-DefaultGroupName=Imprudence Viewer Experimental Release
-VersionInfoProductName=Imprudence Viewer Experimental Release
+DefaultGroupName=Imprudence Viewer Experimental
+VersionInfoProductName=Imprudence Viewer Experimental
 OutputBaseFilename=Imprudence-1.4.0-Experimental-2011.03.20-Setup
 VersionInfoVersion=1.4.0
 VersionInfoTextVersion=1.4.0
diff --git a/linden/indra/newview/linux_tools/alsoft.conf b/linden/indra/newview/linux_tools/alsoft.conf
new file mode 100644
index 0000000..7550ff0
--- /dev/null
+++ b/linden/indra/newview/linux_tools/alsoft.conf
@@ -0,0 +1,253 @@
+# OpenAL config file. Options that are not under a block or are under the
+# [general] block are for general, non-backend-specific options. Blocks may
+# appear multiple times, and duplicated options will take the last value
+# specified.
+# The system-wide settings can be put in /etc/openal/alsoft.conf and user-
+# specific override settings in ~/.alsoftrc.
+# For Windows, these settings should go into %AppData%\alsoft.ini
+# The environment variable ALSOFT_CONF can be used to specify another config
+# override
+
+# Option and block names are case-insenstive. The supplied values are only
+# hints and may not be honored (though generally it'll try to get as close as
+# possible). Note: options that are left unset may default to app- or system-
+# specified values. These are the current available settings:
+
+## format:
+#  Sets the output format. Can be one of:
+#  AL_FORMAT_MONO8    (8-bit mono)
+#  AL_FORMAT_STEREO8  (8-bit stereo)
+#  AL_FORMAT_QUAD8    (8-bit 4-channel)
+#  AL_FORMAT_51CHN8   (8-bit 5.1 output)
+#  AL_FORMAT_61CHN8   (8-bit 6.1 output)
+#  AL_FORMAT_71CHN8   (8-bit 7.1 output)
+#  AL_FORMAT_MONO16   (16-bit mono)
+#  AL_FORMAT_STEREO16 (16-bit stereo)
+#  AL_FORMAT_QUAD16   (16-bit 4-channel)
+#  AL_FORMAT_51CHN16  (16-bit 5.1 output)
+#  AL_FORMAT_61CHN16  (16-bit 6.1 output)
+#  AL_FORMAT_71CHN16  (16-bit 7.1 output)
+#  AL_FORMAT_MONO32   (32-bit float mono)
+#  AL_FORMAT_STEREO32 (32-bit float stereo)
+#  AL_FORMAT_QUAD32   (32-bit float 4-channel)
+#  AL_FORMAT_51CHN32  (32-bit float 5.1 output)
+#  AL_FORMAT_61CHN32  (32-bit float 6.1 output)
+#  AL_FORMAT_71CHN32  (32-bit float 7.1 output)
+#format = AL_FORMAT_STEREO16
+
+## cf_level:
+#  Sets the crossfeed level for stereo output. Valid values are:
+#  0 - No crossfeed
+#  1 - Low crossfeed
+#  2 - Middle crossfeed
+#  3 - High crossfeed (virtual speakers are closer to itself)
+#  4 - Low easy crossfeed
+#  5 - Middle easy crossfeed
+#  6 - High easy crossfeed
+#  Users of headphones may want to try various settings. Has no effect on non-
+#  stereo modes.
+#cf_level = 0
+
+## head_dampen:
+#  Sets the amount of dampening on sounds emanating from behind the listener.
+#  This is used to simulate the natural occlusion of the head, which is
+#  typically missing with mono and stereo output, and as such, only works on
+#  mono and stereo output modes. Valid values range from 0 to 1 (inclusive),
+#  and higher values provide a stronger effect.
+#head_dampen = 0.25
+
+## frequency:
+#  Sets the output frequency.
+#frequency = 44100
+
+## resampler:
+#  Selects the resampler used when mixing sources. Valid values are:
+#  0 - None (nearest sample, no interpolation)
+#  1 - Linear (extrapolates samples using a linear slope between samples)
+#  2 - Cubic (extrapolates samples using a Catmull-Rom spline)
+#  Specifying other values will result in using the default (linear).
+#resampler = 1
+
+## rt-prio:
+#  Sets real-time priority for the mixing thread. Not all drivers may use this
+#  (eg. PortAudio) as they already control the priority of the mixing thread.
+#  0 and negative values will disable it. Note that this may constitute a
+#  security risk since a real-time priority thread can indefinitely block
+#  normal-priority threads if it fails to wait. As such, the default is
+#  disabled.
+#rt-prio = 0
+
+## period_size:
+#  Sets the update period size, in frames. This is the number of frames needed
+#  for each mixing update.
+#period_size = 1024
+
+## periods:
+#  Sets the number of update periods. Higher values create a larger mix ahead,
+#  which helps protect against skips when the CPU is under load, but increases
+#  the delay between a sound getting mixed and being heard.
+#periods = 4
+
+## sources:
+#  Sets the maximum number of allocatable sources. Lower values may help for
+#  systems with apps that try to play more sounds than the CPU can handle.
+#sources = 256
+
+## stereodup:
+#  Sets whether to duplicate stereo sounds on the rear and side speakers for 4+
+#  channel output. This provides a "fuller" playback quality for 4+ channel
+#  output modes, although each individual speaker will have a slight reduction
+#  in volume to compensate for the extra output speakers. True, yes, on, and
+#  non-0 values will duplicate stereo sources. 0 and anything else will cause
+#  stereo sounds to only play out the front speakers. This only has an effect
+#  when a suitable output format is used (ie. those that contain side and/or
+#  rear speakers).
+#stereodup = true
+
+## scalemix:
+#  Sets whether to scale the remixed output. When the final mix is written to
+#  the device, the multi-channel data is remixed so pure-virtual channels (eg.
+#  front-center on stereo output) are remixed and added to available channels
+#  (eg. front-left and front-right). Scaling helps ensure that no single source
+#  will put out more than 100% on a given physical channel. This can cause a
+#  noticeable reduction in overall volume, however, so it is off by default.
+#scalemix = false
+
+## drivers:
+#  Sets the backend driver list order, comma-seperated. Unknown backends and
+#  duplicated names are ignored. Unlisted backends won't be considered for use
+#  unless the list is ended with a comma (eg. 'oss,' will list OSS first
+#  followed by all other available backends, while 'oss' will list OSS only).
+#  Backends prepended with - won't be available for use (eg. '-oss,' will allow
+#  all available backends except OSS). An empty list means the default.
+#drivers = pulse,alsa,core,oss,solaris,dsound,winmm,port,null,wave
+
+## excludefx:
+#  Sets which effects to exclude, preventing apps from using them. This can
+#  help for apps that try to use effects which are too CPU intensive for the
+#  system to handle. Available effects are: eaxreverb,reverb,echo,modulator,
+#  dedicated
+#excludefx =
+
+## slots:
+#  Sets the maximum number of Auxiliary Effect Slots an app can create. A slot
+#  can use a non-negligible amount of CPU time if an effect is set on it even
+#  if no sources are feeding it, so this may help when apps use more than the
+#  system can handle.
+#slots = 4
+
+## sends:
+#  Sets the number of auxiliary sends per source. When not specified (default),
+#  it allows the app to request how many it wants. The maximum value currently
+#  possible is 4.
+#sends =
+
+## layout:
+#  Sets the virtual speaker layout. Values are specified in degrees, where 0 is
+#  straight in front, negative goes left, and positive goes right. Unspecified
+#  speakers will remain at their default positions (which are dependant on the
+#  output format). Available speakers are back-left(bl), side-left(sl), front-
+#  left(fl), front-center(fc), front-right(fr), side-right(sr), back-right(br),
+#  and back-center(bc).
+#layout =
+
+## layout_*:
+#  Channel-specific layouts may be specified to override the layout option. The
+#  same speakers as the layout option are available, and the default settings
+#  are shown below.
+#layout_STEREO = fl=-90, fr=90
+#layout_QUAD   = fl=-45, fr=45, bl=-135, br=135
+#layout_51CHN  = fl=-30, fr=30, fc=0, bl=-110, br=110
+#layout_61CHN  = fl=-30, fr=30, fc=0, sl=-90, sr=90, bc=180
+#layout_71CHN  = fl=-30, fr=30, fc=0, sl=-90, sr=90, bl=-150, br=150
+
+##
+## ALSA backend stuff
+##
+[alsa]
+
+## device:
+#  Sets the device name for the default playback device.
+#device = default
+
+## capture:
+#  Sets the device name for the default capture device.
+#capture = default
+
+## mmap:
+#  Sets whether to try using mmap mode (helps reduce latencies and CPU
+#  consumption). If mmap isn't available, it will automatically fall back to
+#  non-mmap mode. True, yes, on, and non-0 values will attempt to use mmap. 0
+#  and anything else will force mmap off.
+#mmap = true
+
+##
+## OSS backend stuff
+##
+[oss]
+
+## device:
+#  Sets the device name for OSS output.
+#device = /dev/dsp
+
+## capture:
+#  Sets the device name for OSS capture.
+#capture = /dev/dsp
+
+##
+## Solaris backend stuff
+##
+[solaris]
+
+## device:
+#  Sets the device name for Solaris output.
+#device = /dev/audio
+
+##
+## DirectSound backend stuff
+##
+[dsound]
+
+##
+## Windows Multimedia backend stuff
+##
+[winmm]
+
+##
+## PortAudio backend stuff
+##
+[port]
+
+## device:
+#  Sets the device index for output. Negative values will use the default as
+#  given by PortAudio itself.
+#device = -1
+
+## capture:
+#  Sets the device index for capture. Negative values will use the default as
+#  given by PortAudio itself.
+#capture = -1
+
+##
+## PulseAudio backend stuff
+##
+[pulse]
+
+## spawn-server:
+#  Attempts to spawn a PulseAudio server when requesting to open a PulseAudio
+#  device. Note that some apps may open and probe all enumerated devices on
+#  startup, causing a server to spawn even if a PulseAudio device is not
+#  actually selected. Setting autospawn to false in Pulse's client.conf will
+#  still prevent autospawning even if this is set to true.
+#spawn-server = false
+
+##
+## Wave File Writer stuff
+##
+[wave]
+
+## file:
+#  Sets the filename of the wave file to write to. An empty name prevents the
+#  backend from opening, even when explicitly requested.
+#  THIS WILL OVERWRITE EXISTING FILES WITHOUT QUESTION!
+#file =
\ No newline at end of file
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index e590394..08ae537 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -4,17 +4,26 @@
 ## These options are for self-assisted troubleshooting during this beta
 ## testing phase; you should not usually need to touch them.
 
-## - Avoids using any OpenAL audio driver.
+## If the default configuration of openal-soft isn't working for you.
+## There are 3 places where it looks for a configuration file:
+## /etc/openal/alsoft.conf $HOME/.alsoftrc and ALSOFT_CONF
+## ALSOFT_CONF is the full path including the filename, like: /home/myuser/myconfigfile.txt
+## If none of them is set a hardcoded default is taken.
+## If you set several: ALSOFT_CONF 'wins' always, and $HOME/.alsoftrc 'wins' over /etc/openal/alsoft.conf
+#export ALSOFT_CONF="$(pwd)/alsoft.conf"
+
+## - Avoids using the OpenAL audio driver; disables any inworld sound effects.
+##   NOTE: - OpenAL is not used for any streaming audio in Imprudence.
+##         - Other export LL_BAD_<driver> have no effect in Imprudence.
 #export LL_BAD_OPENAL_DRIVER=x
-## - Avoids using any FMOD audio driver.
-#export LL_BAD_FMOD_DRIVER=x
 
-## - Avoids using the FMOD ESD audio driver.
-#export LL_BAD_FMOD_ESD=x
-## - Avoids using the FMOD OSS audio driver.
-#export LL_BAD_FMOD_OSS=x
-## - Avoids using the FMOD ALSA audio driver.
-#export LL_BAD_FMOD_ALSA=x
+## If you have custom gstreamer plugins, 
+## e.g. you want to use Imprudence-1.4.x with the gstreamer plugins of Imprudence-1.3.1: 
+##                      Imprudence-1.3.1-Linux-x86/lib/gstreamer-plugins
+##      respectively    Imprudence-1.3.1-Linux-x86_64/lib64/gstreamer-plugins
+## NOTE: *WAY* better is to install the gstreamer plugins that come with your distros package manager,
+##      thats why Imprudence-1.4.x comes without gstreamer plugins.
+#export GST_PLUGIN_PATH="'${HOME}/Imprudence-1.3.1-Linux-x86/lib/gstreamer-plugins':'${GST_PLUGIN_PATH}'"
 
 ## - Avoids the optional OpenGL extensions which have proven most problematic
 ##   on some hardware.  Disabling this option may cause BETTER PERFORMANCE but
@@ -48,7 +57,6 @@
 
 ## Everything below this line is just for advanced troubleshooters.
 ##-------------------------------------------------------------------
-
 ## - For advanced debugging cases, you can run the viewer under the
 ##   control of another program, such as strace, gdb, or valgrind.  If
 ##   you're building your own viewer, bear in mind that the executable
@@ -127,7 +135,20 @@ if [ -n "$LL_RUN_ERR" ]; then
         if [ "$LL_RUN_ERR" = "runerr" ]; then
                 # generic error running the binary
                 echo 'unexpected shutdown'
-
-
         fi
 fi
+
+LOGS_PATH="${HOME}/.imprudence/logs"
+if [ -f "${LOGS_PATH}/stack_trace.log" ]; then
+        LOG_PACKAGE_NAME="MAIL-THIS-CRASHLOG-PLEASE.$(date +%y%m%d%H%M).tar.bz2"
+        cp "${LOGS_PATH}/stack_trace.log" stack_trace.log
+        cp "${LOGS_PATH}/Imprudence.log" Imprudence.log
+        tar --numeric-owner -cjf  ${LOG_PACKAGE_NAME} \
+                                stack_trace.log \
+                                Imprudence.log
+        rm stack_trace.log
+        rm Imprudence.log
+        echo "You find a crash log package to mail to Imprudence here:"
+        echo "${RUN_PATH}/${LOG_PACKAGE_NAME}"
+        echo "See where to send: http://wiki.kokuaviewer.org/wiki/Imprudence:Debug_Logs#Where_to_Send_Them"
+fi
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 7bc57f8..85a1b36 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -56,6 +56,7 @@
 #include "llsdutil.h"
 //#include "vmath.h"
 
+#include "hippogridmanager.h"
 #include "imageids.h"
 #include "llbox.h"
 #include "llbutton.h"
@@ -2734,14 +2735,24 @@ void LLAgent::updateLookAt(const S32 mouse_x, const S32 mouse_y)
                 }
                 else if (cameraThirdPerson())
                 {
-                        // range from -.5 to .5
-                        F32 x_from_center = 
-                                ((F32) mouse_x / (F32) gViewerWindow->getWindowWidth() ) - 0.5f;
-                        F32 y_from_center = 
-                                ((F32) mouse_y / (F32) gViewerWindow->getWindowHeight() ) - 0.5f;
-
-                        frameCamera.yaw( - x_from_center * gSavedSettings.getF32("YawFromMousePosition") * DEG_TO_RAD);
-                        frameCamera.pitch( - y_from_center * gSavedSettings.getF32("PitchFromMousePosition") * DEG_TO_RAD);
+                        if (gSavedSettings.getBOOL("HeadFollowsMouse"))
+                        {
+                                // range from -.5 to .5
+                                F32 x_from_center = 
+                                        ((F32) mouse_x / (F32) gViewerWindow->getWindowWidth() ) - 0.5f;
+                                F32 y_from_center = 
+                                        ((F32) mouse_y / (F32) gViewerWindow->getWindowHeight() ) - 0.5f;
+
+                                frameCamera.yaw( - x_from_center * gSavedSettings.getF32("YawFromMousePosition")
+                                                        * DEG_TO_RAD);
+                                frameCamera.pitch( - y_from_center * gSavedSettings.getF32("PitchFromMousePosition")
+                                                        * DEG_TO_RAD);
+                        }
+                        else
+                        {
+                                frameCamera.yaw( 0.f );
+                                frameCamera.pitch( 0.f );
+                        }
                         lookAtType = LOOKAT_TARGET_FREELOOK;
                 }
 
@@ -4772,6 +4783,116 @@ void LLAgent::lookAtLastChat()
         }
 }
 
+void LLAgent::lookAtObject(LLUUID object_id, ECameraPosition camera_pos)
+{
+        // Block if camera is animating or not in normal third person camera mode
+        if (mCameraAnimating || !cameraThirdPerson())
+        {
+                return;
+        }
+
+        LLViewerObject *chatter = gObjectList.findObject(object_id);
+        if (chatter)
+        {
+                LLVector3 delta_pos;
+                if (chatter->isAvatar())
+                {
+                        LLVOAvatar *chatter_av = (LLVOAvatar*)chatter;
+                        if (!mAvatarObject.isNull() && chatter_av->mHeadp)
+                        {
+                                delta_pos = chatter_av->mHeadp->getWorldPosition() - mAvatarObject->mHeadp->getWorldPosition();
+                        }
+                        else
+                        {
+                                delta_pos = chatter->getPositionAgent() - getPositionAgent();
+                        }
+                        delta_pos.normVec();
+
+                        setControlFlags(AGENT_CONTROL_STOP);
+
+                        changeCameraToThirdPerson();
+
+                        LLVector3 new_camera_pos = mAvatarObject->mHeadp->getWorldPosition();
+                        LLVector3 left = delta_pos % LLVector3::z_axis;
+                        left.normVec();
+                        LLVector3 up = left % delta_pos;
+                        up.normVec();
+                        new_camera_pos -= delta_pos * 0.4f;
+                        new_camera_pos += left * 0.3f;
+                        new_camera_pos += up * 0.2f;
+
+                        F32 radius = chatter_av->getVObjRadius();
+                        LLVector3d view_dist(radius, radius, 0.0f);
+
+                        if (chatter_av->mHeadp)
+                        {
+                                setFocusGlobal(getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition()), object_id);
+                                mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - gAgent.getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition());
+
+                                switch(camera_pos)
+                                {
+                                        case CAMERA_POSITION_SELF:
+                                                mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - gAgent.getPosGlobalFromAgent(chatter_av->mHeadp->getWorldPosition());
+                                                break;
+                                        case CAMERA_POSITION_OBJECT:
+                                                mCameraFocusOffsetTarget =  view_dist;
+                                                break;
+                                }
+                        }
+                        else
+                        {
+                                setFocusGlobal(chatter->getPositionGlobal(), object_id);
+                                mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
+
+                                switch(camera_pos)
+                                {
+                                        case CAMERA_POSITION_SELF:
+                                                mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
+                                                break;
+                                        case CAMERA_POSITION_OBJECT:
+                                                mCameraFocusOffsetTarget = view_dist;
+                                                break;
+                                }
+                        }
+                        setFocusOnAvatar(FALSE, TRUE);
+                }
+                else
+                {
+                        delta_pos = chatter->getRenderPosition() - getPositionAgent();
+                        delta_pos.normVec();
+
+                        setControlFlags(AGENT_CONTROL_STOP);
+
+                        changeCameraToThirdPerson();
+
+                        LLVector3 new_camera_pos = mAvatarObject->mHeadp->getWorldPosition();
+                        LLVector3 left = delta_pos % LLVector3::z_axis;
+                        left.normVec();
+                        LLVector3 up = left % delta_pos;
+                        up.normVec();
+                        new_camera_pos -= delta_pos * 0.4f;
+                        new_camera_pos += left * 0.3f;
+                        new_camera_pos += up * 0.2f;
+
+                        setFocusGlobal(chatter->getPositionGlobal(), object_id);
+
+                        switch(camera_pos)
+                        {
+                                case CAMERA_POSITION_SELF:
+                                        mCameraFocusOffsetTarget = getPosGlobalFromAgent(new_camera_pos) - chatter->getPositionGlobal();
+                                        break;
+                                case CAMERA_POSITION_OBJECT:
+                                        F32 radius = chatter->getVObjRadius();
+                                        LLVector3d view_dist(radius, radius, 0.0f);
+                                        mCameraFocusOffsetTarget = view_dist;
+                                        break;
+                        }
+
+                        setFocusOnAvatar(FALSE, TRUE);
+                }
+        }
+}
+
 const F32 SIT_POINT_EXTENTS = 0.2f;
 
 void LLAgent::setStartPosition( U32 location_id )
@@ -5480,7 +5601,7 @@ void LLAgent::getName(std::string& name)
         }
         else
         {
-                name = gSavedSettings.getString("FirstName") + " " + gSavedSettings.getString("LastName");
+                name = gHippoGridManager->getCurrentGrid()->getFirstName() + " " + gHippoGridManager->getCurrentGrid()->getLastName();
         }
 }
 
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index cea55fb..83490d3 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -82,6 +82,12 @@ typedef enum e_camera_modes
         CAMERA_MODE_FOLLOW
 } ECameraMode;
 
+typedef enum e_camera_position
+{
+        CAMERA_POSITION_SELF, /** Camera positioned at our position */
+        CAMERA_POSITION_OBJECT /** Camera positioned at observed object's position */
+} ECameraPosition;
+
 typedef enum e_anim_request
 {
         ANIM_REQUEST_START,
@@ -214,6 +220,7 @@ public:
 
         void                    heardChat(const LLUUID& id);
         void                    lookAtLastChat();
+        void                    lookAtObject(LLUUID avatar_id, ECameraPosition camera_pos);
         F32                             getTypingTime() { return mTypingTimer.getElapsedTimeF32(); }
 
         void                    setAFK();
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 18b65cc..d76b722 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -859,7 +859,7 @@ bool LLAppViewer::init()
                         minSpecs += "\n";
                         unsupported = true;
                 }
-                if(gSysCPU.getMhz() < minCPU)
+                if(gSysCPU.getMHz() < minCPU)
                 {
                         minSpecs += LLNotifications::instance().getGlobalString("UnsupportedCPU");
                         minSpecs += "\n";
@@ -1267,6 +1267,19 @@ bool LLAppViewer::cleanup()
 
         LLCalc::cleanUp();
 
+        // Quitting with "Remember Password" turned off should always stomp your
+        // saved password, whether or not you successfully logged in.  JC
+        if (!gSavedSettings.getBOOL("RememberPassword"))
+        {
+                gHippoGridManager->getConnectedGrid()->setPassword("");
+
+                // kill old password.dat file if it exists. We do this to keep setting compatibility with older versions -- MC
+                std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "password.dat");
+                LLFile::remove(filepath);
+        }
+
+        gHippoGridManager->saveFile();
+
         delete gHippoGridManager;
         gHippoGridManager = NULL;
 
@@ -1418,13 +1431,6 @@ bool LLAppViewer::cleanup()
         //
         LLVFile::cleanupClass();
         llinfos << "VFS cleaned up" << llendflush;
-
-        // Quitting with "Remember Password" turned off should always stomp your
-        // saved password, whether or not you successfully logged in.  JC
-        if (!gSavedSettings.getBOOL("RememberPassword"))
-        {
-                LLStartUp::deletePasswordFromDisk();
-        }
         
         // Store the time of our current logoff
         gSavedPerAccountSettings.setU32("LastLogoff", time_corrected());
@@ -2467,7 +2473,7 @@ void LLAppViewer::writeSystemInfo()
 
         gDebugInfo["CPUInfo"]["CPUString"] = gSysCPU.getCPUString();
         gDebugInfo["CPUInfo"]["CPUFamily"] = gSysCPU.getFamily();
-        gDebugInfo["CPUInfo"]["CPUMhz"] = gSysCPU.getMhz();
+        gDebugInfo["CPUInfo"]["CPUMhz"] = gSysCPU.getMHz();
         gDebugInfo["CPUInfo"]["CPUAltivec"] = gSysCPU.hasAltivec();
         gDebugInfo["CPUInfo"]["CPUSSE"] = gSysCPU.hasSSE();
         gDebugInfo["CPUInfo"]["CPUSSE2"] = gSysCPU.hasSSE2();
@@ -3261,10 +3267,10 @@ void LLAppViewer::badNetworkHandler()
         LLAppViewer::handleViewerCrash();
 
         std::string grid_support_msg = "";
-        if (!gHippoGridManager->getCurrentGrid()->getSupportUrl().empty())
+        if (!gHippoGridManager->getCurrentGrid()->getSupportURL().empty())
         {
                 grid_support_msg = "\n\nOr visit the gird support page at: \n " 
-                        + gHippoGridManager->getCurrentGrid()->getSupportUrl();
+                        + gHippoGridManager->getCurrentGrid()->getSupportURL();
         }
         std::ostringstream message;
         message <<
@@ -4196,6 +4202,11 @@ void LLAppViewer::disconnectViewer()
 
         saveNameCache();
 
+        {
+                std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "cloud.xml");
+                LLVOAvatar::saveCloud(filename, LLVOAvatar::sCloud);
+        }
+
         // close inventory interface, close all windows
         LLInventoryView::cleanup();
         // Don't cleanup menus on disconnect in order to avoid crashes -- MC
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index bf43fcf..25942e9 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -617,7 +617,7 @@ void LLFeatureManager::applyBaseMasks()
 #error The 800 is hinky. Would something like a LL_MIN_MHZ make more sense here?
         if (gSysCPU.getMhz() < 800)
 #else
-        if (gSysCPU.getMhz() < 1100)
+        if (gSysCPU.getMHz() < 1100)
 #endif
         {
                 maskFeatures("CPUSlow");
diff --git a/linden/indra/newview/llfloateravatarlist.cpp b/linden/indra/newview/llfloateravatarlist.cpp
new file mode 100644
index 0000000..2346e94
--- /dev/null
+++ b/linden/indra/newview/llfloateravatarlist.cpp
@@ -0,0 +1,1471 @@
+/** 
+ * @file llfloateravatarlist.cpp
+ * @brief Avatar list/radar floater
+ *
+ * @author Dale Glass <dale@daleglass.net>, (C) 2007
+ */
+
+/**
+ * Rewritten by jcool410
+ * Removed usage of globals
+ * Removed TrustNET
+ * Added utilization of "minimap" data
+ * Heavily modified by Henri Beauchamp (the laggy spying tool becomes a true,
+ * low lag radar)
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llavatarconstants.h"
+#include "llfloateravatarlist.h"
+
+#include "llcachename.h"
+#include "lluictrlfactory.h"
+#include "llviewerwindow.h"
+#include "llscrolllistctrl.h"
+#include "llradiogroup.h"
+#include "llviewercontrol.h"
+
+#include "llvoavatar.h"
+#include "llimview.h"
+#include "llfloateravatarinfo.h"
+#include "llregionflags.h"
+#include "llfloaterreporter.h"
+#include "llagent.h"
+#include "llviewerregion.h"
+#include "lltracker.h"
+#include "llviewerstats.h"
+#include "llerror.h"
+#include "llchat.h"
+#include "llfloaterchat.h"
+#include "llviewermessage.h"
+#include "llweb.h"
+#include "llviewerobjectlist.h"
+#include "llmutelist.h"
+#include "llcallbacklist.h"
+#include "llviewermenu.h"
+
+#include <time.h>
+#include <string.h>
+
+#include <map>
+
+
+#include "llworld.h"
+
+#include "llsdutil.h"
+
+/**
+ * @brief How long to keep people who are gone in the list and in memory.
+ */
+const F32 DEAD_KEEP_TIME = 10.0f;
+
+extern U32 gFrameCount;
+
+typedef enum e_radar_alert_type
+{
+        ALERT_TYPE_SIM = 0,
+        ALERT_TYPE_DRAW = 1,
+        ALERT_TYPE_SHOUTRANGE = 2,
+        ALERT_TYPE_CHATRANGE = 3
+} ERadarAlertType;
+
+void announce(std::string msg)
+{
+        //llinfos << "Radar broadcasting key: " << key.asString() << " - on channel " << gSavedSettings.getS32("RadarChatKeysChannel") << llendl;
+        gMessageSystem->newMessage("ScriptDialogReply");
+        gMessageSystem->nextBlock("AgentData");
+        gMessageSystem->addUUID("AgentID", gAgent.getID());
+        gMessageSystem->addUUID("SessionID", gAgent.getSessionID());
+        gMessageSystem->nextBlock("Data");
+        gMessageSystem->addUUID("ObjectID", gAgent.getID());
+        gMessageSystem->addS32("ChatChannel", gSavedSettings.getS32("RadarChatKeysChannel"));
+        gMessageSystem->addS32("ButtonIndex", 1);
+        gMessageSystem->addString("ButtonLabel", msg);
+        gAgent.sendReliableMessage();
+}
+
+void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool entering)
+{
+        if (gSavedSettings.getBOOL("RadarChatAlerts"))
+        {
+                LLChat chat;
+                switch(type)
+                {
+                case ALERT_TYPE_SIM:
+                        if (gSavedSettings.getBOOL("MiniMapNotifySimRange"))
+                        {
+                                chat.mText = name+" has "+(entering ? "entered" : "left")+" the sim.";
+                        }
+                        break;
+                case ALERT_TYPE_DRAW:
+                        if (gSavedSettings.getBOOL("RadarAlertDraw"))
+                        {
+                                chat.mText = name+" has "+(entering ? "entered" : "left")+" draw distance.";
+                        }
+                        break;
+                case ALERT_TYPE_SHOUTRANGE:
+                        if (gSavedSettings.getBOOL("RadarAlertShoutRange"))
+                        {
+                                chat.mText = name+" has "+(entering ? "entered" : "left")+" shout range.";
+                        }
+                        break;
+                case ALERT_TYPE_CHATRANGE:
+                        if (gSavedSettings.getBOOL("MiniMapNotifyChatRange"))
+                        {
+                                chat.mText = name+" has "+(entering ? "entered" : "left")+" chat range.";
+                        }
+                        break;
+                }
+                if (chat.mText != "")
+                {
+                        chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                        LLFloaterChat::addChat(chat);
+                }
+        }
+        if (type == ALERT_TYPE_SIM && entering && gSavedSettings.getBOOL("RadarChatKeys"))
+        {
+                announce(key.asString());
+        }
+}
+
+LLAvatarListEntry::LLAvatarListEntry(const LLUUID& id, const std::string &name, const LLVector3d &position) :
+                mID(id), mName(name), mDisplayName(name), mPosition(position), mDrawPosition(), mMarked(FALSE),
+                mFocused(FALSE), mUpdateTimer(), mFrame(gFrameCount), mInSimFrame(U32_MAX), mInDrawFrame(U32_MAX),
+                mInChatFrame(U32_MAX), mInShoutFrame(U32_MAX)
+{
+}
+
+void LLAvatarListEntry::setPosition(LLVector3d position, bool this_sim, bool drawn, bool chatrange, bool shoutrange)
+{
+        if (drawn)
+        {
+                mDrawPosition = position;
+        }
+        else if (mInDrawFrame == U32_MAX)
+        {
+                mDrawPosition.setZero();
+        }
+
+        mPosition = position;
+
+        mFrame = gFrameCount;
+        if (this_sim)
+        {
+                if (mInSimFrame == U32_MAX)
+                {
+                        chat_avatar_status(mName, mID, ALERT_TYPE_SIM, true);
+                }
+                mInSimFrame = mFrame;
+        }
+        if (drawn)
+        {
+                if (mInDrawFrame == U32_MAX)
+                {
+                        chat_avatar_status(mName, mID, ALERT_TYPE_DRAW, true);
+                }
+                mInDrawFrame = mFrame;
+        }
+        if (shoutrange)
+        {
+                if (mInShoutFrame == U32_MAX)
+                {
+                        chat_avatar_status(mName, mID, ALERT_TYPE_SHOUTRANGE, true);
+                }
+                mInShoutFrame = mFrame;
+        }
+        if (chatrange)
+        {
+                if (mInChatFrame == U32_MAX)
+                {
+                        chat_avatar_status(mName, mID, ALERT_TYPE_CHATRANGE, true);
+                }
+                mInChatFrame = mFrame;
+        }
+
+        mUpdateTimer.start();
+}
+
+bool LLAvatarListEntry::getAlive()
+{
+        U32 current = gFrameCount;
+        if (mInSimFrame != U32_MAX && (current - mInSimFrame) >= 2)
+        {
+                mInSimFrame = U32_MAX;
+                chat_avatar_status(mName, mID, ALERT_TYPE_SIM, false);
+        }
+        if (mInDrawFrame != U32_MAX && (current - mInDrawFrame) >= 2)
+        {
+                mInDrawFrame = U32_MAX;
+                chat_avatar_status(mName, mID, ALERT_TYPE_DRAW, false);
+        }
+        if (mInShoutFrame != U32_MAX && (current - mInShoutFrame) >= 2)
+        {
+                mInShoutFrame = U32_MAX;
+                chat_avatar_status(mName, mID, ALERT_TYPE_SHOUTRANGE, false);
+        }
+        if (mInChatFrame != U32_MAX && (current - mInChatFrame) >= 2)
+        {
+                mInChatFrame = U32_MAX;
+                chat_avatar_status(mName, mID, ALERT_TYPE_CHATRANGE, false);
+        }
+        return ((current - mFrame) <= 2);
+}
+
+F32 LLAvatarListEntry::getEntryAgeSeconds()
+{
+        return mUpdateTimer.getElapsedTimeF32();
+}
+
+BOOL LLAvatarListEntry::isDead()
+{
+        return getEntryAgeSeconds() > DEAD_KEEP_TIME;
+}
+
+LLFloaterAvatarList* LLFloaterAvatarList::sInstance = NULL;
+
+LLFloaterAvatarList::LLFloaterAvatarList() :  LLFloater(std::string("radar"))
+{
+        llassert_always(sInstance == NULL);
+        sInstance = this;
+        mUpdateRate = gSavedSettings.getU32("RadarUpdateRate") * 3 + 3;
+}
+
+LLFloaterAvatarList::~LLFloaterAvatarList()
+{
+        gIdleCallbacks.deleteFunction(LLFloaterAvatarList::callbackIdle);
+        sInstance = NULL;
+}
+
+//static
+void LLFloaterAvatarList::toggle(void*)
+{
+#ifdef LL_RRINTERFACE_H //MK
+        if (gRRenabled && gAgent.mRRInterface.mContainsShownames)
+        {
+                if (sInstance && sInstance->getVisible())
+                {       
+                        sInstance->close(false);
+                }
+        }
+#endif //mk
+        if (sInstance)
+        {
+                if (sInstance->getVisible())
+                {
+                        sInstance->close(false);
+                }
+                else
+                {
+                        sInstance->open();
+                }
+        }
+        else
+        {
+                showInstance();
+        }
+}
+
+//static
+void LLFloaterAvatarList::showInstance()
+{
+#ifdef LL_RRINTERFACE_H //MK
+        if (gRRenabled && gAgent.mRRInterface.mContainsShownames)
+        {
+                return;
+        }
+#endif //mk
+        if (sInstance)
+        {
+                if (!sInstance->getVisible())
+                {
+                        sInstance->open();
+                }
+        }
+        else
+        {
+                sInstance = new LLFloaterAvatarList();
+                LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_radar.xml");
+        }
+}
+
+void LLFloaterAvatarList::draw()
+{
+        LLFloater::draw();
+}
+
+void LLFloaterAvatarList::onOpen()
+{
+        gSavedSettings.setBOOL("ShowRadar", TRUE);
+        sInstance->setVisible(TRUE);
+}
+
+void LLFloaterAvatarList::onClose(bool app_quitting)
+{
+        sInstance->setVisible(FALSE);
+        if (!app_quitting)
+        {
+                gSavedSettings.setBOOL("ShowRadar", FALSE);
+        }
+        if (!gSavedSettings.getBOOL("RadarKeepOpen") || app_quitting)
+        {
+                destroy();
+        }
+}
+
+BOOL LLFloaterAvatarList::postBuild()
+{
+        // Default values
+        mTracking = FALSE;
+        mUpdate = TRUE;
+
+        // Hide them until some other way is found
+        // Users may not expect to find a Ban feature on the Eject button
+        childSetVisible("estate_ban_btn", false);
+
+        // Set callbacks
+        childSetAction("profile_btn", onClickProfile, this);
+        childSetAction("im_btn", onClickIM, this);
+        childSetAction("offer_btn", onClickTeleportOffer, this);
+        childSetAction("track_btn", onClickTrack, this);
+        childSetAction("mark_btn", onClickMark, this);
+        childSetAction("focus_btn", onClickFocus, this);
+        childSetAction("prev_in_list_btn", onClickPrevInList, this);
+        childSetAction("next_in_list_btn", onClickNextInList, this);
+        childSetAction("prev_marked_btn", onClickPrevMarked, this);
+        childSetAction("next_marked_btn", onClickNextMarked, this);
+        
+        childSetAction("get_key_btn", onClickGetKey, this);
+
+        childSetAction("freeze_btn", onClickFreeze, this);
+        childSetAction("eject_btn", onClickEject, this);
+        childSetAction("mute_btn", onClickMute, this);
+        childSetAction("ar_btn", onClickAR, this);
+        childSetAction("teleport_btn", onClickTeleport, this);
+        childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
+
+        childSetAction("send_keys_btn", onClickSendKeys, this);
+
+        getChild<LLRadioGroup>("update_rate")->setSelectedIndex(gSavedSettings.getU32("RadarUpdateRate"));
+        childSetCommitCallback("update_rate", onCommitUpdateRate, this);
+
+        // Get a pointer to the scroll list from the interface
+        mAvatarList = getChild<LLScrollListCtrl>("avatar_list");
+        mAvatarList->sortByColumn("distance", TRUE);
+        mAvatarList->setCommitOnSelectionChange(TRUE);
+        childSetCommitCallback("avatar_list", onSelectName, this);
+        refreshAvatarList();
+
+        gIdleCallbacks.addFunction(LLFloaterAvatarList::callbackIdle);
+
+        return TRUE;
+}
+
+void LLFloaterAvatarList::updateAvatarList()
+{
+        if (sInstance != this) return;
+
+#ifdef LL_RRINTERFACE_H //MK
+        if (gRRenabled && gAgent.mRRInterface.mContainsShownames)
+        {
+                close();
+        }
+#endif //mk
+
+        //llinfos << "radar refresh: updating map" << llendl;
+
+        // Check whether updates are enabled
+        LLCheckboxCtrl* check = getChild<LLCheckboxCtrl>("update_enabled_cb");
+        if (check && !check->getValue())
+        {
+                mUpdate = FALSE;
+                refreshTracker();
+                return;
+        }
+        else
+        {
+                mUpdate = TRUE;
+        }
+
+        LLVector3d mypos = gAgent.getPositionGlobal();
+
+        {
+                std::vector<LLUUID> avatar_ids;
+                std::vector<LLUUID> sorted_avatar_ids;
+                std::vector<LLVector3d> positions;
+
+                LLWorld::instance().getAvatars(&avatar_ids, &positions, mypos, F32_MAX);
+
+                sorted_avatar_ids = avatar_ids;
+                std::sort(sorted_avatar_ids.begin(), sorted_avatar_ids.end());
+
+                for (std::vector<LLCharacter*>::const_iterator iter = LLCharacter::sInstances.begin(); iter != LLCharacter::sInstances.end(); ++iter)
+                {
+                        LLUUID avid = (*iter)->getID();
+
+                        if (!std::binary_search(sorted_avatar_ids.begin(), sorted_avatar_ids.end(), avid))
+                        {
+                                avatar_ids.push_back(avid);
+                        }
+                }
+
+                size_t i;
+                size_t count = avatar_ids.size();
+
+                for (i = 0; i < count; ++i)
+                {
+                        std::string name, first, last;
+                        const LLUUID &avid = avatar_ids[i];
+
+                        LLVector3d position;
+                        LLViewerObject *obj = gObjectList.findObject(avid);
+
+                        if (obj)
+                        {
+                                LLVOAvatar* avatarp = dynamic_cast<LLVOAvatar*>(obj);
+
+                                if (avatarp == NULL)
+                                {
+                                        continue;
+                                }
+
+                                // Skip if avatar is dead(what's that?)
+                                // or if the avatar is ourselves.
+                                if (avatarp->isDead() || avatarp->isSelf())
+                                {
+                                        continue;
+                                }
+
+                                // Get avatar data
+                                position = gAgent.getPosGlobalFromAgent(avatarp->getCharacterPosition());
+                                name = avatarp->getFullname();
+
+                                // Apparently, sometimes the name comes out empty, with a " " name. This is because
+                                // getFullname concatenates first and last name with a " " in the middle.
+                                // This code will avoid adding a nameless entry to the list until it acquires a name.
+
+                                //duped for lower section
+                                if (name.empty() || (name.compare(" ") == 0))// || (name.compare(gCacheName->getDefaultName()) == 0))
+                                {
+                                        if (gCacheName->getName(avid, first, last))
+                                        {
+                                                name = first + " " + last;
+                                        }
+                                        else
+                                        {
+                                                continue;
+                                        }
+                                }
+
+#ifdef LL_DISPLAY_NAMES
+                                std::string display_name = name;
+                                if (LLAvatarName::sOmitResidentAsLastName)
+                                {
+                                        LLStringUtil::replaceString(display_name, " Resident", "");
+                                }
+                                if (LLAvatarNameCache::useDisplayNames())
+                                {
+                                        LLAvatarName avatar_name;
+                                        if (LLAvatarNameCache::get(avid, &avatar_name))
+                                        {
+                                                if (LLAvatarNameCache::useDisplayNames() == 2)
+                                                {
+                                                        display_name = avatar_name.mDisplayName;
+                                                }
+                                                else
+                                                {
+                                                        display_name = avatar_name.getNames();
+                                                }
+                                        }
+                                }
+#endif
+
+                                if (avid.isNull())
+                                {
+                                        //llinfos << "Key empty for avatar " << name << llendl;
+                                        continue;
+                                }
+
+                                if (mAvatars.count(avid) > 0)
+                                {
+                                        // Avatar already in list, update position
+                                        F32 dist = (F32)(position - mypos).magVec();
+                                        mAvatars[avid].setPosition(position, (avatarp->getRegion() == gAgent.getRegion()), true, dist < 20.0, dist < 100.0);
+                                }
+                                else
+                                {
+                                        // Avatar not there yet, add it
+                                        LLAvatarListEntry entry(avid, name, position);
+                                        mAvatars[avid] = entry;
+                                }
+#ifdef LL_DISPLAY_NAMES
+                                // update avatar display name.
+                                mAvatars[avid].setDisplayName(display_name);
+#endif
+                        }
+                        else
+                        {
+                                if (i < positions.size())
+                                {
+                                        position = positions[i];
+                                }
+                                else
+                                {
+                                        continue;
+                                }
+
+                                if (gCacheName->getName(avid, first, last))
+                                {
+                                        name = first + " " + last;
+                                }
+                                else
+                                {
+                                        //name = gCacheName->getDefaultName();
+                                        continue; //prevent (Loading...)
+                                }
+
+#ifdef LL_DISPLAY_NAMES
+                                std::string display_name = name;
+                                if (LLAvatarName::sOmitResidentAsLastName)
+                                {
+                                        LLStringUtil::replaceString(display_name, " Resident", "");
+                                }
+                                if (LLAvatarNameCache::useDisplayNames())
+                                {
+                                        LLAvatarName avatar_name;
+                                        if (LLAvatarNameCache::get(avid, &avatar_name))
+                                        {
+                                                if (LLAvatarNameCache::useDisplayNames() == 2)
+                                                {
+                                                        display_name = avatar_name.mDisplayName;
+                                                }
+                                                else
+                                                {
+                                                        display_name = avatar_name.getNames();
+                                                }
+                                        }
+                                }
+#endif
+
+                                if (mAvatars.count(avid) > 0)
+                                {
+                                        // Avatar already in list, update position
+                                        F32 dist = (F32)(position - mypos).magVec();
+                                        mAvatars[avid].setPosition(position, gAgent.getRegion()->pointInRegionGlobal(position), false, dist < 20.0, dist < 100.0);
+                                }
+                                else
+                                {
+                                        // Avatar not there yet, add it
+                                        LLAvatarListEntry entry(avid, name, position);
+                                        mAvatars[avid] = entry;
+                                }
+#ifdef LL_DISPLAY_NAMES
+                                // update avatar display name.
+                                mAvatars[avid].setDisplayName(display_name);
+#endif
+                        }
+                }
+        }
+
+//      llinfos << "radar refresh: done" << llendl;
+
+        expireAvatarList();
+        refreshAvatarList();
+        refreshTracker();
+}
+
+void LLFloaterAvatarList::expireAvatarList()
+{
+//      llinfos << "radar: expiring" << llendl;
+        std::map<LLUUID, LLAvatarListEntry>::iterator iter;
+        std::queue<LLUUID> delete_queue;
+
+        for (iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
+        {
+                LLAvatarListEntry *entry = &iter->second;
+                
+                if (!entry->getAlive() && entry->isDead())
+                {
+                        //llinfos << "radar: expiring avatar " << entry->getDisplayName() << llendl;
+                        LLUUID av_id = entry->getID();
+                        delete_queue.push(av_id);
+                        if (av_id == mTrackedAvatar)
+                        {
+                                stopTracker();
+                        }
+                }
+        }
+
+        while (!delete_queue.empty())
+        {
+                mAvatars.erase(delete_queue.front());
+                delete_queue.pop();
+        }
+}
+
+/**
+ * Redraws the avatar list
+ * Only does anything if the avatar list is visible.
+ * @author Dale Glass
+ */
+void LLFloaterAvatarList::refreshAvatarList() 
+{
+        // Don't update list when interface is hidden
+        if (!sInstance->getVisible()) return;
+
+        // We rebuild the list fully each time it's refreshed
+        // The assumption is that it's faster to refill it and sort than
+        // to rebuild the whole list.
+        LLDynamicArray<LLUUID> selected = mAvatarList->getSelectedIDs();
+        S32 scrollpos = mAvatarList->getScrollPos();
+
+        mAvatarList->deleteAllItems();
+
+        LLVector3d mypos = gAgent.getPositionGlobal();
+        LLVector3d posagent;
+        posagent.setVec(gAgent.getPositionAgent());
+        LLVector3d simpos = mypos - posagent;
+
+        std::map<LLUUID, LLAvatarListEntry>::iterator iter;
+        for (iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
+        {
+                LLSD element;
+                LLUUID av_id;
+
+                LLAvatarListEntry *entry = &iter->second;
+
+                // Skip if avatar hasn't been around
+                if (entry->isDead())
+                {
+                        continue;
+                }
+
+                av_id = entry->getID();
+
+                LLVector3d position = entry->getPosition();
+                BOOL UnknownAltitude = false;
+
+                LLVector3d delta = position - mypos;
+                F32 distance = (F32)delta.magVec();
+                if (position.mdV[VZ] == 0.0)
+                {
+                        UnknownAltitude = true;
+                        distance = 9000.0;
+                }
+                delta.mdV[2] = 0.0f;
+                F32 side_distance = (F32)delta.magVec();
+
+                // HACK: Workaround for an apparent bug:
+                // sometimes avatar entries get stuck, and are registered
+                // by the client as perpetually moving in the same direction.
+                // this makes sure they get removed from the visible list eventually
+
+                //jcool410 -- this fucks up seeing dueds thru minimap data > 1024m away, so, lets just say > 2048m to the side is bad
+                //aka 8 sims
+                if (side_distance > 2048.0f)
+                {
+                        continue;
+                }
+
+                if (av_id.isNull())
+                {
+                        //llwarns << "Avatar with null key somehow got into the list!" << llendl;
+                        continue;
+                }
+
+                element["id"] = av_id;
+
+                element["columns"][LIST_MARK]["column"] = "marked";
+                element["columns"][LIST_MARK]["type"] = "text";
+                if (entry->isMarked())
+                {
+                        element["columns"][LIST_MARK]["value"] = "X";
+                        element["columns"][LIST_MARK]["color"] = LLColor4::blue.getValue();
+                        element["columns"][LIST_MARK]["font-style"] = "BOLD";
+                }
+                else
+                {
+                        element["columns"][LIST_MARK]["value"] = "";
+                }
+
+                element["columns"][LIST_AVATAR_NAME]["column"] = "avatar_name";
+                element["columns"][LIST_AVATAR_NAME]["type"] = "text";
+                element["columns"][LIST_AVATAR_NAME]["value"] = entry->getDisplayName().c_str();
+                if (entry->getEntryAgeSeconds() > 1.0f)
+                {
+                        element["columns"][LIST_AVATAR_NAME]["font-style"] = "ITALIC";
+                }
+                else if (entry->isFocused())
+                {
+                        element["columns"][LIST_AVATAR_NAME]["font-style"] = "BOLD";
+                }
+                if (LLMuteList::getInstance()->isMuted(av_id))
+                {
+                        element["columns"][LIST_AVATAR_NAME]["color"] = LLColor4::red2.getValue();
+                }
+                else if (is_agent_friend(av_id))
+                {
+                        element["columns"][LIST_AVATAR_NAME]["color"] = LLColor4::green3.getValue();
+                }
+
+                char temp[32];
+                LLColor4 color = LLColor4::black;
+                element["columns"][LIST_DISTANCE]["column"] = "distance";
+                element["columns"][LIST_DISTANCE]["type"] = "text";
+                if (UnknownAltitude)
+                {
+                        strcpy(temp, "?");
+                        if (entry->isDrawn())
+                        {
+                                color = LLColor4::green2;
+                        }
+                }
+                else
+                {
+                        if (distance < 100.0)
+                        {
+                                snprintf(temp, sizeof(temp), "%.1f", distance);
+                                if (distance > 20.0f)
+                                {
+                                        color = LLColor4::yellow1;
+                                }
+                                else
+                                {
+                                        color = LLColor4::red;
+                                }
+                        }
+                        else
+                        {
+                                if (entry->isDrawn())
+                                {
+                                        color = LLColor4::green2;
+                                }
+                                snprintf(temp, sizeof(temp), "%d", (S32)distance);
+                        }
+                }
+                element["columns"][LIST_DISTANCE]["value"] = temp;
+                element["columns"][LIST_DISTANCE]["color"] = color.getValue();
+
+                position = position - simpos;
+
+                S32 x = (S32)position.mdV[VX];
+                S32 y = (S32)position.mdV[VY];
+                if (x >= 0 && x <= 256 && y >= 0 && y <= 256)
+                {
+                        snprintf(temp, sizeof(temp), "%d, %d", x, y);
+                }
+                else
+                {
+                        temp[0] = '\0';
+                        if (y < 0)
+                        {
+                                strcat(temp, "S");
+                        }
+                        else if (y > 256)
+                        {
+                                strcat(temp, "N");
+                        }
+                        if (x < 0)
+                        {
+                                strcat(temp, "W");
+                        }
+                        else if (x > 256)
+                        {
+                                strcat(temp, "E");
+                        }
+                }
+                element["columns"][LIST_POSITION]["column"] = "position";
+                element["columns"][LIST_POSITION]["type"] = "text";
+                element["columns"][LIST_POSITION]["value"] = temp;
+
+                element["columns"][LIST_ALTITUDE]["column"] = "altitude";
+                element["columns"][LIST_ALTITUDE]["type"] = "text";
+                if (UnknownAltitude)
+                {
+                        strcpy(temp, "?");
+                }
+                else
+                {
+                        snprintf(temp, sizeof(temp), "%d", (S32)position.mdV[VZ]);
+                }
+                element["columns"][LIST_ALTITUDE]["value"] = temp;
+
+                // Add to list
+                mAvatarList->addElement(element, ADD_BOTTOM);
+        }
+
+        // finish
+        mAvatarList->sortItems();
+        mAvatarList->selectMultiple(selected);
+        mAvatarList->setScrollPos(scrollpos);
+
+//      llinfos << "radar refresh: done" << llendl;
+
+}
+
+// static
+void LLFloaterAvatarList::onClickIM(void* userdata)
+{
+        //llinfos << "LLFloaterFriends::onClickIM()" << llendl;
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+
+        LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
+        if (ids.size() > 0)
+        {
+                if (ids.size() == 1)
+                {
+                        // Single avatar
+                        LLUUID agent_id = ids[0];
+
+                        char buffer[MAX_STRING];
+                        snprintf(buffer, MAX_STRING, "%s", self->mAvatars[agent_id].getName().c_str());
+                        gIMMgr->setFloaterOpen(TRUE);
+                        gIMMgr->addSession(buffer, IM_NOTHING_SPECIAL, agent_id);
+                }
+                else
+                {
+                        // Group IM
+                        LLUUID session_id;
+                        session_id.generate();
+                        gIMMgr->setFloaterOpen(TRUE);
+                        gIMMgr->addSession("Avatars Conference", IM_SESSION_CONFERENCE_START, ids[0], ids);
+                }
+        }
+}
+
+void LLFloaterAvatarList::onClickTeleportOffer(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+
+        LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
+        if (ids.size() > 0)
+        {
+                handle_lure(ids);
+        }
+}
+
+void LLFloaterAvatarList::onClickTrack(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        
+        LLScrollListItem *item =   self->mAvatarList->getFirstSelected();
+        if (!item) return;
+
+        LLUUID agent_id = item->getUUID();
+
+        if (self->mTracking && self->mTrackedAvatar == agent_id) {
+                self->stopTracker();
+        }
+        else
+        {
+                self->mTracking = TRUE;
+                self->mTrackedAvatar = agent_id;
+//              trackAvatar only works for friends allowing you to see them on map...
+//              LLTracker::trackAvatar(agent_id, self->mAvatars[agent_id].getDisplayName());
+                std::string name = self->mAvatars[agent_id].getDisplayName();
+                if (!self->mUpdate)
+                {
+                        name += "\n(last known position)";
+                }
+                LLTracker::trackLocation(self->mAvatars[agent_id].getPosition(), name, "");
+        }
+}
+
+void LLFloaterAvatarList::stopTracker()
+{
+        LLTracker::stopTracking(NULL);
+        mTracking = FALSE;
+}
+
+void LLFloaterAvatarList::refreshTracker()
+{
+        if (!mTracking) return;
+
+        if (LLTracker::isTracking(NULL))
+        {
+                LLVector3d pos;
+                if (mUpdate)
+                {
+                        pos = mAvatars[mTrackedAvatar].getPosition();
+                }
+                else
+                {
+                        LLViewerObject *obj = gObjectList.findObject(mTrackedAvatar);
+                        if (!obj)
+                        {
+                                stopTracker();
+                                return;
+                        }
+                        LLVOAvatar* avatarp = dynamic_cast<LLVOAvatar*>(obj);
+                        if (!avatarp)
+                        {
+                                stopTracker();
+                                return;
+                        }
+                        pos = gAgent.getPosGlobalFromAgent(avatarp->getCharacterPosition());
+                }
+                if (pos != LLTracker::getTrackedPositionGlobal())
+                {
+                        std::string name = mAvatars[mTrackedAvatar].getDisplayName();
+                        LLTracker::trackLocation(pos, name, "");
+                }
+        }
+        else
+        {
+                stopTracker();
+        }
+}
+
+LLAvatarListEntry * LLFloaterAvatarList::getAvatarEntry(LLUUID avatar)
+{
+        if (avatar.isNull())
+        {
+                return NULL;
+        }
+
+        std::map<LLUUID, LLAvatarListEntry>::iterator iter;
+
+        iter = mAvatars.find(avatar);
+        if (iter == mAvatars.end())
+        {
+                return NULL;
+        }
+
+        return &iter->second;   
+}
+
+//static
+void LLFloaterAvatarList::onClickMark(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
+
+        for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
+        {
+                LLUUID avid = *itr;
+                LLAvatarListEntry *entry = self->getAvatarEntry(avid);
+                if (entry != NULL)
+                {
+                        entry->toggleMark();
+                }
+        }
+}
+
+void LLFloaterAvatarList::onClickFocus(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        
+        LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+        if (item)
+        {
+                self->mFocusedAvatar = item->getUUID();
+                self->focusOnCurrent();
+        }
+}
+
+void LLFloaterAvatarList::removeFocusFromAll()
+{
+        std::map<LLUUID, LLAvatarListEntry>::iterator iter;
+
+        for (iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
+        {
+                LLAvatarListEntry *entry = &iter->second;
+                entry->setFocus(FALSE);
+        }
+}
+
+void LLFloaterAvatarList::focusOnCurrent()
+{
+        std::map<LLUUID, LLAvatarListEntry>::iterator iter;
+        LLAvatarListEntry *entry;
+
+        if (mAvatars.size() == 0)
+        {
+                return;
+        }
+
+        for (iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
+        {
+                entry = &iter->second;
+
+                if (entry->isDead())
+                        continue;
+
+                if (entry->getID() == mFocusedAvatar)
+                {
+                        removeFocusFromAll();
+                        entry->setFocus(TRUE);
+                        gAgent.lookAtObject(mFocusedAvatar, CAMERA_POSITION_OBJECT);
+                        return;
+                }
+        }
+}
+
+void LLFloaterAvatarList::focusOnPrev(BOOL marked_only)
+{
+        std::map<LLUUID, LLAvatarListEntry>::iterator iter;
+        LLAvatarListEntry *prev = NULL;
+        LLAvatarListEntry *entry;
+
+        if (mAvatars.size() == 0)
+        {
+                return;
+        }
+
+        for (iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
+        {
+                entry = &iter->second;
+
+                if (entry->isDead())
+                        continue;
+
+                if (prev != NULL && entry->getID() == mFocusedAvatar)
+                {
+                        break;
+                }
+
+                if ((!marked_only && entry->isDrawn()) || entry->isMarked())
+                {
+                        prev = entry;
+                }
+        }
+
+        if (prev != NULL)
+        {
+                removeFocusFromAll();
+                prev->setFocus(TRUE);
+                mFocusedAvatar = prev->getID();
+                gAgent.lookAtObject(mFocusedAvatar, CAMERA_POSITION_OBJECT);
+        }
+}
+
+void LLFloaterAvatarList::focusOnNext(BOOL marked_only)
+{
+        std::map<LLUUID, LLAvatarListEntry>::iterator iter;
+        BOOL found = FALSE;
+        LLAvatarListEntry *next = NULL;
+        LLAvatarListEntry *entry;
+
+        if (mAvatars.size() == 0)
+        {
+                return;
+        }
+
+        for (iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
+        {
+                entry = &iter->second;
+
+                if (entry->isDead())
+                        continue;
+
+                if (next == NULL && ((!marked_only && entry->isDrawn()) || entry->isMarked()))
+                {
+                        next = entry;
+                }
+
+                if (found && ((!marked_only && entry->isDrawn()) || entry->isMarked()))
+                {
+                        next = entry;
+                        break;
+                }
+
+                if (entry->getID() == mFocusedAvatar)
+                {
+                        found = TRUE;
+                } 
+        }
+
+        if (next != NULL)
+        {
+                removeFocusFromAll();
+                next->setFocus(TRUE);
+                mFocusedAvatar = next->getID();
+                gAgent.lookAtObject(mFocusedAvatar, CAMERA_POSITION_OBJECT);
+        }
+}
+
+//static
+void LLFloaterAvatarList::onClickPrevInList(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        self->focusOnPrev(FALSE);
+}
+
+//static
+void LLFloaterAvatarList::onClickNextInList(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        self->focusOnNext(FALSE);
+}
+
+//static
+void LLFloaterAvatarList::onClickPrevMarked(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        self->focusOnPrev(TRUE);
+}
+
+//static
+void LLFloaterAvatarList::onClickNextMarked(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        self->focusOnNext(TRUE);
+}
+
+//static
+void LLFloaterAvatarList::onClickGetKey(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+
+        if (NULL == item) return;
+
+        LLUUID agent_id = item->getUUID();
+
+        char buffer[UUID_STR_LENGTH];           /*Flawfinder: ignore*/
+        agent_id.toString(buffer);
+
+        gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
+}
+
+void LLFloaterAvatarList::onClickSendKeys(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        std::map<LLUUID, LLAvatarListEntry>::iterator iter;
+        LLAvatarListEntry *entry;
+
+        if (self->mAvatars.size() == 0)
+                return;
+
+        for (iter = self->mAvatars.begin(); iter != self->mAvatars.end(); iter++)
+        {
+                entry = &iter->second;
+
+                if (!entry->isDead() && entry->isInSim())
+                        announce(entry->getID().asString());
+        }
+}
+
+static void send_freeze(const LLUUID& avatar_id, bool freeze)
+{
+        U32 flags = 0x0;
+        if (!freeze)
+        {
+                // unfreeze
+                flags |= 0x1;
+        }
+
+        LLMessageSystem* msg = gMessageSystem;
+        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+
+        if (avatar)
+        {
+                msg->newMessage("FreezeUser");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID());
+                msg->addUUID("SessionID", gAgent.getSessionID());
+                msg->nextBlock("Data");
+                msg->addUUID("TargetID", avatar_id);
+                msg->addU32("Flags", flags);
+                msg->sendReliable( avatar->getRegion()->getHost());
+        }
+}
+
+static void send_eject(const LLUUID& avatar_id, bool ban)
+{       
+        LLMessageSystem* msg = gMessageSystem;
+        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+
+        if (avatar)
+        {
+                U32 flags = 0x0;
+                if (ban)
+                {
+                        // eject and add to ban list
+                        flags |= 0x1;
+                }
+
+                msg->newMessage("EjectUser");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID());
+                msg->addUUID("SessionID", gAgent.getSessionID());
+                msg->nextBlock("Data");
+                msg->addUUID("TargetID", avatar_id);
+                msg->addU32("Flags", flags);
+                msg->sendReliable( avatar->getRegion()->getHost());
+        }
+}
+
+static void send_estate_message(
+        const char* request,
+        const LLUUID &target)
+{
+
+        LLMessageSystem* msg = gMessageSystem;
+        LLUUID invoice;
+
+        // This seems to provide an ID so that the sim can say which request it's
+        // replying to. I think this can be ignored for now.
+        invoice.generate();
+
+        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);
+
+        // Agent id
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", gAgent.getID().asString().c_str());
+
+        // Target
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", target.asString().c_str());
+
+        msg->sendReliable(gAgent.getRegion()->getHost());
+}
+
+static void cmd_freeze(const LLUUID& avatar, const std::string &name)      { send_freeze(avatar, true); }
+static void cmd_unfreeze(const LLUUID& avatar, const std::string &name)    { send_freeze(avatar, false); }
+static void cmd_eject(const LLUUID& avatar, const std::string &name)       { send_eject(avatar, false); }
+static void cmd_ban(const LLUUID& avatar, const std::string &name)         { send_eject(avatar, true); }
+static void cmd_profile(const LLUUID& avatar, const std::string &name)     { LLFloaterAvatarInfo::showFromDirectory(avatar); }
+static void cmd_estate_eject(const LLUUID &avatar, const std::string &name){ send_estate_message("teleporthomeuser", avatar); }
+
+void LLFloaterAvatarList::doCommand(void (*func)(const LLUUID &avatar, const std::string &name))
+{
+        LLDynamicArray<LLUUID> ids = mAvatarList->getSelectedIDs();
+
+        for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
+        {
+                LLUUID avid = *itr;
+                LLAvatarListEntry *entry = getAvatarEntry(avid);
+                if (entry != NULL)
+                {
+                        llinfos << "Executing command on " << entry->getDisplayName() << llendl;
+                        func(avid, entry->getName());
+                }
+        }
+}
+
+std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator)
+{
+        std::string ret = "";
+        
+        LLDynamicArray<LLUUID> ids = mAvatarList->getSelectedIDs();
+        for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
+        {
+                LLUUID avid = *itr;
+                LLAvatarListEntry *entry = getAvatarEntry(avid);
+                if (entry != NULL)
+                {
+                        if (!ret.empty()) ret += separator;
+                        ret += entry->getName();
+                }
+        }
+
+        return ret;
+}
+
+std::string LLFloaterAvatarList::getSelectedName()
+{
+        LLUUID id = getSelectedID();
+        LLAvatarListEntry *entry = getAvatarEntry(id);
+        if (entry)
+        {
+                return entry->getName();
+        }
+        return "";
+}
+
+LLUUID LLFloaterAvatarList::getSelectedID()
+{
+        LLScrollListItem *item = mAvatarList->getFirstSelected();
+        if (item) return item->getUUID();
+        return LLUUID::null;
+}
+
+//static 
+void LLFloaterAvatarList::callbackFreeze(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+
+        LLFloaterAvatarList *self = LLFloaterAvatarList::sInstance;
+
+        if (option == 0)
+        {
+                self->doCommand(cmd_freeze);
+        }
+        else if (option == 1)
+        {
+                self->doCommand(cmd_unfreeze);
+        }
+}
+
+//static 
+void LLFloaterAvatarList::callbackEject(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+
+        LLFloaterAvatarList *self = LLFloaterAvatarList::sInstance;
+ 
+        if (option == 0)
+        {
+                self->doCommand(cmd_eject);
+        }
+        else if (option == 1)
+        {
+                self->doCommand(cmd_ban);
+        }
+}
+
+//static 
+void LLFloaterAvatarList::callbackEjectFromEstate(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+
+        LLFloaterAvatarList *self = LLFloaterAvatarList::sInstance;
+
+        if (option == 0)
+        {
+                self->doCommand(cmd_estate_eject);
+        }
+}
+
+//static
+void LLFloaterAvatarList::callbackIdle(void *userdata) {
+        if (LLFloaterAvatarList::sInstance != NULL)
+        {
+                // Do not update at every frame: this would be insane !
+                if (gFrameCount % LLFloaterAvatarList::sInstance->mUpdateRate == 0)
+                {
+                        LLFloaterAvatarList::sInstance->updateAvatarList();
+                }
+        }
+}
+
+void LLFloaterAvatarList::onClickFreeze(void *userdata)
+{
+        LLSD args;
+        LLSD payload;
+        args["AVATAR_NAME"] = ((LLFloaterAvatarList*)userdata)->getSelectedNames();
+        LLNotifications::instance().add("FreezeAvatarFullname", args, payload, callbackFreeze);
+}
+
+//static
+void LLFloaterAvatarList::onClickEject(void *userdata)
+{
+        LLSD args;
+        LLSD payload;
+        args["AVATAR_NAME"] = ((LLFloaterAvatarList*)userdata)->getSelectedNames();
+        LLNotifications::instance().add("EjectAvatarFullname", args, payload, callbackEject);
+}
+
+//static
+void LLFloaterAvatarList::onClickMute(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+
+        LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
+        if (ids.size() > 0)
+        {
+                for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
+                {
+                        LLUUID agent_id = *itr;
+                
+                        std::string agent_name;
+                        if (gCacheName->getFullName(agent_id, agent_name))
+                        {
+                                if (LLMuteList::getInstance()->isMuted(agent_id))
+                                {
+                                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                                        LLMuteList::getInstance()->remove(mute);        
+                                }
+                                else
+                                {
+                                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                                        LLMuteList::getInstance()->add(mute);
+                                }
+                        }
+                }
+        }
+}
+
+//static
+void LLFloaterAvatarList::onClickEjectFromEstate(void *userdata)
+{
+        LLSD args;
+        LLSD payload;
+        args["EVIL_USER"] = ((LLFloaterAvatarList*)userdata)->getSelectedNames();
+        LLNotifications::instance().add("EstateKickUser", args, payload, callbackEjectFromEstate);
+}
+
+//static
+void LLFloaterAvatarList::onClickAR(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+        if (item)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLAvatarListEntry *entry = self->getAvatarEntry(agent_id);
+                if (entry)
+                {
+                        LLFloaterReporter::showFromObject(entry->getID());
+                }
+        }
+}
+
+// static
+void LLFloaterAvatarList::onClickProfile(void* userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        self->doCommand(cmd_profile);
+}
+
+//static
+void LLFloaterAvatarList::onClickTeleport(void* userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+        if (item)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLAvatarListEntry *entry = self->getAvatarEntry(agent_id);
+                if (entry)
+                {
+//                      llinfos << "Trying to teleport to " << entry->getDisplayName() << " at " << entry->getPosition() << llendl;
+                        gAgent.teleportViaLocation(entry->getPosition());
+                }
+        }
+}
+
+void LLFloaterAvatarList::onSelectName(LLUICtrl*, void* userdata)
+{
+        LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
+
+        LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+        if (item)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLAvatarListEntry *entry = self->getAvatarEntry(agent_id);
+                if (entry)
+                {
+                        BOOL enabled = entry->isDrawn();
+                        self->childSetEnabled("focus_btn", enabled);
+                        self->childSetEnabled("prev_in_list_btn", enabled);
+                        self->childSetEnabled("next_in_list_btn", enabled);
+                }
+        }
+}
+
+void LLFloaterAvatarList::onCommitUpdateRate(LLUICtrl*, void* userdata)
+{
+        LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
+
+        self->mUpdateRate = gSavedSettings.getU32("RadarUpdateRate") * 3 + 3;
+}
diff --git a/linden/indra/newview/llfloateravatarlist.h b/linden/indra/newview/llfloateravatarlist.h
new file mode 100644
index 0000000..75a95a7
--- /dev/null
+++ b/linden/indra/newview/llfloateravatarlist.h
@@ -0,0 +1,316 @@
+//
+// C++ Interface: llfloateravatarlist
+//
+// Description: 
+//
+//
+// Original author: Dale Glass <dale@daleglass.net>, (C) 2007
+// Heavily modified by Henri Beauchamp 10/2009.
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+#include "llfloater.h"
+#include "llfloaterreporter.h"
+#include "lluuid.h"
+#include "lltimer.h"
+#include "llscrolllistctrl.h"
+
+#include <time.h>
+#include <map>
+#include <set>
+
+class LLFloaterAvatarList;
+
+/**
+ * @brief This class is used to hold data about avatars.
+ * We cache data about avatars to avoid repeating requests in this class.
+ * Instances are kept in a map<LLAvatarListEntry>. We keep track of the
+ * frame where the avatar was last seen.
+ */
+class LLAvatarListEntry {
+
+public:
+
+        /**
+         * @brief Initializes a list entry
+         * @param id Avatar's key
+         * @param name Avatar's name
+         * @param position Avatar's current position
+         */
+        LLAvatarListEntry(const LLUUID& id = LLUUID::null, const std::string &name = "", const LLVector3d &position = LLVector3d::zero);
+
+        /**
+         * Update world position.
+         * Affects age.
+         */     
+        void setPosition(LLVector3d position, bool this_sim, bool drawn, bool chatrange, bool shoutrange);
+
+        LLVector3d getPosition() { return mPosition; }
+
+        /**
+         * @brief Returns the age of this entry in frames
+         *
+         * This is only used for determining whether the avatar is still around.
+         * @see getEntryAgeSeconds
+         */
+        bool getAlive();
+
+        /**
+         * @brief Returns the age of this entry in seconds
+         */
+        F32 getEntryAgeSeconds();
+
+        /**
+         * @brief Returns the name of the avatar
+         */
+        std::string getName() { return mName; }
+
+        /**
+         * @brief Sets the display name of the avatar
+         */
+        void setDisplayName(std::string name) { mDisplayName = name; }
+
+        /**
+         * @brief Returns the display name of the avatar
+         */
+        std::string getDisplayName() { return mDisplayName; }
+
+        /**
+         * @brief Returns the ID of the avatar
+         */
+        LLUUID getID() { return mID; }
+
+        /**
+         * @brief Sets the 'focus' status on this entry (camera focused on this avatar)
+         */
+        void setFocus(BOOL value) { mFocused = value; }
+
+        BOOL isFocused() { return mFocused; }
+
+        BOOL isMarked() { return mMarked; }
+
+        BOOL isDrawn() { return (mInDrawFrame != U32_MAX); }
+
+        BOOL isInSim() { return (mInSimFrame != U32_MAX); }
+
+        /**
+         * @brief Returns whether the item is dead and shouldn't appear in the list
+         * @returns TRUE if dead
+         */
+        BOOL isDead();
+
+        void toggleMark() { mMarked = !mMarked; }
+
+private:
+        friend class LLFloaterAvatarList;
+
+        LLUUID mID;
+        std::string mName;
+        std::string mDisplayName;
+        LLVector3d mPosition;
+        LLVector3d mDrawPosition;
+        BOOL mMarked;
+        BOOL mFocused;
+
+        /**
+         * @brief Timer to keep track of whether avatars are still there
+         */
+        LLTimer mUpdateTimer;
+
+        /**
+         * @brief Last frame when this avatar was updated
+         */
+        U32 mFrame;
+        //last frame when this avatar was in sim
+        U32 mInSimFrame;
+        //last frame when this avatar was in draw
+        U32 mInDrawFrame;
+        //last frame when this avatar was in shout range
+        U32 mInShoutFrame;
+        //last frame when this avatar was in chat range
+        U32 mInChatFrame;
+};
+
+
+/**
+ * @brief Avatar List
+ * Implements an avatar scanner in the client.
+ *
+ * This is my first attempt to modify the SL source. This code is intended
+ * to have a dual purpose: doing the task, and providing an example of how
+ * to do it. For that reason, it's going to be commented as exhaustively
+ * as possible.
+ *
+ * Since I'm very new to C++ any suggestions on coding, style, etc are very
+ * welcome.
+ */
+class LLFloaterAvatarList : public LLFloater
+{
+        /**
+         * @brief Creates and initializes the LLFloaterAvatarList
+         * Here the interface is created, and callbacks are initialized.
+         */
+private:
+        LLFloaterAvatarList();
+public:
+        ~LLFloaterAvatarList();
+
+        /*virtual*/ void onClose(bool app_quitting);
+        /*virtual*/ void onOpen();
+        /*virtual*/ BOOL postBuild();
+        /*virtual*/ void draw();
+
+        /**
+         * @brief Toggles interface visibility
+         * There is only one instance of the avatar scanner at any time.
+         */
+        static void toggle(void*);
+
+        static void showInstance();
+
+        /**
+         * @brief Updates the internal avatar list with the currently present avatars.
+         */
+        void updateAvatarList();
+
+        /**
+         * @brief Refresh avatar list (display)
+         */
+        void refreshAvatarList();
+
+        /**
+         * @brief Returns the entry for an avatar, if preset
+         * @returns Pointer to avatar entry, NULL if not found.
+         */
+        LLAvatarListEntry* getAvatarEntry(LLUUID avatar);
+
+        /**
+         * @brief Returns a string with the selected names in the list
+         */
+        std::string getSelectedNames(const std::string& separator = ", ");
+        std::string getSelectedName();
+        LLUUID getSelectedID();
+
+private:
+        static LLFloaterAvatarList* sInstance;
+
+public:
+        static LLFloaterAvatarList* getInstance() { return sInstance; }
+private:
+        // when a line editor loses keyboard focus, it is committed.
+        // commit callbacks are named onCommitWidgetName by convention.
+        //void onCommitBaz(LLUICtrl* ctrl, void *userdata);
+        
+        enum AVATARS_COLUMN_ORDER
+        {
+                LIST_MARK,
+                LIST_AVATAR_NAME,
+                LIST_DISTANCE,
+                LIST_POSITION,
+                LIST_ALTITUDE
+        };
+
+        typedef void (*avlist_command_t)(const LLUUID &avatar, const std::string &name);
+
+        /**
+         * @brief Removes focus status from all avatars in list
+         */
+        void removeFocusFromAll();
+
+        /**
+         * @brief Focus camera on current avatar
+         */
+        void focusOnCurrent();
+
+        /**
+         * @brief Focus camera on previous avatar
+         * @param marked_only Whether to choose only marked avatars
+         */
+        void focusOnPrev(BOOL marked_only);
+
+        /**
+         * @brief Focus camera on next avatar
+         * @param marked_only Whether to choose only marked avatars
+         */
+        void focusOnNext(BOOL marked_only);
+
+        /**
+         * @brief Handler for the "refresh" button click.
+         * I am unsure whether this is actually necessary at the time.
+         *
+         * LL: By convention, button callbacks are named onClickButtonLabel
+         * @param userdata Pointer to user data (LLFloaterAvatarList instance)
+         */
+
+        static void onClickProfile(void *userdata);
+        static void onClickIM(void *userdata);
+        static void onClickTeleportOffer(void *userdata);
+        static void onClickTrack(void *userdata);
+        static void onClickMark(void *userdata);
+        static void onClickFocus(void *userdata);
+
+        static void onClickPrevInList(void *userdata);
+        static void onClickNextInList(void *userdata);
+        static void onClickPrevMarked(void *userdata);
+        static void onClickNextMarked(void *userdata);
+        static void onClickGetKey(void *userdata);
+
+        static void onClickFreeze(void *userdata);
+        static void onClickEject(void *userdata);
+        static void onClickMute(void *userdata);
+        static void onClickAR(void *userdata);
+        static void onClickTeleport(void *userdata);
+        static void onClickEjectFromEstate(void *userdata);
+
+        static void callbackFreeze(const LLSD& notification, const LLSD& response);
+        static void callbackEject(const LLSD& notification, const LLSD& response);
+        static void callbackAR(void *userdata);
+        static void callbackEjectFromEstate(const LLSD& notification, const LLSD& response);
+
+        static void onSelectName(LLUICtrl*, void *userdata);
+
+        static void onCommitUpdateRate(LLUICtrl*, void *userdata);
+        static void onClickSendKeys(void *userdata);
+
+        static void callbackIdle(void *userdata);
+
+        void doCommand(avlist_command_t cmd);
+
+        /**
+         * @brief Cleanup avatar list, removing dead entries from it.
+         * This lets dead entries remain for some time. This makes it possible
+         * to keep people passing by in the list long enough that it's possible
+         * to do something to them.
+         */
+        void expireAvatarList();
+
+private:
+        /**
+         * @brief Pointer to the avatar scroll list
+         */
+        LLScrollListCtrl*                       mAvatarList;
+        std::map<LLUUID, LLAvatarListEntry>     mAvatars;
+
+        /**
+         * @brief TRUE when Updating
+         */
+        BOOL mUpdate;
+
+        /**
+         * @brief Update rate (if min frames per update)
+         */
+        U32 mUpdateRate;
+        
+        void stopTracker();
+        void refreshTracker();
+
+        // tracking data
+        BOOL mTracking;                 // Tracking ?
+        LLUUID mTrackedAvatar;  // Who we are tracking
+
+        /**
+         * @brief Avatar the camera is focused on
+         */
+        LLUUID mFocusedAvatar;
+};
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index a28123e..4de7918 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -49,6 +49,7 @@
 #include "message.h"
 
 // project include
+#include "hippogridmanager.h"
 #include "llagent.h"
 #include "llbutton.h"
 #include "llcheckboxctrl.h"
@@ -475,7 +476,7 @@ BOOL checkStringInText(const std::string &text_line, std::string textToMatch)
 
 BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line)
 {
-        if (checkStringInText(text_line, gSavedSettings.getString("FirstName")))
+        if (checkStringInText(text_line, gHippoGridManager->getConnectedGrid()->getFirstName()))
                 return TRUE;
 
         for (int i=1; i<=3; i++)
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 7c8ddf1..23a9b81 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -466,9 +466,14 @@ void LLFloaterDirectory::setVisible(BOOL visible)
 
 void LLFloaterDirectory::onClose(bool app_quitting)
 {
-        LLFloater::onClose(app_quitting);
-
-        //setVisible(FALSE); //meaning you hide 3 web browsers - one SLPlugin each
+        if (gSavedSettings.getBOOL("SaveSearchResults"))
+        {
+                setVisible(FALSE); //meaning you hide 3 web browsers - one SLPlugin each
+        }
+        else
+        {
+                LLFloater::onClose(app_quitting);
+        }
 }
 
 // static
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index 51c7835..e22b8f6 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -161,10 +161,44 @@ void LLFloaterInspect::onClickOwnerProfile(void* ctrl)
         }
 }
 
+void LLFloaterInspect::onClickLastOwnerProfile(void* ctrl)
+{
+        if(sInstance->mObjectList->getAllSelected().size() == 0) return;
+        LLScrollListItem* first_selected =
+                sInstance->mObjectList->getFirstSelected();
+
+        if (first_selected)
+        {
+                LLUUID selected_id = first_selected->getUUID();
+                struct f : public LLSelectedNodeFunctor
+                {
+                        LLUUID obj_id;
+                        f(const LLUUID& id) : obj_id(id) {}
+                        virtual bool apply(LLSelectNode* node)
+                        {
+                                return (obj_id == node->getObject()->getID());
+                        }
+                } func(selected_id);
+                LLSelectNode* node = sInstance->mObjectSelection->getFirstNode(&func);
+                if(node)
+                {
+                        const LLUUID& last_owner_id = node->mPermissions->getLastOwner();
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                        if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                        {
+                                LLFloaterAvatarInfo::showFromDirectory(last_owner_id);
+                        }
+// [/RLVa:KB]
+//                      LLFloaterAvatarInfo::showFromDirectory(owner_id);
+                }
+        }
+}
+
 BOOL LLFloaterInspect::postBuild()
 {
         mObjectList = getChild<LLScrollListCtrl>("object_list");
         childSetAction("button owner",onClickOwnerProfile, this);
+        childSetAction("button_last_owner",onClickLastOwnerProfile, this);
         childSetAction("button creator",onClickCreatorProfile, this);
         childSetCommitCallback("object_list", onSelectObject);
         return TRUE;
@@ -175,8 +209,10 @@ void LLFloaterInspect::onSelectObject(LLUICtrl* ctrl, void* user_data)
         if(LLFloaterInspect::getSelectedUUID() != LLUUID::null)
         {
                 //sInstance->childSetEnabled("button owner", true);
+                //sInstance->childSetEnabled("button_last_owner", true);
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-1.0.0e
                 sInstance->childSetEnabled("button owner", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+                sInstance->childSetEnabled("button_last_owner", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
 // [/RLVa:KB]
                 sInstance->childSetEnabled("button creator", true);
         }
@@ -205,6 +241,7 @@ void LLFloaterInspect::refresh()
         std::string creator_name;
         S32 pos = mObjectList->getScrollPos();
         childSetEnabled("button owner", false);
+        childSetEnabled("button_last_owner", false);
         childSetEnabled("button creator", false);
         LLUUID selected_uuid;
         S32 selected_index = mObjectList->getFirstSelectedIndex();
@@ -226,7 +263,7 @@ void LLFloaterInspect::refresh()
                 LLSelectNode* obj = *iter;
                 LLSD row;
                 char time[MAX_STRING];
-                std::string owner_name, creator_name;
+                std::string owner_name, creator_name, last_owner_name;
 
                 if (obj->mCreationDate == 0)
                 {       // Don't have valid information from the server, so skip this one
@@ -245,12 +282,13 @@ void LLFloaterInspect::refresh()
                 }
 // [/RLVa:KB]
                 gCacheName->getFullName(obj->mPermissions->getCreator(), creator_name);
+                gCacheName->getFullName(obj->mPermissions->getLastOwner(), last_owner_name);
                 row["id"] = obj->getObject()->getID();
                 row["columns"][0]["column"] = "object_name";
                 row["columns"][0]["type"] = "text";
                 // make sure we're either at the top of the link chain
                 // or top of the editable chain, for attachments
-                if(!(obj->getObject()->isRoot() || obj->getObject()->isRootEdit()))
+                if (!(obj->getObject()->isRoot() || obj->getObject()->isRootEdit()))
                 {
                         row["columns"][0]["value"] = std::string("   ") + obj->mName;
                 }
@@ -258,18 +296,56 @@ void LLFloaterInspect::refresh()
                 {
                         row["columns"][0]["value"] = obj->mName;
                 }
-                row["columns"][1]["column"] = "owner_name";
-                row["columns"][1]["type"] = "text";
-                row["columns"][1]["value"] = owner_name;
-                row["columns"][2]["column"] = "creator_name";
-                row["columns"][2]["type"] = "text";
-                row["columns"][2]["value"] = creator_name;
-                row["columns"][3]["column"] = "creation_date";
-                row["columns"][3]["type"] = "text";
-                row["columns"][3]["value"] = time;
+                S32 i = 1;
+                row["columns"][i]["column"] = "owner_name";
+                row["columns"][i]["type"] = "text";
+                row["columns"][i]["value"] = owner_name;
+                ++i;
+                row["columns"][i]["column"] = "last_owner_name";
+                row["columns"][i]["type"] = "text";
+                row["columns"][i]["value"] = last_owner_name;
+                ++i;
+                row["columns"][i]["column"] = "creator_name";
+                row["columns"][i]["type"] = "text";
+                row["columns"][i]["value"] = creator_name;
+                ++i;
+                row["columns"][i]["column"] = "face_num";
+                row["columns"][i]["type"] = "text";
+                row["columns"][i]["value"] = llformat("%d", obj->getObject()->getNumFaces());
+                ++i;
+                row["columns"][i]["column"] = "vertex_num";
+                row["columns"][i]["type"] = "text";
+                row["columns"][i]["value"] = llformat("%d", obj->getObject()->getNumVertices());
+                ++i;
+                // inventory silliness
+                S32 scripts = 0;
+                S32 total_inv = 0;
+                std::map<LLUUID, std::pair<S32, S32> >::iterator itr = mInventoryNums.find(obj->getObject()->getID());
+                if (itr != mInventoryNums.end())
+                {
+                        scripts = itr->second.first;
+                        total_inv = itr->second.second;
+                }
+                else if (std::find(mQueue.begin(), mQueue.end(), obj->getObject()->getID()) == mQueue.end())
+                {
+                        mQueue.push_back(obj->getObject()->getID());
+                        registerVOInventoryListener(obj->getObject(), NULL);
+                        requestVOInventory();
+                }
+                row["columns"][i]["column"] = "script_num";
+                row["columns"][i]["type"] = "text";
+                row["columns"][i]["value"] = llformat("%d", scripts);
+                ++i;
+                row["columns"][i]["column"] = "inv_num";
+                row["columns"][i]["type"] = "text";
+                row["columns"][i]["value"] = llformat("%d", total_inv);
+                ++i;
+                row["columns"][i]["column"] = "creation_date";
+                row["columns"][i]["type"] = "text";
+                row["columns"][i]["value"] = time;
                 mObjectList->addElement(row, ADD_TOP);
         }
-        if(selected_index > -1 && mObjectList->getItemIndex(selected_uuid) == selected_index)
+        if (selected_index > -1 && mObjectList->getItemIndex(selected_uuid) == selected_index)
         {
                 mObjectList->selectNthItem(selected_index);
         }
@@ -281,6 +357,36 @@ void LLFloaterInspect::refresh()
         mObjectList->setScrollPos(pos);
 }
 
+void LLFloaterInspect::inventoryChanged(LLViewerObject* viewer_object,
+                                                                                         InventoryObjectList* inv,
+                                                                                         S32,
+                                                                                         void* q_id)
+{
+        if (viewer_object && inv && !mQueue.empty())
+        {
+                std::vector<LLUUID>::iterator vIt = std::find(mQueue.begin(), mQueue.end(), viewer_object->getID());
+                if (vIt != mQueue.end() )
+                {
+                        S32 scripts = 0;
+                        S32 inv_size = (inv->empty()) ? 0 : inv->size();
+
+                        InventoryObjectList::const_iterator it = inv->begin();
+                        InventoryObjectList::const_iterator end = inv->end();
+                        for ( ; it != end; ++it)
+                        {
+                                if ((*it)->getType() == LLAssetType::AT_LSL_TEXT)
+                                {
+                                        scripts++;
+                                }
+                        }
+                        
+                        mInventoryNums[viewer_object->getID()] = std::make_pair(scripts, inv_size);
+                        mQueue.erase(vIt);
+                        mDirty = TRUE;
+                }
+        }
+}
+
 void LLFloaterInspect::onFocusReceived()
 {
         LLToolMgr::getInstance()->setTransientTool(LLToolCompInspect::getInstance());
@@ -291,6 +397,8 @@ void LLFloaterInspect::dirty()
 {
         if(sInstance)
         {
+                sInstance->mInventoryNums.clear();
+                sInstance->mQueue.clear();
                 sInstance->setDirty();
         }
 }
diff --git a/linden/indra/newview/llfloaterinspect.h b/linden/indra/newview/llfloaterinspect.h
index 57bba68..ae443f9 100644
--- a/linden/indra/newview/llfloaterinspect.h
+++ b/linden/indra/newview/llfloaterinspect.h
@@ -36,13 +36,14 @@
 #define LL_LLFLOATERINSPECT_H
 
 #include "llfloater.h"
+#include "llvoinventorylistener.h"
 
 //class LLTool;
 class LLObjectSelection;
 class LLScrollListCtrl;
 class LLUICtrl;
 
-class LLFloaterInspect : public LLFloater
+class LLFloaterInspect : public LLFloater, public LLVOInventoryListener
 {
 public:
         virtual ~LLFloaterInspect(void);
@@ -56,6 +57,7 @@ public:
         virtual void onFocusReceived();
         static void onClickCreatorProfile(void* ctrl);
         static void onClickOwnerProfile(void* ctrl);
+        static void onClickLastOwnerProfile(void* ctrl);
         static void onSelectObject(LLUICtrl* ctrl, void* user_data);
         LLScrollListCtrl* mObjectList;
 protected:
@@ -63,12 +65,18 @@ protected:
         LLFloaterInspect();
         void setDirty() { mDirty = TRUE; }
         bool mDirty;
+        /*virtual*/ void inventoryChanged(LLViewerObject* obj,
+                                                                 InventoryObjectList* inv,
+                                                                 S32 serial_num,
+                                                                 void* queue);
 
 private:
         // static data
         static LLFloaterInspect* sInstance;
 
         LLSafeHandle<LLObjectSelection> mObjectSelection;
+        std::map<LLUUID, std::pair<S32, S32> > mInventoryNums; //<scripts, total>
+        std::vector<LLUUID> mQueue;
 };
 
 #endif //LL_LLFLOATERINSPECT_H
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index c99d75d..52192b8 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -402,6 +402,8 @@ BOOL LLFloaterPreference::postBuild()
 
         mOKBtn = getChild<LLButton>("OK");
         mOKBtn->setClickedCallback(onBtnOK, this);
+
+        childSetAction("reset_btn", onClickResetPrefs, this);
                         
         mPreferenceCore = new LLPreferenceCore(
                 getChild<LLTabContainer>("pref core"),
diff --git a/linden/indra/newview/llfloatersettingsdebug.cpp b/linden/indra/newview/llfloatersettingsdebug.cpp
index 0aa0607..9e4a04c 100644
--- a/linden/indra/newview/llfloatersettingsdebug.cpp
+++ b/linden/indra/newview/llfloatersettingsdebug.cpp
@@ -36,6 +36,8 @@
 #include "lluictrlfactory.h"
 #include "llfirstuse.h"
 #include "llcombobox.h"
+#include "lllineeditor.h"
+#include "llscrolllistctrl.h"
 #include "llspinctrl.h"
 #include "llcolorswatch.h"
 #include "llviewercontrol.h"
@@ -58,7 +60,8 @@ LLFloaterSettingsDebug::~LLFloaterSettingsDebug()
 
 BOOL LLFloaterSettingsDebug::postBuild()
 {
-        LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
+        mSettingsNames.clear();
+        mComboNames = getChild<LLComboBox>("settings_combo");
 
         struct f : public LLControlGroup::ApplyFunctor
         {
@@ -71,16 +74,16 @@ BOOL LLFloaterSettingsDebug::postBuild()
                                 combo->add(name, (void*)control);
                         }
                 }
-        } func(settings_combo);
+        } func(mComboNames);
 
         gSavedSettings.applyToAll(&func);
         gSavedPerAccountSettings.applyToAll(&func);
         gColors.applyToAll(&func);
 
-        settings_combo->sortByName();
-        settings_combo->setCommitCallback(onSettingSelect);
-        settings_combo->setCallbackUserData(this);
-        settings_combo->updateSelection();
+        mComboNames->sortByName();
+        mComboNames->setCommitCallback(onSettingSelect);
+        mComboNames->setCallbackUserData(this);
+        //mComboNames->updateSelection();
 
         childSetCommitCallback("val_spinner_1", onCommitSettings);
         childSetUserData("val_spinner_1", this);
@@ -98,14 +101,23 @@ BOOL LLFloaterSettingsDebug::postBuild()
         childSetUserData("color_swatch", this);
         childSetAction("default_btn", onClickDefault, this);
         mComment = getChild<LLTextEditor>("comment_text");
+
+        getChild<LLSearchEditor>("control_search")->setSearchCallback(onSearchEdit, this);
+        
+        // There really are many better ways to do this, but laziness... she is powerful... -- MC
+        mComboNames->getAllData(mSettingsNames);
+        getChild<LLSearchEditor>("control_search")->setEnabled(!(mSettingsNames.empty()));
+
         return TRUE;
 }
 
 void LLFloaterSettingsDebug::draw()
 {
-        LLComboBox* settings_combo = getChild<LLComboBox>("settings_combo");
-        LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
-        updateControl(controlp);
+        if (mComboNames)
+        {
+                LLControlVariable* controlp = (LLControlVariable*)mComboNames->getCurrentUserdata();
+                updateControl(controlp);
+        }
 
         LLFloater::draw();
 }
@@ -134,11 +146,46 @@ void LLFloaterSettingsDebug::onSettingSelect(LLUICtrl* ctrl, void* user_data)
 }
 
 //static
+void LLFloaterSettingsDebug::onSearchEdit(const std::string& search_string, void* user_data)
+{
+        if (search_string.empty())
+        {
+                return;
+        }
+
+        LLFloaterSettingsDebug* self = (LLFloaterSettingsDebug*)user_data;
+        if (!self || !self->mComboNames)
+        {
+                return;
+        }
+
+        std::string search_text = search_string;
+        LLStringUtil::trim(search_text);
+        LLStringUtil::toUpper(search_text);
+
+        std::string settings_name("");
+        size_t found;
+        for (std::vector<LLScrollListItem*>::iterator vIt = self->mSettingsNames.begin();
+                 vIt != self->mSettingsNames.end(); ++vIt)
+        {
+                settings_name = (*vIt)->getValue().asString();
+                LLStringUtil::toUpper(settings_name);
+                found = settings_name.find(search_text);
+                if (found != std::string::npos)
+                {
+                        // search and update combo on partial matches
+                        self->mComboNames->selectByValue((*vIt)->getValue());
+                        break;
+                }
+        }
+}
+
+//static
 void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
 {
         LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
 
-        LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
+        LLComboBox* settings_combo = floaterp->mComboNames;
         LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
 
         LLVector3 vector;
@@ -212,7 +259,7 @@ void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
 void LLFloaterSettingsDebug::onClickDefault(void* user_data)
 {
         LLFloaterSettingsDebug* floaterp = (LLFloaterSettingsDebug*)user_data;
-        LLComboBox* settings_combo = floaterp->getChild<LLComboBox>("settings_combo");
+        LLComboBox* settings_combo = floaterp->mComboNames;
         LLControlVariable* controlp = (LLControlVariable*)settings_combo->getCurrentUserdata();
 
         if (controlp)
diff --git a/linden/indra/newview/llfloatersettingsdebug.h b/linden/indra/newview/llfloatersettingsdebug.h
index e08e6b5..3e14eaa 100644
--- a/linden/indra/newview/llfloatersettingsdebug.h
+++ b/linden/indra/newview/llfloatersettingsdebug.h
@@ -37,6 +37,9 @@
 #include "llfloater.h"
 #include "lltexteditor.h"
 
+class LLComboBox;
+class LLScrollListItem;
+
 class LLFloaterSettingsDebug : public LLFloater
 {
 public:
@@ -56,6 +59,12 @@ public:
 protected:
         static LLFloaterSettingsDebug* sInstance;
         LLTextEditor* mComment;
+
+private:
+        LLComboBox* mComboNames;
+        std::vector<LLScrollListItem*> mSettingsNames;
+
+        static void onSearchEdit(const std::string& search_string, void* user_data);
 };
 
 #endif //LLFLOATERDEBUGSETTINGS_H
diff --git a/linden/indra/newview/llhudtext.cpp b/linden/indra/newview/llhudtext.cpp
index 7c0c469..457249f 100644
--- a/linden/indra/newview/llhudtext.cpp
+++ b/linden/indra/newview/llhudtext.cpp
@@ -723,6 +723,21 @@ void LLHUDText::setDoFade(const BOOL do_fade)
         mDoFade = do_fade;
 }
 
+std::string LLHUDText::getStringUTF8()
+{
+        std::string out("");
+        int t = mTextSegments.size();
+        int i = 0;
+        for (std::vector<LLHUDTextSegment>::iterator segment_iter = mTextSegments.begin();
+                 segment_iter != mTextSegments.end(); ++segment_iter )
+        {
+                out.append(wstring_to_utf8str((*segment_iter).getText()));
+                i++;
+                if(i < t) out.append("\n");
+        }
+        return out;
+}
+
 void LLHUDText::updateVisibility()
 {
         if (mSourceObject)
diff --git a/linden/indra/newview/llhudtext.h b/linden/indra/newview/llhudtext.h
index 297e4d5..fbe984f 100644
--- a/linden/indra/newview/llhudtext.h
+++ b/linden/indra/newview/llhudtext.h
@@ -103,6 +103,7 @@ public:
         void setZCompare(const BOOL zcompare);
         void setDoFade(const BOOL do_fade);
         void setVisibleOffScreen(BOOL visible) { mVisibleOffScreen = visible; }
+        std::string getStringUTF8();
         
         // mMaxLines of -1 means unlimited lines.
         void setMaxLines(S32 max_lines) { mMaxLines = max_lines; }
diff --git a/linden/indra/newview/llloginhandler.cpp b/linden/indra/newview/llloginhandler.cpp
index c35ba04..988ef2f 100644
--- a/linden/indra/newview/llloginhandler.cpp
+++ b/linden/indra/newview/llloginhandler.cpp
@@ -131,23 +131,29 @@ bool LLLoginHandler::handle(const LLSD& tokens,
 
                 if (password.substr(0,3) != "$1$")
                 {
-                        LLMD5 pass((unsigned char*)password.c_str());
-                        char md5pass[33];               /* Flawfinder: ignore */
-                        pass.hex_digest(md5pass);
-                        std::string hashed_password = ll_safe_string(md5pass, 32);
-                        LLStartUp::savePasswordToDisk(hashed_password);
+                        // grids we try in order: loginhandler "grid", LastConnectedGrid, grid manager
+                        // icky that we do this here and in LLStartUp
+                        std::string grid_nick = query_map["grid"].asString();
+                        if (grid_nick.empty()) grid_nick = gSavedSettings.getString("LastConnectedGrid");
+                        if (grid_nick.empty()) grid_nick = gHippoGridManager->getCurrentGridNick();
+                        HippoGridInfo* grid = gHippoGridManager->getGrid(grid_nick);
+                        if (grid) grid->setPassword(password);
                 }
         }
                         
 
         if (LLStartUp::getStartupState() < STATE_LOGIN_CLEANUP)  //on splash page
         {
-                // if we ever support saving names based on grid, we'll have to support saving usernames too -- MC
                 LLPanelLogin::loadLoginForm();
 
                 if (!mFirstName.empty() || !mLastName.empty())
                 {
-                        // Fill in the name, and maybe the password
+                        // Fill in the name, and the password if we can
+                        if (password.empty())
+                        {
+                                password = gHippoGridManager->getCurrentGrid()->getPassword();
+                        }
+
                         if (gHippoGridManager && gHippoGridManager->getCurrentGrid()->isUsernameCompat())
                         {
                                 if (mLastName == "resident" || mLastName == "Resident")
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 7502c10..6a3a0bd 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1951,9 +1951,9 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                 self->mPanelSecondLife->childSetValue("acct", caption_text);
 
                 //Chalice - Show avatar age in days.
-                int year;
-                int month;
-                int day;
+                S32 year;
+                S32 month;
+                S32 day;
                 sscanf(born_on.c_str(), "%d/%d/%d", &month, &day, &year);
                 time_t now = time(NULL);
                 struct tm * timeinfo;
@@ -1962,8 +1962,11 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                 timeinfo->tm_year = year - 1900;
                 timeinfo->tm_mday = day;
                 time_t birth = mktime(timeinfo);
+
                 std::stringstream numberString;
-                numberString << (S32)(difftime(now, birth) / 86400); //(60*60*24)
+                S32 days = difftime(now, birth) / 86400; //(60*60*24)
+                if (days < 0) days = 0; // Happens for people on different timezones -- MC
+                numberString << days; 
 
                 LLStringUtil::format_map_t targs;
                 targs["[DAYS]"] = numberString.str();
@@ -1984,15 +1987,38 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                 {
                         image_ctrl->setImageAssetID(image_id);
                 }
-                self->childSetValue("about", about_text);
+                LLTextEditor* about_field = self->mPanelSecondLife->getChild<LLTextEditor>("about");
+                if (about_field)
+                {
+                        if (self->mAllowEdit && (self->mAvatarID == agent_id))
+                        {
+                                about_field->setText(about_text);
+                        }
+                        else
+                        {
+                                about_field->setParseHTML(TRUE);
+                                about_field->appendColoredText(about_text, false, false, gColors.getColor("TextFgReadOnlyColor"));
+                        }
+                }
 
                 self->mPanelSecondLife->setPartnerID(partner_id);
                 self->mPanelSecondLife->updatePartnerName();
 
                 if (self->mPanelFirstLife)
                 {
-                        // Teens don't get these
-                        self->mPanelFirstLife->childSetValue("about", fl_about_text);
+                        about_field = self->mPanelFirstLife->getChild<LLTextEditor>("about");
+                        if (about_field)
+                        {
+                                if (self->mAllowEdit && (self->mAvatarID == agent_id))
+                                {
+                                }
+                                else
+                                {
+                                        about_field->setParseHTML(TRUE);
+                                        about_field->appendColoredText(fl_about_text, false, false, gColors.getColor("TextFgReadOnlyColor"));
+                                }
+                        }
+
                         LLTextureCtrl*  image_ctrl = self->mPanelFirstLife->getChild<LLTextureCtrl>("img");
                         if(image_ctrl)
                         {
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 99b6cf6..b2504dc 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -660,7 +660,15 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
 
                 // Update UI controls
         self->mNameEditor->setText(name);
-        self->mDescEditor->setText(desc);
+                if (self->mCreatorID == gAgent.getID())
+                {
+                        self->mDescEditor->setText(desc);
+                }
+                else
+                {
+                        self->mDescEditor->setParseHTML(TRUE);
+                        self->mDescEditor->appendColoredText(desc, false, false, gColors.getColor("TextFgReadOnlyColor"));
+                }
         self->mSnapshotCtrl->setImageAssetID(snapshot_id);
         self->mLocationEditor->setText(location_text);
                 self->mLocationChanged = false;
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 489d527..46f8979 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -270,7 +270,7 @@ void LLPanelDirFind::navigateToDefaultPage()
 {
         std::string start_url = "";
         // Note: we use the web panel in OpenSim as well as Second Life -- MC
-        if (gHippoGridManager->getConnectedGrid()->getSearchUrl().empty() && 
+        if (gHippoGridManager->getConnectedGrid()->getSearchURL().empty() && 
                 !gHippoGridManager->getConnectedGrid()->isSecondLife())
         {
                 // OS-based but doesn't have its own web search url -- MC
@@ -293,7 +293,7 @@ void LLPanelDirFind::navigateToDefaultPage()
                 else
                 {
                         // OS-based but has its own web search url -- MC
-                        start_url = gHippoGridManager->getConnectedGrid()->getSearchUrl();
+                        start_url = gHippoGridManager->getConnectedGrid()->getSearchURL();
                 }
 
                 BOOL inc_pg = childGetValue("incpg").asBoolean();
@@ -323,7 +323,7 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
         std::string url;
         if (search_text.empty()) 
         {
-                url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_EMPTY, is_web);
+                url = gHippoGridManager->getConnectedGrid()->getSearchURL(HippoGridInfo::SEARCH_ALL_EMPTY, is_web);
         } 
         else 
         {
@@ -348,7 +348,7 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
                         "-._~$+!*'()";
                 std::string query = LLURI::escape(search_text_with_plus, allowed);
 
-                url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_QUERY, is_web);
+                url = gHippoGridManager->getConnectedGrid()->getSearchURL(HippoGridInfo::SEARCH_ALL_QUERY, is_web);
                 std::string substring = "[QUERY]";
                 std::string::size_type where = url.find(substring);
                 if (where != std::string::npos)
@@ -373,13 +373,13 @@ std::string LLPanelDirFind::buildSearchURL(const std::string& search_text, const
 // static
 std::string LLPanelDirFind::getSearchURLSuffix(bool inc_pg, bool inc_mature, bool inc_adult, bool is_web)
 {
-        std::string url = gHippoGridManager->getConnectedGrid()->getSearchUrl(HippoGridInfo::SEARCH_ALL_TEMPLATE, is_web);
+        std::string url = gHippoGridManager->getConnectedGrid()->getSearchURL(HippoGridInfo::SEARCH_ALL_TEMPLATE, is_web);
 
         if (!url.empty())
         {
                 // Note: opensim's default template (SearchURLSuffixOpenSim) is currently empty -- MC
                 if (gHippoGridManager->getConnectedGrid()->isSecondLife() || 
-                        !gHippoGridManager->getConnectedGrid()->getSearchUrl().empty())
+                        !gHippoGridManager->getConnectedGrid()->getSearchURL().empty())
                 {
                         // if the mature checkbox is unchecked, modify query to remove 
                         // terms with given phrase from the result set
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 7ff25a7..8e61c60 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -56,6 +56,7 @@
 #include "lltextbox.h"
 #include "lltexteditor.h"
 #include "lltexturectrl.h"
+#include "llviewercontrol.h"
 #include "llviewerwindow.h"
 
 // consts
@@ -813,7 +814,15 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 
         if (mEditCharter)
         {
-                mEditCharter->setText(gdatap->mCharter);
+                if (mAllowEdit && can_change_ident)
+                {
+                        mEditCharter->setText(gdatap->mCharter);
+                }
+                else
+                {
+                        mEditCharter->setParseHTML(TRUE);
+                        mEditCharter->appendColoredText(gdatap->mCharter, false, false, gColors.getColor("TextFgReadOnlyColor"));
+                }
                 mEditCharter->resetDirty();
         }
         
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index cb61647..39df8b6 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -91,6 +91,7 @@
 
 const S32 BLACK_BORDER_HEIGHT = 160;
 const S32 MAX_PASSWORD = 16;
+const std::string PASSWORD_FILLER = "123456789!123456";
 
 LLPanelLogin *LLPanelLogin::sInstance = NULL;
 BOOL LLPanelLogin::sCapslockDidNotification = FALSE;
@@ -174,7 +175,8 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         mLogoImage(),
         mCallback(callback),
         mCallbackData(cb_data),
-        mHtmlAvailable( TRUE )
+        mHtmlAvailable( TRUE ),
+        mActualPassword("")
 {
         setFocusRoot(TRUE);
 
@@ -200,7 +202,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         mLogoImage = LLUI::getUIImage("startup_logo.j2c");
 
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_login.xml");
-        
+
 #if USE_VIEWER_AUTH
         //leave room for the login menu bar
         setRect(LLRect(0, rect.getHeight()-18, rect.getWidth(), 0)); 
@@ -212,7 +214,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         childSetPrevalidate("last_name_edit", LLLineEditor::prevalidatePrintableNoSpace);
         childSetPrevalidate("username_edit", LLLineEditor::prevalidatePrintableSpace);
 
-        childSetCommitCallback("password_edit", mungePassword);
+        childSetCommitCallback("password_edit", onPasswordChanged, this);
         childSetKeystrokeCallback("password_edit", onPassKey, this);
         childSetUserData("password_edit", this);
 
@@ -364,22 +366,6 @@ void LLPanelLogin::setSiteIsAlive( bool alive )
         }
 }
 
-void LLPanelLogin::mungePassword(LLUICtrl* caller, void* user_data)
-{
-        LLPanelLogin* self = (LLPanelLogin*)user_data;
-        LLLineEditor* editor = (LLLineEditor*)caller;
-        std::string password = editor->getText();
-
-        // Re-md5 if we've changed at all
-        if (password != self->mIncomingPassword)
-        {
-                LLMD5 pass((unsigned char *)password.c_str());
-                char munged_password[MD5HEX_STR_SIZE];
-                pass.hex_digest(munged_password);
-                self->mMungedPassword = munged_password;
-        }
-}
-
 LLPanelLogin::~LLPanelLogin()
 {
         LLPanelLogin::sInstance = NULL;
@@ -598,6 +584,8 @@ void LLPanelLogin::setFields(const std::string& firstname,
 // static
 void LLPanelLogin::setPassword(const std::string& password)
 {
+        // we check for sInstance before getting here
+
         // Max "actual" password length is 16 characters.
         // Hex digests are always 32 characters.
         if (password.length() == 32)
@@ -606,21 +594,16 @@ void LLPanelLogin::setPassword(const std::string& password)
                 // We don't actually use the password input field, 
                 // fill it with MAX_PASSWORD characters so we get a 
                 // nice row of asterixes.
-                const std::string filler("123456789!123456");
-                sInstance->childSetText("password_edit", filler);
-                sInstance->mIncomingPassword = filler;
-                sInstance->mMungedPassword = password;
+                sInstance->childSetText("password_edit", PASSWORD_FILLER);
         }
         else
         {
                 // this is a normal text password
                 sInstance->childSetText("password_edit", password);
-                sInstance->mIncomingPassword = password;
-                LLMD5 pass((unsigned char *)password.c_str());
-                char munged_password[MD5HEX_STR_SIZE];
-                pass.hex_digest(munged_password);
-                sInstance->mMungedPassword = munged_password;
         }
+
+        // munging happens in the grid manager now
+        sInstance->mActualPassword = password;
 }
 
 
@@ -716,7 +699,8 @@ void LLPanelLogin::getFields(std::string *firstname,
                 LLStringUtil::trim(*lastname);
         }
 
-        *password = sInstance->mMungedPassword;
+        // sent to us from LLStartUp. Saved only on an actual connect
+        *password = sInstance->mActualPassword;
 }
 
 // static
@@ -844,9 +828,9 @@ void LLPanelLogin::refreshLoginPage()
     if (!sInstance) return;
 
     sInstance->childSetVisible("create_new_account_text",
-        !gHippoGridManager->getCurrentGrid()->getRegisterUrl().empty());
+        !gHippoGridManager->getCurrentGrid()->getRegisterURL().empty());
     sInstance->childSetVisible("forgot_password_text",
-        !gHippoGridManager->getCurrentGrid()->getPasswordUrl().empty());
+        !gHippoGridManager->getCurrentGrid()->getPasswordURL().empty());
 
     // kick off a request to grab the url manually
         gResponsePtr = LLIamHereLogin::build(sInstance);
@@ -868,44 +852,47 @@ void LLPanelLogin::loadLoginForm()
         if (!sInstance) return;
         
         // toggle between username/first+last login based on grid -- MC
-        LLTextBox* firstnamet = sInstance->getChild<LLTextBox>("first_name_text");
-        LLTextBox* lastnamet = sInstance->getChild<LLTextBox>("last_name_text");
-        LLTextBox* usernamet = sInstance->getChild<LLTextBox>("username_text");
+        LLTextBox* firstname_t = sInstance->getChild<LLTextBox>("first_name_text");
+        LLTextBox* lastname_t = sInstance->getChild<LLTextBox>("last_name_text");
+        LLTextBox* username_t = sInstance->getChild<LLTextBox>("username_text");
 
-        LLLineEditor* firstnamel = sInstance->getChild<LLLineEditor>("first_name_edit");
-        LLLineEditor* lastnamel = sInstance->getChild<LLLineEditor>("last_name_edit");
-        LLLineEditor* usernamel = sInstance->getChild<LLLineEditor>("username_edit");
+        LLLineEditor* firstname_l = sInstance->getChild<LLLineEditor>("first_name_edit");
+        LLLineEditor* lastname_l = sInstance->getChild<LLLineEditor>("last_name_edit");
+        LLLineEditor* username_l = sInstance->getChild<LLLineEditor>("username_edit");
 
-        firstnamet->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
-        lastnamet->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
-        usernamet->setVisible(gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        firstname_t->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        lastname_t->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        username_t->setVisible(gHippoGridManager->getCurrentGrid()->isUsernameCompat());
 
-        firstnamel->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
-        lastnamel->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
-        usernamel->setVisible(gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        firstname_l->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        lastname_l->setVisible(!gHippoGridManager->getCurrentGrid()->isUsernameCompat());
+        username_l->setVisible(gHippoGridManager->getCurrentGrid()->isUsernameCompat());
 
-        // these should really REALLY be stored in the grid info -- MC
-        std::string firstnames = gSavedSettings.getString("FirstName");
-        std::string lastnames = gSavedSettings.getString("LastName");
-        if (!firstnames.empty() && !lastnames.empty())
+        // get name info if we've got it
+        std::string firstname_s = gHippoGridManager->getCurrentGrid()->getFirstName();
+        std::string lastname_s = gHippoGridManager->getCurrentGrid()->getLastName();
+        if (gHippoGridManager->getCurrentGrid()->isUsernameCompat())
         {
-                if (gHippoGridManager->getCurrentGrid()->isUsernameCompat())
+                if (lastname_s == "resident" || lastname_s == "Resident")
                 {
-                        if (lastnames == "resident" || lastnames == "Resident")
-                        {
-                                usernamel->setText(firstnames);
-                        }
-                        else
-                        {
-                                usernamel->setText(firstnames+"."+lastnames);
-                        }
+                        username_l->setText(firstname_s);
+                }
+                else if (!firstname_s.empty() && !lastname_s.empty())
+                {
+                        username_l->setText(firstname_s+"."+lastname_s);
                 }
                 else
                 {
-                        firstnamel->setText(firstnames);
-                        lastnamel->setText(lastnames);
+                        username_l->clear();
                 }
         }
+        else
+        {
+                firstname_l->setText(firstname_s);
+                lastname_l->setText(lastname_s);
+        }
+
+        setPassword(gHippoGridManager->getCurrentGrid()->getPassword());
 }
 
 
@@ -1223,16 +1210,33 @@ bool LLPanelLogin::newAccountAlertCallback(const LLSD& notification, const LLSD&
 // static
 void LLPanelLogin::onClickNewAccount(void*)
 {
-        const std::string &url = gHippoGridManager->getConnectedGrid()->getRegisterUrl();
-        if (!url.empty()) {
+        const std::string &url = gHippoGridManager->getConnectedGrid()->getRegisterURL();
+        if (!url.empty()) 
+        {
                 llinfos << "Going to account creation URL." << llendl;
                 LLWeb::loadURLExternal(url);
-        } else {
+        } 
+        else 
+        {
                 llinfos << "Account creation URL is empty." << llendl;
                 sInstance->setFocus(TRUE);
         }
 }
 
+// static
+void LLPanelLogin::onPasswordChanged(LLUICtrl* caller, void* user_data)
+{
+        LLPanelLogin* self = (LLPanelLogin*)user_data;
+        LLLineEditor* editor = (LLLineEditor*)caller;
+        std::string password = editor->getText();
+
+        // update if we've changed at all
+        // is there a good way to let users know we can't let them use PASSWORD_FILLER?
+        if (password != self->mActualPassword && password != PASSWORD_FILLER)
+        {
+                self->mActualPassword = password;
+        }
+}
 
 // *NOTE: This function is dead as of 2008 August.  I left it here in case
 // we suddenly decide to put the Quit button back. JC
@@ -1261,10 +1265,13 @@ void LLPanelLogin::onClickForgotPassword(void*)
 {
         if (sInstance )
         {
-                const std::string &url = gHippoGridManager->getConnectedGrid()->getPasswordUrl();
-                if (!url.empty()) {
+                const std::string &url = gHippoGridManager->getConnectedGrid()->getPasswordURL();
+                if (!url.empty()) 
+                {
                         LLWeb::loadURLExternal(url);
-                } else {
+                } 
+                else 
+                {
                         llwarns << "Link for 'forgotton password' not set." << llendl;
                 }
         }
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index d077f32..4d79750 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -83,7 +83,6 @@ public:
         static void refreshLoginPage();
         static void giveFocus();
         static void setAlwaysRefresh(bool refresh); 
-        static void mungePassword(LLUICtrl* caller, void* user_data);
         
         // inherited from LLViewerMediaObserver
         /*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event);
@@ -95,6 +94,7 @@ private:
         static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response);
         static void onClickQuit(void*);
         static void onClickVersion(void*);
+        static void onPasswordChanged(LLUICtrl* caller, void* user_data);
         static void onClickForgotPassword(void*);
         static void onPassKey(LLLineEditor* caller, void* user_data);
         static void onSelectServer(LLUICtrl*, void*);
@@ -117,8 +117,7 @@ private:
         void                    (*mCallback)(S32 option, void *userdata);
         void*                   mCallbackData;
 
-        std::string mIncomingPassword;
-        std::string mMungedPassword;
+        std::string mActualPassword;
 
         static LLPanelLogin* sInstance;
         static BOOL             sCapslockDidNotification;
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index ebe1d53..8dc6601 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -34,14 +34,18 @@
 
 //file include
 #include "llpanelnetwork.h"
+#include "llstartup.h"
 
 // project includes
 #include "llcheckboxctrl.h"
+#include "llradiogroup.h"
 #include "lldirpicker.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 #include "llviewerwindow.h"
 
+bool LLPanelNetwork::sSocksSettingsChanged;
+
 LLPanelNetwork::LLPanelNetwork()
 {
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_network.xml");
@@ -72,6 +76,31 @@ BOOL LLPanelNetwork::postBuild()
         childSetEnabled("xmlrpc_proxy_editor", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
         childSetEnabled("xmlrpc_proxy_port", gSavedSettings.getBOOL("XMLRPCProxyEnabled"));
 
+        // Socks 5 proxy settings, commit callbacks
+        childSetCommitCallback("socks5_proxy_enabled", onCommitSocks5ProxyEnabled, this);
+        childSetCommitCallback("socks5_auth", onSocksAuthChanged, this);
+
+        //Socks 5 proxy settings, saved data
+        childSetValue("socks5_proxy_enabled",   gSavedSettings.getBOOL("Socks5ProxyEnabled"));
+        childSetValue("socks5_http_proxy_type", gSavedSettings.getString("Socks5HttpProxyType"));
+
+        childSetValue("socks5_proxy_host",     gSavedSettings.getString("Socks5ProxyHost"));
+        childSetValue("socks5_proxy_port",     (F32)gSavedSettings.getU32("Socks5ProxyPort"));
+        childSetValue("socks5_proxy_username", gSavedSettings.getString("Socks5Username"));
+        childSetValue("socks5_proxy_password", gSavedSettings.getString("Socks5Password"));
+        childSetValue("socks5_auth", gSavedSettings.getString("Socks5AuthType"));
+
+        // Socks 5 proxy settings, check if settings modified callbacks
+        childSetCommitCallback("socks5_proxy_host", onSocksSettingsModified,this);
+        childSetCommitCallback("socks5_proxy_port", onSocksSettingsModified,this);
+        childSetCommitCallback("socks5_proxy_username", onSocksSettingsModified,this);
+        childSetCommitCallback("socks5_proxy_password", onSocksSettingsModified,this);
+        
+        // Socks 5 settings, Set all controls and labels enabled state
+        updateProxyEnabled(this, gSavedSettings.getBOOL("Socks5ProxyEnabled"), gSavedSettings.getString("Socks5AuthType"));
+
+        sSocksSettingsChanged = false;
+
         return TRUE;
 }
 
@@ -91,6 +120,28 @@ void LLPanelNetwork::apply()
         gSavedSettings.setBOOL("XMLRPCProxyEnabled", childGetValue("xmlrpc_proxy_enabled"));
         gSavedSettings.setString("XMLRPCProxyAddress", childGetValue("xmlrpc_proxy_editor"));
         gSavedSettings.setS32("XMLRPCProxyPort", childGetValue("xmlrpc_proxy_port"));
+
+        gSavedSettings.setBOOL("Socks5ProxyEnabled", childGetValue("socks5_proxy_enabled"));            
+        gSavedSettings.setString("Socks5HttpProxyType", childGetValue("socks5_http_proxy_type"));
+        gSavedSettings.setString("Socks5ProxyHost", childGetValue("socks5_proxy_host"));
+        gSavedSettings.setU32("Socks5ProxyPort", childGetValue("socks5_proxy_port").asInteger());
+
+        gSavedSettings.setString("Socks5AuthType", childGetValue("socks5_auth"));
+        gSavedSettings.setString("Socks5Username", childGetValue("socks5_proxy_username"));
+        gSavedSettings.setString("Socks5Password", childGetValue("socks5_proxy_password"));
+
+        if (sSocksSettingsChanged)
+        {
+                if (LLStartUp::getStartupState() != STATE_LOGIN_WAIT)
+                {
+                        LLNotifications::instance().add("ProxyNeedRestart");
+                }
+                else
+                {
+                        // Mark the socks class that it needs to update its connection
+                        LLSocks::getInstance()->updated();
+                }
+        }
 }
 
 void LLPanelNetwork::cancel()
@@ -167,4 +218,85 @@ void LLPanelNetwork::onCommitXMLRPCProxyEnabled(LLUICtrl* ctrl, void* data)
         self->childSetEnabled("xmlrpc_proxy_editor", check->get());
         self->childSetEnabled("xmlrpc_proxy_port", check->get());
         self->childSetEnabled("xmlrpc_proxy_text_label", check->get());
+
+        self->childSetEnabled("socks5_proxy_enabled", !check->get());
+}
+
+// static
+void LLPanelNetwork::onCommitSocks5ProxyEnabled(LLUICtrl* ctrl, void* data)
+{
+        LLPanelNetwork* self  = (LLPanelNetwork*)data;
+        LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
+
+        if (!self || !check) return;
+
+        sSocksSettingsChanged = true;
+        
+        updateProxyEnabled(self, check->get(), self->childGetValue("socks5_auth"));
+}
+
+// static
+void LLPanelNetwork::onSocksSettingsModified(LLUICtrl* ctrl, void* data)
+{
+        sSocksSettingsChanged = true;
+}
+
+// static
+void LLPanelNetwork::onSocksAuthChanged(LLUICtrl* ctrl, void* data)
+{
+        LLRadioGroup* radio  = static_cast<LLRadioGroup*>(ctrl);
+        LLPanelNetwork* self = static_cast<LLPanelNetwork*>(data);
+
+        sSocksSettingsChanged = true;
+
+        std::string selection = radio->getValue().asString();
+        updateProxyEnabled(self, true, selection);
+}
+
+// static
+void LLPanelNetwork::updateProxyEnabled(LLPanelNetwork * self, bool enabled, std::string authtype)
+{
+        // Manage all the enable/disable of the socks5 options from this single function
+        // to avoid code duplication
+
+        // Update all socks labels and controls except auth specific ones
+        self->childSetEnabled("socks5_proxy_port",      enabled);
+        self->childSetEnabled("socks5_proxy_host",      enabled);
+        self->childSetEnabled("socks5_host_label",      enabled);
+        self->childSetEnabled("socks5_proxy_label",     enabled);
+        self->childSetEnabled("socks5_proxy_port",      enabled);
+        self->childSetEnabled("socks5_auth_label",      enabled);
+        self->childSetEnabled("socks5_auth",            enabled);
+
+        // disable the web option if the web proxy has not been configured
+        // this is still not ideal as apply or ok is needed for this to be saved to the preferences
+        self->childSetEnabled("Web", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+
+        self->childSetEnabled("Socks", enabled);
+
+        // Hide the auth specific labels if authtype is none or
+        // we are not enabled.
+        if ((authtype.compare("None") == 0) || (enabled == false))
+        {
+                self->childSetEnabled("socks5_username_label", false);
+                self->childSetEnabled("socks5_password_label", false);
+                self->childSetEnabled("socks5_proxy_username", false);
+                self->childSetEnabled("socks5_proxy_password", false);
+        }
+
+        // Only show the username and password boxes if we are enabled
+        // and authtype is username password.
+        if ((authtype.compare("UserPass") == 0) && (enabled == true))
+        {
+                self->childSetEnabled("socks5_username_label", true);
+                self->childSetEnabled("socks5_password_label", true);
+                self->childSetEnabled("socks5_proxy_username", true);
+                self->childSetEnabled("socks5_proxy_password", true);
+        }
+
+        // Disable the XMLRPC proxy if it's enabled and we enable SOCKS5
+        self->childSetEnabled("xmlrpc_proxy_enabled", !enabled);
+        self->childSetEnabled("xmlrpc_proxy_editor", !enabled);
+        self->childSetEnabled("xmlrpc_proxy_port", !enabled);
+        self->childSetEnabled("xmlrpc_proxy_text_label", !enabled);
 }
diff --git a/linden/indra/newview/llpanelnetwork.h b/linden/indra/newview/llpanelnetwork.h
index 900158a..628f713 100644
--- a/linden/indra/newview/llpanelnetwork.h
+++ b/linden/indra/newview/llpanelnetwork.h
@@ -52,6 +52,14 @@ private:
         static void onClickResetCache(void*);
         static void onCommitPort(LLUICtrl* ctrl, void*);
         static void onCommitXMLRPCProxyEnabled(LLUICtrl* ctrl, void* data);
+        static void onCommitSocks5ProxyEnabled(LLUICtrl* ctrl, void* data);
+        static void onClickTestProxy(void* user_data);
+        static void onSocksSettingsModified(LLUICtrl* ctrl, void* data);
+        static void onSocksAuthChanged(LLUICtrl* ctrl, void* data);
+        static void updateProxyEnabled(LLPanelNetwork * self, bool enabled, std::string authtype);
+        
+        static bool sSocksSettingsChanged;
+
 };
 
 #endif
diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index 3417b17..bf5d7f4 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -360,7 +360,15 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
 
                 // Update UI controls
         self->mNameEditor->setText(std::string(name));
-        self->mDescEditor->setText(std::string(desc));
+                if (self->mCreatorID == gAgent.getID())
+                {
+                        self->mDescEditor->setText(std::string(desc));
+                }
+                else
+                {
+                        self->mDescEditor->setParseHTML(TRUE);
+                        self->mDescEditor->appendColoredText(std::string(desc), false, false, gColors.getColor("TextFgReadOnlyColor"));
+                }
         self->mSnapshotCtrl->setImageAssetID(snapshot_id);
         self->mLocationEditor->setText(location_text);
         self->mEnabledCheck->set(enabled);
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 89dc0b2..f1b2428 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -42,8 +42,9 @@
 #include "lggautocorrectfloater.h"
 #include "llcombobox.h"
 #include "llcolorswatch.h"
-
+#include "llstartup.h"
 #include "lluictrlfactory.h"
+#include "lltexturectrl.h"
 
 #include "boost/algorithm/string.hpp"
 
@@ -82,12 +83,16 @@ BOOL LLPrefsAdvanced::postBuild()
 {
         childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
         childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens"));
+
         static BOOL* sShowClientNameTag = rebind_llcontrol<BOOL>("ShowClientNameTag", &gSavedSettings, true);
         childSetValue("client_name_tag_check", (*sShowClientNameTag));
         static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);
         childSetValue("client_name_color_check", (*sShowClientColor));
         childSetValue("client_name_hover_check", gSavedSettings.getBOOL("ShowClientNameHoverTip"));
         childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
+        getChild<LLColorSwatchCtrl>("client_tag_color")->set(gSavedSettings.getColor4("ImprudenceTagColor"));
+        mClientTagColor = gSavedSettings.getColor4("ImprudenceTagColor");
+
         childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
         childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
         childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
@@ -112,9 +117,12 @@ BOOL LLPrefsAdvanced::postBuild()
         getChild<LLButton>("EmSpell_Remove")->setClickedCallback(onSpellRemove, this);
 
         getChild<LLButton>("ac_button")->setClickedCallback(onAutoCorrectButton,this);
-
         initHelpBtn("EmeraldHelp_SpellCheck",           "EmeraldHelp_SpellCheck");
 
+        getChild<LLButton>("reset_cloud_this_account")->setClickedCallback(onResetThisCloudButton,this);
+        getChild<LLButton>("save_cloud_this_account")->setClickedCallback(onSaveThisCloudButton,this);
+        getChild<LLButton>("save_cloud_any_account")->setClickedCallback(onSaveAnyoneCloudButton,this);
+
         refresh();
 
         return TRUE;
@@ -127,6 +135,9 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check"));
         gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_name_color_check"));
         gSavedSettings.setBOOL("ShowClientNameHoverTip", childGetValue("client_name_hover_check"));
+        gSavedSettings.setColor4("ImprudenceTagColor", getChild<LLColorSwatchCtrl>("client_tag_color")->get());
+        mClientTagColor = getChild<LLColorSwatchCtrl>("client_tag_color")->get();
+
         gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check"));
         gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
         gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
@@ -137,6 +148,8 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setU32("LightShareAllowed",
                               (U32)childGetValue("lightshare_combo").asInteger());
 
+
+
         // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
         if (gSavedSettings.getBOOL("ShowMyClientTagToOthers") != (BOOL)childGetValue("client_name_tag_broadcast_check"))
         {
@@ -201,10 +214,20 @@ void LLPrefsAdvanced::apply()
 
         LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
         gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex());
+        
+        if (LLStartUp::isLoggedIn() && LLVOAvatar::sHasCloud)
+        {
+                onSaveThisCloudButton(NULL);
+        }
 }
 
 void LLPrefsAdvanced::cancel()
 {
+        gSavedSettings.setColor4("ImprudenceTagColor", mClientTagColor);
+//      llwarns << "cancel" << llendl;
+//      cool - "ok" is also cancel
+//      LLVOAvatar::sCloud.mPartData.mStartColor = mCloudStartColor;
+//      LLVOAvatar::sCloud.mPartData.mEndColor = mCloudEndColor;
 }
 
 void LLPrefsAdvanced::refresh()
@@ -264,6 +287,76 @@ void LLPrefsAdvanced::refresh()
                 }
                 comboBox->selectByValue(selected);
         }
+
+
+        bool is_logged_in = LLStartUp::isLoggedIn();
+        setParticleControls(is_logged_in);
+
+}
+
+void LLPrefsAdvanced::draw()
+{
+
+        bool is_logged_in = LLStartUp::isLoggedIn();
+        if(LLVOAvatar::sHasCloud && mWasLoggedIn != is_logged_in)
+        {
+
+
+                setParticleControls(is_logged_in);
+
+                mCloudStartColor = LLVOAvatar::sCloud.mPartData.mStartColor;
+                mCloudEndColor = LLVOAvatar::sCloud.mPartData.mEndColor;
+
+
+                getChild<LLColorSwatchCtrl>("part_start_color_swatch")->set(mCloudStartColor);
+                getChild<LLColorSwatchCtrl>("part_end_color_swatch")->set(mCloudEndColor);
+
+
+                mCloudTextureID = LLVOAvatar::sCloud.mPartImageID;
+                LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("part_texture_picker");
+                if (texture_ctrl)
+                {
+                        texture_ctrl->setImageAssetID(mCloudTextureID);
+                        texture_ctrl->setAllowNoTexture( true );
+
+                        // Don't allow (no copy) or (no transfer) textures to be selected.
+                        // With that we are less permissive than the original LL code of
+                        // LLWaterParamManager, which allows picking (and saving) plain texture uuids
+                        // without any permission check.
+                        // If real absurdity is necessary we let the user save a windlight water setting
+                        // for the texture uuid.
+
+                        texture_ctrl->setImmediateFilterPermMask(PERM_NONE);//PERM_COPY | PERM_TRANSFER);
+                        texture_ctrl->setNonImmediateFilterPermMask(PERM_NONE);
+                }
+
+
+                mWasLoggedIn = is_logged_in;
+        }
+
+        if(LLVOAvatar::sHasCloud && is_logged_in)
+        {
+
+                LLVOAvatar::sCloud.mPartData.mStartColor = childGetValue("part_start_color_swatch");
+                LLVOAvatar::sCloud.mPartData.mEndColor = childGetValue("part_end_color_swatch");
+                LLVOAvatar::sCloud.mPartImageID  = childGetValue("part_texture_picker");
+        }
+
+        LLPanel::draw();
+}
+
+void LLPrefsAdvanced::setParticleControls(bool is_logged_in)
+{
+        childSetEnabled("reset_cloud_this_account", is_logged_in );
+        childSetEnabled("save_cloud_this_account", is_logged_in);
+        childSetEnabled("save_cloud_any_account", is_logged_in);
+        childSetEnabled("part_start_color_swatch", is_logged_in);
+        childSetEnabled("part_end_color_swatch", is_logged_in);
+        childSetEnabled("part_texture_picker", is_logged_in );
+
+        childSetEnabled("preview_cloud", is_logged_in);
+        childSetVisible("preview_cloud", is_logged_in);
+        childSetVisible("must_be_logged_in_textbox", !is_logged_in);
 }
 
 //static
@@ -330,3 +423,35 @@ void LLPrefsAdvanced::onClickCommandLine(void* data)
         FloaterCommandLine::getInstance()->open();
         FloaterCommandLine::getInstance()->center();
 }
+
+void LLPrefsAdvanced::onResetThisCloudButton(void * data)
+{
+        LLPrefsAdvanced* self = (LLPrefsAdvanced*)data;
+        if (!self)
+        {
+                return;
+        }
+
+        // keep draw() from overriding the cloud with the values from the UI
+        LLVOAvatar::sHasCloud = false; 
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
+        LLVOAvatar::loadCloud(filename, LLVOAvatar::sCloud);
+
+        // tell draw() to override values from the UI with the data from the new cloud
+        self-> mWasLoggedIn = !(LLStartUp::isLoggedIn());
+
+        LLVOAvatar::sHasCloud = true;
+}
+
+void LLPrefsAdvanced::onSaveThisCloudButton(void * data)
+{
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "cloud.xml");
+        LLVOAvatar::saveCloud(filename, LLVOAvatar::sCloud);
+}
+
+void LLPrefsAdvanced::onSaveAnyoneCloudButton(void * data)
+{
+        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
+        LLVOAvatar::saveCloud(filename, LLVOAvatar::sCloud);
+}
+
diff --git a/linden/indra/newview/llprefsadvanced.h b/linden/indra/newview/llprefsadvanced.h
index d76e602..e4febcc 100644
--- a/linden/indra/newview/llprefsadvanced.h
+++ b/linden/indra/newview/llprefsadvanced.h
@@ -33,6 +33,7 @@
 
 #include "llpanel.h"
 #include "llviewerinventory.h"
+class LLColor4;
 
 class LLPrefsAdvanced : public LLPanel
 {
@@ -45,7 +46,7 @@ public:
         void apply();
         void cancel();
         void refresh();
-
+        void draw();
 private:
         static LLPrefsAdvanced* sInstance;
 
@@ -58,10 +59,22 @@ private:
         static void onSpellEditCustom(void* data);
         static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);  
         static void onAutoCorrectButton(void * data);
+        static void onResetThisCloudButton(void * data);
+        static void onSaveThisCloudButton(void * data);
+        static void onSaveAnyoneCloudButton(void * data);
+
+        LLColor4 mClientTagColor;
 
 protected:
+        void setParticleControls(bool is_logged_in);
         void initHelpBtn(const std::string& name, const std::string& xml_alert);
         static void onClickHelp(void* data);
+
+private:
+        bool mWasLoggedIn;
+        LLColor4 mCloudStartColor;
+        LLColor4 mCloudEndColor;
+        LLUUID mCloudTextureID;
 };
 
 #endif // LLPREFSADVANCED_H
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 5ac2bb2..33d9701 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -179,12 +179,12 @@ void LLPrefsIMImpl::apply()
                 if (gSavedSettings.getBOOL("UseLegacyChatLogsFolder"))
                 {
                         gDirUtilp->setPerAccountChatLogsDir(LLStringUtil::null, 
-                                gSavedSettings.getString("FirstName"), gSavedSettings.getString("LastName") );
+                                gHippoGridManager->getCurrentGrid()->getFirstName(), gHippoGridManager->getCurrentGrid()->getLastName() );
                 }
                 else
                 {
                         gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(), 
-                                gSavedSettings.getString("FirstName"), gSavedSettings.getString("LastName") );
+                                gHippoGridManager->getCurrentGrid()->getFirstName(), gHippoGridManager->getCurrentGrid()->getLastName() );
                 }
                 LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
         }
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 73aa9ba..66849b1 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -76,12 +76,12 @@
 #include "llstring.h"
 #include "lluserrelations.h"
 #include "llvfs.h"
-#include "llxorcipher.h"        // saved password, MAC address
 #include "message.h"
 #include "v3math.h"
 
 #include "llagent.h"
 #include "llagentpilot.h"
+#include "llfloateravatarlist.h"
 #include "llfloateravatarpicker.h"
 #include "llcallbacklist.h"
 #include "llcallingcard.h"
@@ -189,6 +189,7 @@
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
 #include "llagentlanguage.h"
+#include "llsocks5.h"
 #include "viewerversion.h"
 
 #include "lgghunspell_wrapper.h"
@@ -260,7 +261,6 @@ bool LLStartUp::sLoginFailed = false;
 
 void login_show();
 void login_callback(S32 option, void* userdata);
-bool is_hex_string(U8* str, S32 len);
 void show_first_run_dialog();
 bool first_run_dialog_callback(const LLSD& notification, const LLSD& response);
 void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);
@@ -635,6 +635,15 @@ bool idle_startup()
                 LL_INFOS("AppInit") << "Message System Initialized." << LL_ENDL;
                 
                 //-------------------------------------------------
+                // Init the socks 5 proxy and open the control TCP 
+                // connection if the user is using SOCKS5
+                // We need to do this early incase the user is using
+                // socks for http so we get the login screen via socks
+                //-------------------------------------------------
+
+                LLStartUp::handleSocksProxy(false);
+
+                //-------------------------------------------------
                 // Init audio, which may be needed for prefs dialog
                 // or audio cues in connection UI.
                 //-------------------------------------------------
@@ -739,12 +748,13 @@ bool idle_startup()
 #endif
                         gSavedSettings.setBOOL("AutoLogin", TRUE);
                 }
-                else if (gSavedSettings.getBOOL("AutoLogin"))
+                else if (gSavedSettings.getBOOL("AutoLogin") && gHippoGridManager)
                 {
-                        firstname = gSavedSettings.getString("FirstName");
-                        lastname = gSavedSettings.getString("LastName");
-                        password = LLStartUp::loadPasswordFromDisk();
-                        gSavedSettings.setBOOL("RememberPassword", TRUE);
+                        // at this point, getCurrentGrid is the last logged in grid. Should we create a new entry for this? -- MC
+                        firstname = gHippoGridManager->getCurrentGrid()->getFirstName();
+                        lastname = gHippoGridManager->getCurrentGrid()->getLastName();
+                        password = gHippoGridManager->getCurrentGrid()->getPassword();
+                        gSavedSettings.setBOOL("RememberPassword", TRUE); // why do we do this, anyway? -- MC
                         
 #ifdef USE_VIEWER_AUTH
                         show_connect_box = true;
@@ -755,9 +765,7 @@ bool idle_startup()
                 else
                 {
                         // if not automatically logging in, display login dialog
-                        firstname = gSavedSettings.getString("FirstName");
-                        lastname = gSavedSettings.getString("LastName");
-                        password = LLStartUp::loadPasswordFromDisk();
+                        // name and password are now handled in STATE_LOGIN_SHOW when the login screen's shown -- MC
                         show_connect_box = true;
                 }
 
@@ -791,7 +799,7 @@ bool idle_startup()
 
                 timeout_count = 0;
                 
-                if(LLStartUp::shouldAutoLogin())
+                if (LLStartUp::shouldAutoLogin())
                 {
                         show_connect_box = false;
                 }
@@ -812,23 +820,35 @@ bool idle_startup()
 
                         // Show the login dialog
                         login_show();
-                        // connect dialog is already shown, so fill in the names
-                        // icky how usernames get bolted on here as a kind of hack -- MC
-                        if (gHippoGridManager && gHippoGridManager->getCurrentGrid()->isUsernameCompat())
+
+                        // connect dialog is already shown, so fill in the names associated with the grid
+                        // note how we always remember avatar names, but don't necessarily have to
+                        // icky how all this gets bolted on here as a kind of hack -- MC
+                        if (gHippoGridManager)
                         {
-                                if (lastname == "resident" || lastname == "Resident")
+                                firstname = gHippoGridManager->getCurrentGrid()->getFirstName();
+                                lastname = gHippoGridManager->getCurrentGrid()->getLastName();
+                                // RememberPassword toggles this being saved
+                                password = gHippoGridManager->getCurrentGrid()->getPassword();
+                                
+                                // empty in case we used logout
+                                if (gHippoGridManager->getCurrentGrid()->isUsernameCompat())
                                 {
-                                        LLPanelLogin::setFields(firstname, password);
+                                        if ((lastname == "resident" || lastname == "Resident") ||
+                                                (firstname.empty() && lastname.empty()))
+                                        {
+                                                LLPanelLogin::setFields(firstname, password);
+                                        }
+                                        else
+                                        {
+                                                LLPanelLogin::setFields(firstname+"."+lastname, password);
+                                        }
                                 }
                                 else
                                 {
-                                        LLPanelLogin::setFields(firstname+"."+lastname, password);
+                                        LLPanelLogin::setFields(firstname, lastname, password);
                                 }
                         }
-                        else
-                        {
-                                LLPanelLogin::setFields(firstname, lastname, password);
-                        }
                         
                         LLPanelLogin::giveFocus();
 
@@ -890,8 +910,31 @@ bool idle_startup()
 
         if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
         {
-
                 LL_DEBUGS("AppInitStartupState") << "STATE_LOGIN_CLEANUP" << LL_ENDL;
+        
+                // Post login screen, we should see if any settings have changed that may
+                // require us to either start/stop or change the socks proxy. As various communications
+                // past this point may require the proxy to be up.
+                bool socks_enable_required = gSavedSettings.getBOOL("Socks5ProxyEnabled");
+                if ((LLSocks::getInstance()->isEnabled() != socks_enable_required) || LLSocks::getInstance()->needsUpdate())
+                {
+                        if (socks_enable_required)
+                        {
+                                if (!LLStartUp::handleSocksProxy(false))
+                                {
+                                        // Proxy start up failed, we should now bail the state machine
+                                        // HandleSocksProxy() will have reported an error to the user 
+                                        // already, so we just go back to the login screen. The user
+                                        // could then change the perferences to fix the issue. 
+                                        LLStartUp::setStartupState(STATE_LOGIN_SHOW);
+                                        return FALSE;
+                                }
+                        }
+                        else
+                        {
+                                LLSocks::getInstance()->stopProxy();
+                        }
+                }
 
                 gDisconnected = TRUE;
 
@@ -938,21 +981,8 @@ bool idle_startup()
                         lastname = gLoginHandler.getLastName();
                         web_login_key = gLoginHandler.getWebLoginKey();
                 }
-                
-                /* Jacek - Grid manager stuff that's changed with 1.23
-                if(!gLoginHandler.mPassword.empty())
-                {
-                        firstname = gLoginHandler.mFirstName;
-                        lastname = gLoginHandler.mLastName;
-                        password = gLoginHandler.mPassword;
-                        
-                        gLoginHandler.mFirstName = "";
-                        gLoginHandler.mLastName = "";
-                        gLoginHandler.mPassword = "";
-                        LLStartUp::setShouldAutoLogin(false);
-                }*/
-                                
-                if (show_connect_box)
+                // note: the grid manager overrides defaults, always -- MC
+                else if (show_connect_box)
                 {
                         // TODO if not use viewer auth
                         // Load all the name information out of the login view
@@ -961,24 +991,28 @@ bool idle_startup()
          
                         // HACK: Try to make not jump on login
                         gKeyboard->resetKeys();
+                        
+                        LLStartUp::setShouldAutoLogin(false);
                 }
 
                 if (!firstname.empty() && !lastname.empty())
                 {
-                        gSavedSettings.setString("FirstName", firstname);
-                        gSavedSettings.setString("LastName", lastname);
+                        gHippoGridManager->getCurrentGrid()->setFirstName(firstname);
+                        gHippoGridManager->getCurrentGrid()->setLastName(lastname);
 
                         //LL_INFOS("AppInit") << "Attempting login as: " << firstname << " " << lastname << " " << password << LL_ENDL;
-                        gDebugInfo["LoginName"] = firstname + " " + lastname;   
-                }
-
-
+                        gDebugInfo["LoginName"] = firstname + " " + lastname;
 
-
-                // create necessary directories
-                // *FIX: these mkdir's should error check
-                gDirUtilp->setViewerUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
-                LLFile::mkdir(gDirUtilp->getViewerUserDir());
+                        // create necessary directories
+                        // *FIX: these mkdir's should error check
+                        gDirUtilp->setViewerUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
+                        LLFile::mkdir(gDirUtilp->getViewerUserDir());
+                }
+                else
+                {
+                        // we don't do anything from here on out -- MC
+                        llerrs << "No first or last name given! Cannot proceed!" << llendl;
+                }
 
                 // Set PerAccountSettingsFile to the default value.
                 gSavedSettings.setString("PerAccountSettingsFile",
@@ -1128,7 +1162,9 @@ bool idle_startup()
                 // color init must be after saved settings loaded
                 init_colors();
 
-                if (gSavedSettings.getBOOL("VivoxLicenseAccepted") || gHippoGridManager->getConnectedGrid()->isSecondLife())
+                if (!gSavedSettings.getBOOL("EnableVoiceChat") ||
+                        (gSavedSettings.getBOOL("EnableVoiceChat") && gSavedSettings.getBOOL("VivoxLicenseAccepted")) || 
+                        !gHippoGridManager->getConnectedGrid()->isSecondLife())
                 {
                         // skipping over STATE_LOGIN_VOICE_LICENSE since we don't need it
                         // skipping over STATE_UPDATE_CHECK because that just waits for input
@@ -1272,6 +1308,21 @@ bool idle_startup()
                         }
                 }
 
+                // We hash a temporary password for login auth. The actual stored password
+                // is in the grid manager, and is XORed with the mac address -- MC
+                std::string hashed_password("");
+                if (password.length() == 32)
+                {
+                        hashed_password = password;
+                }
+                else if (!password.empty())
+                {
+                        LLMD5 pass((unsigned char *)password.c_str());
+                        char munged_password[MD5HEX_STR_SIZE];
+                        pass.hex_digest(munged_password);
+                        hashed_password = munged_password;
+                }
+
                 // TODO if statement here to use web_login_key
                 if(web_login_key.isNull()){
                 sAuthUriNum = llclamp(sAuthUriNum, 0, (S32)sAuthUris.size()-1);
@@ -1280,7 +1331,7 @@ bool idle_startup()
                         auth_method,
                         firstname,
                         lastname,                       
-                        password, 
+                        hashed_password, 
                         //web_login_key,
                         start.str(),
                         gSkipOptionalUpdate,
@@ -1513,7 +1564,7 @@ bool idle_startup()
                 default:
                         if (sAuthUriNum >= (int) sAuthUris.size() - 1)
                         {
-                                emsg << "Unable to connect to " << gHippoGridManager->getCurrentGrid()->getGridNick() << ".\n";
+                                emsg << "Unable to connect to " << gHippoGridManager->getCurrentGrid()->getGridName() << ".\n";
                                 emsg << LLUserAuth::getInstance()->errorMessage();
                         } else {
                                 sAuthUriNum++;
@@ -1539,10 +1590,8 @@ bool idle_startup()
 
                 if(successful_login)
                 {
-                        {
-                                std::string current_grid = gHippoGridManager->getConnectedGrid()->getGridNick();
-                                gSavedSettings.setString("LastConnectedGrid", current_grid);
-                        }
+                        std::string current_grid = gHippoGridManager->getConnectedGrid()->getGridNick();
+                        gSavedSettings.setString("LastConnectedGrid", current_grid);
 
                         std::string text;
                         text = LLUserAuth::getInstance()->getResponse("udp_blacklist");
@@ -1574,19 +1623,23 @@ bool idle_startup()
                         }
                         text = LLUserAuth::getInstance()->getResponse("last_name");
                         if(!text.empty()) lastname.assign(text);
-                        gSavedSettings.setString("FirstName", firstname);
-                        gSavedSettings.setString("LastName", lastname);
+
+                        gHippoGridManager->getConnectedGrid()->setFirstName(firstname);
+                        gHippoGridManager->getConnectedGrid()->setLastName(lastname);
 
                         if (gSavedSettings.getBOOL("RememberPassword"))
                         {
                                 // Successful login means the password is valid, so save it.
-                                LLStartUp::savePasswordToDisk(password);
+                                // formerly LLStartUp::savePasswordToDisk(password); 
+                                // this needs to happen after gMACAddress is set -- MC
+                                gHippoGridManager->getConnectedGrid()->setPassword(password);
                         }
                         else
                         {
                                 // Don't leave password from previous session sitting around
                                 // during this login session.
-                                LLStartUp::deletePasswordFromDisk();
+                                // formerly LLStartUp::deletePasswordFromDisk(); -- MC
+                                gHippoGridManager->getConnectedGrid()->setPassword("");
                         }
 
                         // this is their actual ability to access content
@@ -1792,31 +1845,31 @@ bool idle_startup()
                         std::string tmp = LLUserAuth::getInstance()->getResponse("gridname");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setGridName(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("loginuri");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setLoginUri(tmp);
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setLoginURI(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("welcome");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setLoginPage(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("loginpage");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setLoginPage(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("economy");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setHelperUri(tmp);
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setHelperURI(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("helperuri");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setHelperUri(tmp);
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setHelperURI(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("about");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setWebSite(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("website");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setWebSite(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("help");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSupportUrl(tmp);
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSupportURL(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("support");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSupportUrl(tmp);
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSupportURL(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("register");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRegisterUrl(tmp);
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRegisterURL(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("account");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRegisterUrl(tmp);
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRegisterURL(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("password");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setPasswordUrl(tmp);
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setPasswordURL(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("search");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSearchUrl(tmp);
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSearchURL(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("currency");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setCurrencySymbol(tmp);
                         tmp = LLUserAuth::getInstance()->getResponse("real_currency");
@@ -2027,7 +2080,10 @@ bool idle_startup()
                 {
                         LLFloaterMap::showInstance();
                 }
-
+                if (gSavedSettings.getBOOL("ShowRadar"))
+                {
+                        LLFloaterAvatarList::showInstance();
+                }
                 if (gSavedSettings.getBOOL("ShowCameraControls"))
                 {
                         LLFloaterCamera::showInstance();
@@ -2338,9 +2394,7 @@ bool idle_startup()
                         LLStringUtil::format_map_t args;
                         args["[FIRST_NAME]"] = firstname;
                         args["[LAST_NAME]"] = lastname;
-                        args["[GRID_NAME]"] = (gHippoGridManager->getConnectedGrid()->getGridName().empty()) ? 
-                                gHippoGridManager->getConnectedGrid()->getGridNick() :
-                                gHippoGridManager->getConnectedGrid()->getGridName();
+                        args["[GRID_NAME]"] = gHippoGridManager->getConnectedGrid()->getGridName();
                         std::string title_text = LLTrans::getString("TitleBarMultiple", args);
                         gWindowTitle = gSecondLife + " - " + title_text;
                         LLStringUtil::truncate(gWindowTitle, 255);
@@ -2846,6 +2900,9 @@ bool idle_startup()
                 LL_DEBUGS("AppInitStartupState") << "STATE_CLEANUP" << LL_ENDL;
                 set_startup_status(1.0, "", "");
 
+                // Make sure we do this right after the login screen -- MC
+                update_grid_specific_menus();
+
                 // Make sure all the branding is in order -- MC
                 if (gStatusBar)
                 {
@@ -3185,41 +3242,6 @@ void LLStartUp::deletePasswordFromDisk()
         LLFile::remove(filepath);
 }
 
-
-bool is_hex_string(U8* str, S32 len)
-{
-        bool rv = true;
-        U8* c = str;
-        while(rv && len--)
-        {
-                switch(*c)
-                {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                case 'a':
-                case 'b':
-                case 'c':
-                case 'd':
-                case 'e':
-                case 'f':
-                        ++c;
-                        break;
-                default:
-                        rv = false;
-                        break;
-                }
-        }
-        return rv;
-}
-
 void show_first_run_dialog()
 {
         LLNotifications::instance().add("FirstRun", LLSD(), LLSD(), first_run_dialog_callback);
@@ -3231,7 +3253,7 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
         if (0 == option)
         {
                 LL_DEBUGS("AppInit") << "First run dialog cancelling" << LL_ENDL;
-                const std::string &url = gHippoGridManager->getConnectedGrid()->getRegisterUrl();
+                const std::string &url = gHippoGridManager->getConnectedGrid()->getRegisterURL();
                 if (!url.empty()) {
                         LLWeb::loadURL(url);
                 } else {
@@ -3283,7 +3305,7 @@ bool login_alert_status(const LLSD& notification, const LLSD& response)
         case 0:     // OK
             break;
         case 1: {   // Help
-            const std::string &url = gHippoGridManager->getConnectedGrid()->getSupportUrl();
+            const std::string &url = gHippoGridManager->getConnectedGrid()->getSupportURL();
             if (!url.empty()) LLWeb::loadURLInternal(url);
             break;
         }
@@ -4019,3 +4041,93 @@ void apply_udp_blacklist(const std::string& csv)
         
 }
 
+bool LLStartUp::handleSocksProxy(bool reportOK)
+{
+        std::string httpProxyType = gSavedSettings.getString("Socks5HttpProxyType");
+
+        // Determine the http proxy type (if any)
+        if ((httpProxyType.compare("Web") == 0) && gSavedSettings.getBOOL("BrowserProxyEnabled"))
+        {
+                LLHost httpHost;
+                httpHost.setHostByName(gSavedSettings.getString("BrowserProxyAddress"));
+                httpHost.setPort(gSavedSettings.getS32("BrowserProxyPort"));
+                LLSocks::getInstance()->EnableHttpProxy(httpHost,LLPROXY_HTTP);
+        }
+        else if ((httpProxyType.compare("Socks") == 0) && gSavedSettings.getBOOL("Socks5ProxyEnabled"))
+        {
+                LLHost httpHost;
+                httpHost.setHostByName(gSavedSettings.getString("Socks5ProxyHost"));
+                httpHost.setPort(gSavedSettings.getU32("Socks5ProxyPort"));
+                LLSocks::getInstance()->EnableHttpProxy(httpHost,LLPROXY_SOCKS);
+        }
+        else
+        {
+                LLSocks::getInstance()->DisableHttpProxy();
+        }
+        
+        bool use_socks_proxy = gSavedSettings.getBOOL("Socks5ProxyEnabled");
+        if (use_socks_proxy)
+        {       
+
+                // Determine and update LLSocks with the saved authentication system
+                std::string auth_type = gSavedSettings.getString("Socks5AuthType");
+                        
+                if (auth_type.compare("None") == 0)
+                {
+                        LLSocks::getInstance()->setAuthNone();
+                }
+
+                if (auth_type.compare("UserPass") == 0)
+                {
+                        LLSocks::getInstance()->setAuthPassword(gSavedSettings.getString("Socks5Username"),gSavedSettings.getString("Socks5Password"));
+                }
+
+                // Start the proxy and check for errors
+                int status = LLSocks::getInstance()->startProxy(gSavedSettings.getString("Socks5ProxyHost"), gSavedSettings.getU32("Socks5ProxyPort"));
+                LLSD subs;
+                subs["PROXY"] = gSavedSettings.getString("Socks5ProxyHost");
+
+                switch(status)
+                {
+                        case SOCKS_OK:
+                                if (reportOK == true)
+                                {
+                                        LLNotifications::instance().add("SOCKS_CONNECT_OK", subs);
+                                }
+                                return true;
+                                break;
+
+                        case SOCKS_CONNECT_ERROR: // TCP Fail
+                                LLNotifications::instance().add("SOCKS_CONNECT_ERROR", subs);
+                                break;
+
+                        case SOCKS_NOT_PERMITTED: // Socks5 server rule set refused connection
+                                LLNotifications::instance().add("SOCKS_NOT_PERMITTED", subs);
+                                break;
+                                        
+                        case SOCKS_NOT_ACCEPTABLE: // Selected authentication is not acceptable to server
+                                LLNotifications::instance().add("SOCKS_NOT_ACCEPTABLE", subs);
+                                break;
+
+                        case SOCKS_AUTH_FAIL: // Authentication failed
+                                LLNotifications::instance().add("SOCKS_AUTH_FAIL", subs);
+                                break;
+
+                        case SOCKS_UDP_FWD_NOT_GRANTED: // UDP forward request failed
+                                LLNotifications::instance().add("SOCKS_UDP_FWD_NOT_GRANTED", subs);
+                                break;
+
+                        case SOCKS_HOST_CONNECT_FAILED: // Failed to open a TCP channel to the socks server
+                                LLNotifications::instance().add("SOCKS_HOST_CONNECT_FAILED", subs);
+                                break;          
+                }
+
+                return false;
+        }
+        else
+        {
+                LLSocks::getInstance()->stopProxy(); //ensure no UDP proxy is running and its all cleaned up
+        }
+
+        return true;
+}
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index 3fe8daa..5960817 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -106,15 +106,6 @@ public:
         // gender_name is either "male" or "female"
         static void loadInitialOutfit( const std::string& outfit_folder_name,
                                                                    const std::string& gender_name );
-
-        // Load MD5 of user's password from local disk file.
-        static std::string loadPasswordFromDisk();
-        
-        // Record MD5 of user's password for subsequent login.
-        static void savePasswordToDisk(const std::string& hashed_password);
-        
-        // Delete the saved password local disk file.
-        static void deletePasswordFromDisk();
         
         static bool dispatchURL();
                 // if we have a SLURL or sim string ("Ahern/123/45") that started
@@ -123,6 +114,9 @@ public:
         static std::string sSLURLCommand;
                 // *HACK: On startup, if we were passed a secondlife://app/do/foo
                 // command URL, store it for later processing.
+
+        static bool handleSocksProxy(bool reportOK = true);
+
         static bool shouldAutoLogin() { return mShouldAutoLogin; };
         static void setShouldAutoLogin(bool value) { mShouldAutoLogin = value; };
 
diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 4233a52..675412d 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -193,22 +193,11 @@ LLTool* LLToolMgr::getCurrentTool()
         else
         {
                 // due to window management weirdness we can get here with gToolNull
-//              // Don't use keyboard overrides when the edit window doesn't have focus. The chatbar is an unfortunate exception -- MC
-//              if (gViewerWindow && gViewerWindow->getUIHasFocus()
-//                      && gFloaterTools && !gFloaterTools->hasFocus()
-//                      && gChatBar && !gChatBar->getVisible())
-//              {
-//                      cur_tool = mBaseTool;
-//              }
-//              else
-                {
-                        bool can_override = mBaseTool && (mBaseTool != gToolNull) ;
-                                                                
-                        mOverrideTool = can_override ? mBaseTool->getOverrideTool(override_mask) : NULL;
+                bool can_override = mBaseTool && (mBaseTool != gToolNull) ;                                     
+                mOverrideTool = can_override ? mBaseTool->getOverrideTool(override_mask) : NULL;
 
-                        // use keyboard-override tool if available otherwise drop back to base tool
-                        cur_tool = mOverrideTool ? mOverrideTool : mBaseTool;
-                }
+                // use keyboard-override tool if available otherwise drop back to base tool
+                cur_tool = mOverrideTool ? mOverrideTool : mBaseTool;
         }
 
         LLTool* prev_tool = mSelectedTool;
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index b7d762c..429b9d4 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -422,13 +422,16 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                         }
 // [/RLVa:KB]
                 }
-                else if (object->isAttachment() && !object->isHUDAttachment())
+                else if (object->isAttachment())
                 {
-                        gPieAttachment->show(x, y, mPieMouseButtonDown);
-                }
-                else if (object->isHUDAttachment())
-                {
-                        gPieHUD->show(x, y, mPieMouseButtonDown);
+                        if (object->isHUDAttachment())
+                        {
+                                gPieHUD->show(x, y, mPieMouseButtonDown);
+                        }
+                        else
+                        {
+                                gPieAttachment->show(x, y, mPieMouseButtonDown);
+                        }
                 }
                 else
                 {
@@ -802,8 +805,8 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
                 }
 
                 const LLTextureEntry* tep = object->getTE(mPick.mObjectFace);
-                viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(tep->getID());
-                if (tep && media_impl.notNull() && media_impl->hasMedia())
+                viewer_media_t media_impl = tep ? LLViewerMedia::getMediaImplFromTextureID(tep->getID()) : NULL;
+                if (media_impl.notNull() && media_impl->hasMedia())
                 {
                         LL_DEBUGS("DoubleClicks") << "Double clicked running parcel media" << LL_ENDL;
                         return FALSE;
diff --git a/linden/indra/newview/lluserauth.cpp b/linden/indra/newview/lluserauth.cpp
index d76ed72..86d35e2 100644
--- a/linden/indra/newview/lluserauth.cpp
+++ b/linden/indra/newview/lluserauth.cpp
@@ -38,10 +38,12 @@
 #include <iterator>
 
 #include "lldir.h"
+#include "llversionviewer.h"
 #include "llappviewer.h"
+#include "llviewerbuild.h"
 #include "llviewercontrol.h"
 #include "llxmlrpctransaction.h"
-#include "llmd5.h"
+#include "llsdutil.h"
 
 // NOTE: MUST include these after otherincludes since queue gets redefined!?!!
 #include <curl/curl.h>
@@ -69,7 +71,8 @@ static const char* PLATFORM_STRING = "Sol";
 
 LLUserAuth::LLUserAuth() :
         mTransaction(NULL),
-        mLastTransferRateBPS(0)
+        mLastTransferRateBPS(0),
+        mResult(LLSD())
 {
         mAuthResponse = E_NO_RESPONSE_YET;
 }
@@ -85,6 +88,7 @@ void LLUserAuth::reset()
         mTransaction = NULL;
         mResponses.clear();
         mOptions.clear();
+        mResult.clear();
 }
 
 
@@ -114,25 +118,8 @@ void LLUserAuth::authenticate(
         LL_INFOS2("AppInit", "Authentication") << option_str.str() << LL_ENDL;
 
         mAuthResponse = E_NO_RESPONSE_YET;
-        //mDownloadTimer.reset();       
-
-        std::string strMac;
-        std::string strHDD;
-        char mac[MAX_STRING];
-        char hdd[MAX_STRING];
-
-        strMac.assign(web_login_key.asString());
-        strMac.append(hashed_mac.c_str());
-
-        strHDD.assign(web_login_key.asString());
-        strHDD.append(hashed_volume_serial.c_str());
-
-        LLMD5 md5Mac((const unsigned char *)strMac.c_str());
-        LLMD5 md5HDD((const unsigned char *)strHDD.c_str());
-
-        md5Mac.hex_digest(mac);
-        md5HDD.hex_digest(hdd);
-
+        //mDownloadTimer.reset();
+        
         // create the request
         XMLRPC_REQUEST request = XMLRPC_RequestNew();
         XMLRPC_RequestSetMethodName(request, method.c_str());
@@ -147,9 +134,10 @@ void LLUserAuth::authenticate(
         XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
         XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
         XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
-        XMLRPC_VectorAppendString(params, "mac", mac, 0);
+        XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
         // A bit of security through obscurity: id0 is volume_serial
-        XMLRPC_VectorAppendString(params, "id0", hdd, 0);
+        XMLRPC_VectorAppendString(params, "id0", hashed_volume_serial.c_str(), 0);
+
         if (skip_optional)
         {
                 XMLRPC_VectorAppendString(params, "skipoptional", "true", 0);
@@ -218,28 +206,7 @@ void LLUserAuth::authenticate(
 
         mAuthResponse = E_NO_RESPONSE_YET;
         //mDownloadTimer.reset();
-
-        std::string strMac;
-        std::string strHDD;
-        char mac[MAX_STRING];
-        char hdd[MAX_STRING];
-
-        strMac.assign(firstname);
-        strMac.append(lastname);
-        strMac.append(dpasswd.c_str());
-        strMac.append(hashed_mac.c_str());
-
-        strHDD.assign(firstname);
-        strHDD.append(lastname);
-        strHDD.append(dpasswd.c_str());
-        strHDD.append(hashed_volume_serial.c_str());
-
-        LLMD5 md5Mac((const unsigned char *)strMac.c_str());
-        LLMD5 md5HDD((const unsigned char *)strHDD.c_str());
-
-        md5Mac.hex_digest(mac);
-        md5HDD.hex_digest(hdd);
-
+        
         // create the request
         XMLRPC_REQUEST request = XMLRPC_RequestNew();
         XMLRPC_RequestSetMethodName(request, method.c_str());
@@ -254,9 +221,10 @@ void LLUserAuth::authenticate(
         XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
         XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
         XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
-        XMLRPC_VectorAppendString(params, "mac", mac, 0);
+        XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
         // A bit of security through obscurity: id0 is volume_serial
-        XMLRPC_VectorAppendString(params, "id0", hdd, 0);
+        XMLRPC_VectorAppendString(params, "id0", hashed_volume_serial.c_str(), 0);
+
         if (skip_optional)
         {
                 XMLRPC_VectorAppendString(params, "skipoptional", "true", 0);
diff --git a/linden/indra/newview/lluserauth.h b/linden/indra/newview/lluserauth.h
index 0af8718..85cc180 100644
--- a/linden/indra/newview/lluserauth.h
+++ b/linden/indra/newview/lluserauth.h
@@ -127,6 +127,11 @@ public:
                 const std::string& hashed_volume_serial);
 
         UserAuthcode authResponse();
+        // mResult contains the responses we get through the login process
+        //
+        LLSD mResult; // OGPX : *way* different access of auth result in OGP.
+        UserAuthcode mAuthResponse; // OGPX TODO: proper access functions
+         
 
         // clears out internal data cache.
         void reset();
@@ -143,7 +148,7 @@ public:
 private:
         LLXMLRPCTransaction* mTransaction;
 
-        UserAuthcode mAuthResponse;
+
         std::string mErrorMessage;
         
         // dealing with the XML
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index 0e06353..5f06b88 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -165,10 +165,9 @@ void LLViewerInventoryItem::updateServer(BOOL is_new) const
 {
         if(!mIsComplete)
         {
-                // *FIX: deal with this better.
-                // If we're crashing here then the UI is incorrectly enabled.
-                llerrs << "LLViewerInventoryItem::updateServer() - for incomplete item"
-                           << llendl;
+                llwarns << "LLViewerInventoryItem::updateServer() - for incomplete item"
+                                << llendl;
+                LLNotifications::instance().add("IncompleteInventoryItem");
                 return;
         }
         if(gAgent.getID() != mPermissions.getOwner())
diff --git a/linden/indra/newview/llviewerjoystick.cpp b/linden/indra/newview/llviewerjoystick.cpp
index 4e509c7..675feb6 100644
--- a/linden/indra/newview/llviewerjoystick.cpp
+++ b/linden/indra/newview/llviewerjoystick.cpp
@@ -162,7 +162,7 @@ LLViewerJoystick::LLViewerJoystick()
         memset(mBtn, 0, sizeof(mBtn));
 
         // factor in bandwidth? bandwidth = gViewerStats->mKBitStat
-        mPerfScale = 4000.f / gSysCPU.getMhz();
+        mPerfScale = 4000.f / gSysCPU.getMHz();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 0d34f18..b85f3ca 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -89,6 +89,7 @@
 #include "llfloateractivespeakers.h"
 #include "llfloateranimpreview.h"
 #include "llfloateravatarinfo.h"
+#include "llfloateravatarlist.h"
 #include "llfloateravatartextures.h"
 #include "llfloaterbeacons.h"
 #include "llfloaterbuildoptions.h"
@@ -725,10 +726,26 @@ void init_menus()
         gLoginMenuBarView->setBackgroundColor( color );
 
         gMenuHolder->addChild(gLoginMenuBarView);
-        
 }
 
 
+void update_grid_specific_menus()
+{
+        if (!gMenuHolder || !gMenuBarView)
+        {
+                return;
+        }
+        else
+        {
+                // Disable these when we're not on Second Life grids 
+                // (or don't have URLS for them if non-SL grids start using 'em) -- MC
+                gMenuHolder->childSetEnabled("Manage My Account...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+                gMenuHolder->childSetVisible("Manage My Account...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+                gMenuHolder->childSetEnabled("Account History...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+                gMenuHolder->childSetVisible("Account History...", gHippoGridManager->getConnectedGrid()->isSecondLife());
+        }
+}
+
 
 void init_client_menu(LLMenuGL* menu)
 {
@@ -6131,6 +6148,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterPerms::toggleInstance(LLSD());
                 }
+                else if (floater_name == "full radar")
+                {
+                        LLFloaterAvatarList::toggle(NULL);
+                }
                 return true;
         }
 };
@@ -6205,6 +6226,10 @@ class LLFloaterVisible : public view_listener_t
                         if (!instn) new_value = false;
                         else new_value = instn->getVisible();
                 }
+                else if (floater_name == "full radar")
+                {
+                        new_value = (LLFloaterAvatarList::getInstance() != NULL);
+                }
                 gMenuHolder->findControl(control_name)->setValue(new_value);
                 return true;
         }
@@ -10699,19 +10724,6 @@ class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
         }
 };
 
-///////////////////////////////////
-// Reload Avatar Cloud Particles //
-///////////////////////////////////
-
-
-class LLAdvancedReloadAvatarCloudParticle : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLVOAvatar::initCloud();
-                return true;
-        }
-};
 
 ///////////
 // Crash //
@@ -11501,7 +11513,6 @@ void initialize_menus()
         addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
         addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
         addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
-        addMenu(new LLAdvancedReloadAvatarCloudParticle(), "Advanced.ReloadAvatarCloudParticle");
 
         // Advanced > Crash
         addMenu(new LLAdvancedCrash(), "Advanced.Crash");
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index f33c201..9c01598 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -47,6 +47,8 @@ class LLObjectSelection;
 void pre_init_menus();
 void init_menus();
 void cleanup_menus();
+// Updates grid-specific menu options after login
+void update_grid_specific_menus();
 
 void show_debug_menus(); // checks for if menus should be shown first.
 // builds either current or legacy pie menus depending upon LegacyPieEnabled
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 1cfe665..0c39e15 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -75,7 +75,7 @@ void LLViewerLogin::getLoginURIs(std::vector<std::string>& uris) const
         // If there was no command line uri...
         if(uris.empty())
         {
-                uris.push_back(gHippoGridManager->getConnectedGrid()->getLoginUri());
+                uris.push_back(gHippoGridManager->getConnectedGrid()->getLoginURI());
                 /*
                 // If its a known grid choice, get the uri from the table,
                 // else try the grid name.
@@ -92,7 +92,7 @@ void LLViewerLogin::getLoginURIs(std::vector<std::string>& uris) const
 
 const std::string &LLViewerLogin::getGridLabel() const
 {
-        return gHippoGridManager->getConnectedGrid()->getGridNick();
+        return gHippoGridManager->getConnectedGrid()->getGridName();
 }
 
 const std::string &LLViewerLogin::getLoginPage() const
@@ -102,7 +102,7 @@ const std::string &LLViewerLogin::getLoginPage() const
 
 const std::string &LLViewerLogin::getHelperURI() const
 {
-        return gHippoGridManager->getConnectedGrid()->getHelperUri();
+        return gHippoGridManager->getConnectedGrid()->getHelperURI();
 }
   
 bool LLViewerLogin::isOpenSimulator()
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 65c1d11..576f312 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -207,7 +207,8 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
         mJointInfo(NULL),
         mState(0),
         mMedia(NULL),
-        mClickAction(0)
+        mClickAction(0),
+        mSculptSurfaceArea(0.0)
 {
         if(!is_global)
         {
@@ -4012,9 +4013,15 @@ LLBBox LLViewerObject::getBoundingBoxAgent() const
 {
         LLVector3 position_agent;
         LLQuaternion rot;
+        LLViewerObject* avatar_parent = NULL;
         LLViewerObject* root_edit = (LLViewerObject*)getRootEdit();
-        LLViewerObject* avatar_parent = (LLViewerObject*)root_edit->getParent();
-        if (avatar_parent && avatar_parent->isAvatar() && root_edit->mDrawable.notNull())
+        if (root_edit)
+        {
+                avatar_parent = (LLViewerObject*)root_edit->getParent();
+        }
+
+        if (avatar_parent && avatar_parent->isAvatar() &&
+                root_edit && root_edit->mDrawable.notNull() && root_edit->mDrawable->getXform()->getParent())
         {
                 LLXform* parent_xform = root_edit->mDrawable->getXform()->getParent();
                 position_agent = (getPositionEdit() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition();
@@ -4112,6 +4119,14 @@ void LLViewerObject::setDebugText(const std::string &utf8text)
         mText->setDoFade(FALSE);
         updateText();
 }
+std::string LLViewerObject::getDebugText()
+{
+        if(mText)
+        {
+                return mText->getStringUTF8();
+        }
+        return "";
+}
 
 void LLViewerObject::setIcon(LLViewerImage* icon_image)
 {
@@ -4581,7 +4596,7 @@ bool LLViewerObject::setParameterEntry(U16 param_type, const LLNetworkData& new_
 bool LLViewerObject::setParameterEntryInUse(U16 param_type, BOOL in_use, bool local_origin)
 {
         ExtraParameter* param = getExtraParameterEntryCreate(param_type);
-        if (param->in_use != in_use)
+        if (param && param->in_use != in_use)
         {
                 param->in_use = in_use;
                 parameterChanged(param_type, param->data, in_use, local_origin);
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index 33e8da2..9b05470 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -353,6 +353,7 @@ public:
         void setCanSelect(BOOL canSelect);
 
         void setDebugText(const std::string &utf8text);
+        std::string getDebugText();
         void setIcon(LLViewerImage* icon_image);
         void clearIcon();
 
@@ -552,6 +553,7 @@ public:
         LLPointer<LLHUDIcon> mIcon;
 
         static                  BOOL            sUseSharedDrawables;
+        F32             mSculptSurfaceArea;
 
 protected:
         // delete an item in the inventory, but don't tell the
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 78ce247..2d6c9f4 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -166,12 +166,12 @@ U64 LLViewerObjectList::getIndex(const U32 local_id,
         return (((U64)index) << 32) | (U64)local_id;
 }
 
-BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
+BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject* objectp)
 {
-        if(object.getRegion())
+        if (objectp && objectp->getRegion())
         {
-                U32 local_id = object.mLocalID;
-                LLHost region_host = object.getRegion()->getHost();
+                U32 local_id = objectp->mLocalID;
+                LLHost region_host = objectp->getRegion()->getHost();
                 U32 ip = region_host.getAddress();
                 U32 port = region_host.getPort();
                 U64 ipport = (((U64)ip) << 32) | (U64)port;
@@ -186,7 +186,7 @@ BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
                 }
                 
                 // Found existing entry
-                if (iter->second == object.getID())
+                if (iter->second == objectp->getID())
                 {   // Full UUIDs match, so remove the entry
                         sIndexAndLocalIDToUUID.erase(iter);
                         return TRUE;
@@ -451,7 +451,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
                         ((objectp->mLocalID != local_id) ||
                          (objectp->getRegion() != regionp)))
                 {
-                        removeFromLocalIDTable(*objectp);
+                        removeFromLocalIDTable(objectp);
                         setUUIDAndLocal(fullid,
                                                         local_id,
                                                         gMessageSystem->getSenderIP(),
@@ -813,20 +813,26 @@ void LLViewerObjectList::clearDebugText()
 
 void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
 {
+        if (!objectp)
+        {
+                llwarns << "NULL object pointer passed." << llendl;
+                return;
+        }
         LLMemType mt(LLMemType::MTYPE_OBJECT);
-        if (mDeadObjects.count(objectp->mID))
+        if (mDeadObjects.find(objectp->mID) != mDeadObjects.end())
         {
                 llinfos << "Object " << objectp->mID << " already on dead list, ignoring cleanup!" << llendl;   
-                return;
         }
-
-        mDeadObjects.insert(std::pair<LLUUID, LLPointer<LLViewerObject> >(objectp->mID, objectp));
+        else
+        {
+                mDeadObjects.insert(objectp->mID);
+        }
 
         // Cleanup any references we have to this object
         // Remove from object map so noone can look it up.
 
         mUUIDObjectMap.erase(objectp->mID);
-        removeFromLocalIDTable(*objectp);
+        removeFromLocalIDTable(objectp);
 
         if (objectp->onActiveList())
         {
@@ -1060,7 +1066,7 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
         for (S32 i = 0; i < mMapObjects.count(); i++)
         {
                 LLViewerObject* objectp = mMapObjects[i];
-                if (!objectp->getRegion() || objectp->isOrphaned() || objectp->isAttachment())
+                if (objectp->isDead() || !objectp->getRegion() || objectp->isOrphaned() || objectp->isAttachment())
                 {
                         continue;
                 }
diff --git a/linden/indra/newview/llviewerobjectlist.h b/linden/indra/newview/llviewerobjectlist.h
index 07920cb..5999da3 100644
--- a/linden/indra/newview/llviewerobjectlist.h
+++ b/linden/indra/newview/llviewerobjectlist.h
@@ -182,7 +182,7 @@ public:
                                                                 const U32 ip,
                                                                 const U32 port); // Requires knowledge of message system info!
 
-        static BOOL removeFromLocalIDTable(const LLViewerObject &object);
+        static BOOL removeFromLocalIDTable(const LLViewerObject* objectp);
         // Used ONLY by the orphaned object code.
         static U64 getIndex(const U32 local_id, const U32 ip, const U32 port);
 
@@ -200,8 +200,7 @@ protected:
 
         LLDynamicArrayPtr<LLPointer<LLViewerObject> > mMapObjects;
 
-        typedef std::map<LLUUID, LLPointer<LLViewerObject> > vo_map;
-        vo_map mDeadObjects;    // Need to keep multiple entries per UUID
+        std::set<LLUUID> mDeadObjects;
 
         std::map<LLUUID, LLPointer<LLViewerObject> > mUUIDObjectMap;
 
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 2345bf6..c268580 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -1038,6 +1038,7 @@ LLVOAvatar::~LLVOAvatar()
                 LL_DEBUGS("VOAvatar") << "Destructing Zombie from previous session." << LL_ENDL;        
         }
 
+
         mRoot.removeAllChildren();
 
         delete [] mSkeleton;
@@ -1493,6 +1494,8 @@ void LLVOAvatar::cleanupClass()
 }
 
 LLPartSysData LLVOAvatar::sCloud;
+bool LLVOAvatar::sHasCloud = false;
+
 void LLVOAvatar::initCloud()
 {
         // fancy particle cloud designed by Brent
@@ -1506,12 +1509,45 @@ void LLVOAvatar::initCloud()
                 filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "cloud.xml");
         }
 
+        loadCloud(filename, sCloud);
+        sHasCloud = true;
+}
+
+
+void LLVOAvatar::loadCloud(const std::string& filename,  LLPartSysData& particles)
+{
         LLSD cloud;
         llifstream in_file(filename);
         LLSDSerialize::fromXMLDocument(cloud, in_file);
-        sCloud.fromLLSD(cloud);
-        LLViewerImage* cloud_image = gImageList.getImageFromFile("cloud-particle.j2c");
-        sCloud.mPartImageID                 = cloud_image->getID();
+
+        particles.fromLLSD(cloud);
+        const LLUUID default_id = DEFAULT_UNREZZED_AVATAR_PARTICLE;
+        if(particles.mPartImageID.isNull() || default_id == particles.mPartImageID)
+        {
+                LLViewerImage* cloud_image =
+                        gImageList.getImageFromFile("cloud-particle.j2c", MIPMAP_YES, IMMEDIATE_YES, 0, 0, default_id);
+                particles.mPartImageID = cloud_image->getID();
+        }
+}
+
+
+void LLVOAvatar::saveCloud(const std::string& filename,  LLPartSysData& particles)
+{
+        llofstream out(filename);
+        if (!out.good())
+        {
+                llwarns << "Unable to open " << filename << " for output." << llendl;
+                return;
+        }
+        LLSDSerialize::toXML(particles.asLLSD(), out);
+        out.close();
+
+        // Imprudence: actually we could export any particle system with this,
+        // though we don't have a clue about its creator (could be from a no mod script) :(
+        // This  is probably also not ok to export on open sim grids,
+        // unless theiy either add a creator property to particle  systems
+        // or their terms of service make sure this sort of content is free and open.
+        // Saving only the cloud for now, which only exists client side.
 
 }
 
@@ -3228,6 +3264,7 @@ bool LLVOAvatar::loadClientTags()
 void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar)
 {
         LLUUID idx = avatar->getTE(0)->getID();
+
         // meta 7 gets special treatment -
         // A) coz this is our damn viewer.
         // 2) makes it quicker coz everyone else around you is using it.
@@ -3239,9 +3276,14 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
                 client = "meta 7";
         }
         // Imprudence is special to, coz dark blue on black is just unreadable.  Pffft.
+        // Also in case the user has a local color they prefer.
+        // This means clientside colors for Imp will always override any on the website.
+        // If you're going to add a new color, a new UUID needs to be added -- MC
         else if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
         {
-                avatar_name_color = LLColor4(0.79f,0.44f,0.88f);// Imprudence
+                //avatar_name_color = LLColor4(0.79f,0.44f,0.88f);// Imprudence
+                // defaults to LLColor4(0.79f,0.44f,0.88f)
+                avatar_name_color = gSavedSettings.getColor4("ImprudenceTagColor"); //Imprudence
                 client = "Imprudence";
         }
         // Don't think anyone allocates these tags, so grab one for us to.
@@ -3431,6 +3473,7 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
                         client = "nolife";
                 }
         }
+
         if(client.empty())
         {
                 LLPointer<LLViewerImage> image_point = gImageList.getImage(idx, MIPMAP_YES, IMMEDIATE_NO);
@@ -3580,7 +3623,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 else
                                 {
                                         // Set your own name to the Imprudence color -- MC
-                                        client_color = LLColor4(0.79f,0.44f,0.88f);
+                                        client_color = gSavedSettings.getColor4("ImprudenceTagColor");
                                 }
 
                                 static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);
@@ -7393,6 +7436,7 @@ BOOL LLVOAvatar::isVisible()
 // returns true if the value has changed.
 BOOL LLVOAvatar::updateIsFullyLoaded()
 {
+
     // a "heuristic" to determine if we have enough avatar data to render
     // (to avoid rendering a "Ruth" - DEV-3168)
 
@@ -7472,11 +7516,19 @@ BOOL LLVOAvatar::updateIsFullyLoaded()
 
 BOOL LLVOAvatar::isFullyLoaded()
 {
+        static BOOL* sPreviewAvatarCloud = rebind_llcontrol<BOOL>("PreviewAvatarAsCloud", &gSavedSettings, true);
         static BOOL* sRenderUnloadedAvatar = rebind_llcontrol<BOOL>("RenderUnloadedAvatar", &gSavedSettings, true);
-        if (*sRenderUnloadedAvatar)
-                return TRUE;
-        else
-                return mFullyLoaded;
+
+        if(*sPreviewAvatarCloud && mIsSelf)
+        {
+                return FALSE;
+        }
+        else if (*sRenderUnloadedAvatar)
+        {
+                 return TRUE;
+        }
+
+        return mFullyLoaded;
 }
 
 
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index e585a6a..4d08bf0 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -97,7 +97,11 @@ public:
         static void initClass(); // Initialize data that's only init'd once per class.
         static void cleanupClass();     // Cleanup data that's only init'd once per class.
         static BOOL parseSkeletonFile(const std::string& filename);
+
         static void initCloud();
+        static void loadCloud(const std::string& filename,  LLPartSysData& particles);
+        static void saveCloud(const std::string& filename,  LLPartSysData& particles);
+
         virtual U32 processUpdateMessage(LLMessageSystem *mesgsys,
                                                                          void **user_data,
                                                                          U32 block_num,
@@ -587,7 +591,8 @@ public:
         static F32              sLODFactor; // user-settable LOD factor
         static BOOL             sJointDebug; // output total number of joints being touched for each avatar
         static BOOL     sDebugAvatarRotation;
-        static LLPartSysData sCloud;
+        static LLPartSysData sCloud;    
+        static bool sHasCloud;
 
         static S32 sNumVisibleAvatars; // Number of instances of this class
         
diff --git a/linden/indra/newview/llvocache.cpp b/linden/indra/newview/llvocache.cpp
index 3f1c132..20d0399 100644
--- a/linden/indra/newview/llvocache.cpp
+++ b/linden/indra/newview/llvocache.cpp
@@ -104,7 +104,10 @@ LLVOCacheEntry::LLVOCacheEntry(LLFILE *fp)
 
 LLVOCacheEntry::~LLVOCacheEntry()
 {
-        delete [] mBuffer;
+        if (mBuffer)
+        {
+                delete [] mBuffer;
+        }
 }
 
 
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 7aaf845..4a53d4e 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -72,6 +72,10 @@ const S32 MIN_QUIET_FRAMES_COALESCE = 30;
 const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
 const F32 FORCE_CULL_AREA = 8.f;
 
+static const F32 sSculptSAThresh = 1750.f;      // Surface area at which sculpts are considered for not being rendered
+static const F32 sSculptSAMax = 50000.f;        // The maximum combined surface area of sculpts(per frame) that are above the 
+                                                                                        // threshold before they stop being rendered
+                
 BOOL gAnimateTextures = TRUE;
 extern BOOL gHideSelectedObjects;
 
@@ -89,6 +93,7 @@ LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *re
         mRelativeXformInvTrans.setIdentity();
 
         mLOD = MIN_LOD;
+        mSculptLevel = -2;
         mTextureAnimp = NULL;
         mVObjRadius = LLVector3(1,1,0.5f).length();
         mNumFaces = 0;
@@ -502,8 +507,9 @@ void LLVOVolume::updateTextureVirtualSize()
         
         if (isSculpted())
         {
-                updateSculptTexture();
-
+                LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+                LLUUID id =  sculpt_params->getSculptTexture(); 
+                mSculptTexture = gImageList.getImage(id);
                 if (mSculptTexture.notNull())
                 {
                         mSculptTexture->setBoostLevel(llmax((S32)mSculptTexture->getBoostLevel(),
@@ -526,22 +532,22 @@ void LLVOVolume::updateTextureVirtualSize()
                                 }
                         }
         
-                        S32 texture_discard = mSculptTexture->getDiscardLevel(); //try to match the texture
-                        S32 current_discard = getVolume() ? getVolume()->getSculptLevel() : -2 ;
+                        S32 texture_discard = mSculptTexture->getCachedRawImageLevel(); //try to match the texture
+                        S32 current_discard = mSculptLevel;
 
                         if (texture_discard >= 0 && //texture has some data available
                                 (texture_discard < current_discard || //texture has more data than last rebuild
                                 current_discard < 0)) //no previous rebuild
                         {
-                                gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, FALSE);
+                                markForUpdate(FALSE);
                                 mSculptChanged = TRUE;
                         }
 
                         if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_SCULPTED))
                         {
-                                setDebugText(llformat("T%d C%d V%d\n%dx%d",
+                                setDebugText(llformat("T%d C%d V%d\n%dx%d SA%f",
                                                                                   texture_discard, current_discard, getVolume()->getSculptLevel(),
-                                                                                  mSculptTexture->getHeight(), mSculptTexture->getWidth()));
+                                                                                  mSculptTexture->getHeight(), mSculptTexture->getWidth(), mSculptSurfaceArea));
                         }
                 }
         }
@@ -681,50 +687,25 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &volume_params, const S32 detail
                         mVolumeImpl->onSetVolume(volume_params, detail);
                 }
                 
-                updateSculptTexture();
-
                 if (isSculpted())
                 {
+                        mSculptTexture = gImageList.getImage(volume_params.getSculptID());
                         if (mSculptTexture.notNull())
                         {
                                 sculpt();
+                                mSculptLevel = getVolume()->getSculptLevel();
+                                mSculptSurfaceArea = getVolume()->sculptGetSurfaceArea();
                         }
                 }
-
-                return TRUE;
-        }
-        return FALSE;
-}
-
-void LLVOVolume::updateSculptTexture()
-{
-        LLPointer<LLViewerImage> old_sculpt = mSculptTexture;
-
-        if (isSculpted())
-        {
-                LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
-                LLUUID id =  sculpt_params->getSculptTexture();
-                if (id.notNull())
+                else
                 {
-                        mSculptTexture = gImageList.getImage(id);
+                        mSculptTexture = NULL;
+                        mSculptSurfaceArea = 0.0;
                 }
-        }
-        else
-        {
-                mSculptTexture = NULL;
-        }
 
-        if (mSculptTexture != old_sculpt)
-        {
-                if (old_sculpt.notNull())
-                {
-                        old_sculpt->removeVolume(this);
-                }
-                if (mSculptTexture.notNull())
-                {
-                        mSculptTexture->addVolume(this);
-                }
+                return TRUE;
         }
+        return FALSE;
 }
 
 // sculpt replaces generate() for sculpted surfaces
@@ -737,7 +718,7 @@ void LLVOVolume::sculpt()
                 S8 sculpt_components = 0;
                 const U8* sculpt_data = NULL;
         
-                S32 discard_level = mSculptTexture->getDiscardLevel();
+                S32 discard_level = mSculptTexture->getCachedRawImageLevel() ;
                 LLImageRaw* raw_image = mSculptTexture->getCachedRawImage() ;
                 
                 S32 max_discard = mSculptTexture->getMaxDiscardLevel();
@@ -781,7 +762,7 @@ void LLVOVolume::sculpt()
                 }
                 getVolume()->sculpt(sculpt_width, sculpt_height, sculpt_components, sculpt_data, discard_level);
 
-                //notify rebuild any other VOVolumes that reference this sculpty volume
+                /*//notify rebuild any other VOVolumes that reference this sculpty volume
                 for (S32 i = 0; i < mSculptTexture->getNumVolumes(); ++i)
                 {
                         LLVOVolume* volume = (*(mSculptTexture->getVolumeList()))[i];
@@ -789,7 +770,7 @@ void LLVOVolume::sculpt()
                         {
                                 gPipeline.markRebuild(volume->mDrawable, LLDrawable::REBUILD_GEOMETRY, FALSE);
                         }
-                }
+                }*/
         }
 }
 
@@ -2029,7 +2010,7 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
                 if (face == -1)
                 {
                         start_face = 0;
-                        end_face = volume->getNumFaces();
+                        end_face = volume->getNumVolumeFaces();
                 }
                 else
                 {
@@ -2298,6 +2279,16 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
                 }
 
                 LLVOVolume* vobj = drawablep->getVOVolume();
+
+                if (vobj->mSculptSurfaceArea > sSculptSAThresh)
+                {
+                    LLPipeline::sSculptSurfaceAreaFrame += vobj->mSculptSurfaceArea;
+                    if(LLPipeline::sSculptSurfaceAreaFrame > sSculptSAMax)
+                    {
+                      continue;
+                    }
+                }
+                
                 llassert_always(vobj);
                 vobj->updateTextureVirtualSize();
                 vobj->preRebuild();
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index 7c8a68d..7fba28c 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -171,7 +171,6 @@ public:
                                 void    setTexture(const S32 face);
                                 S32     getIndexInTex() const {return mIndexInTex ;}
         /*virtual*/ BOOL        setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false);
-                                void    updateSculptTexture();
                                 void    setIndexInTex(S32 index) { mIndexInTex = index ;}
                                 void    sculpt();
                                 void    updateRelativeXform();
@@ -233,6 +232,7 @@ private:
         LLFrameTimer mTextureUpdateTimer;
         S32                     mLOD;
         BOOL            mLODChanged;
+        S32         mSculptLevel;
         BOOL            mSculptChanged;
         LLMatrix4       mRelativeXform;
         LLMatrix3       mRelativeXformInvTrans;
diff --git a/linden/indra/newview/llxmlrpctransaction.cpp b/linden/indra/newview/llxmlrpctransaction.cpp
index 675ba42..e0805ee 100644
--- a/linden/indra/newview/llxmlrpctransaction.cpp
+++ b/linden/indra/newview/llxmlrpctransaction.cpp
@@ -236,6 +236,23 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
                 mCurlRequest->setopt(CURLOPT_PROXYPORT, port);
                 mCurlRequest->setopt(CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
         }
+        else if (LLSocks::getInstance()->isHttpProxyEnabled())
+        {
+                std::string address = LLSocks::getInstance()->getHTTPProxy().getIPString();
+                U16 port = LLSocks::getInstance()->getHTTPProxy().getPort();
+                mCurlRequest->setoptString(CURLOPT_PROXY, address.c_str());
+                mCurlRequest->setopt(CURLOPT_PROXYPORT, port);
+                if (LLSocks::getInstance()->getHttpProxyType() == LLPROXY_SOCKS)
+                {
+                        mCurlRequest->setopt(CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
+                        if(LLSocks::getInstance()->getSelectedAuthMethod()==METHOD_PASSWORD)
+                                mCurlRequest->setoptString(CURLOPT_PROXYUSERPWD,LLSocks::getInstance()->getProxyUserPwd());
+                }
+                else
+                {
+                        mCurlRequest->setopt(CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+                }
+        }
 
 //      mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging
         mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
@@ -421,7 +438,7 @@ void LLXMLRPCTransaction::Impl::setStatus(Status status,
                                 mStatusMessage =
                                         "Despite our best efforts, something unexpected has gone wrong. \n"
                                         " \n"
-                                        "Please check " + gHippoGridManager->getCurrentGrid()->getGridNick() + "'s status \n"
+                                        "Please check " + gHippoGridManager->getCurrentGrid()->getGridName() + "'s status \n"
                                         "to see if there is a known problem with the service.";
 
                                 //mStatusURI = "http://secondlife.com/status/";
@@ -432,14 +449,14 @@ void LLXMLRPCTransaction::Impl::setStatus(Status status,
 void LLXMLRPCTransaction::Impl::setCurlStatus(CURLcode code)
 {
         std::string message;
-        std::string uri = gHippoGridManager->getCurrentGrid()->getSupportUrl();
+        std::string uri = gHippoGridManager->getCurrentGrid()->getSupportURL();
         
         switch (code)
         {
                 case CURLE_COULDNT_RESOLVE_HOST:
                         message =
                                 "DNS could not resolve the host name.\n"
-                                "Please verify that you can connect to " + gHippoGridManager->getCurrentGrid()->getGridNick() + "'s\n"
+                                "Please verify that you can connect to " + gHippoGridManager->getCurrentGrid()->getGridName() + "'s\n"
                                 "web site.  If you can, but continue to receive this error,\n"
                                 "please go to the support section and report this problem.";
                         break;
@@ -448,7 +465,7 @@ void LLXMLRPCTransaction::Impl::setCurlStatus(CURLcode code)
                         message =
                                 "The login server couldn't verify itself via SSL.\n"
                                 "If you continue to receive this error, please go\n"
-                                "to the Support section of " + gHippoGridManager->getCurrentGrid()->getGridNick() + "'s web site\n"
+                                "to the Support section of " + gHippoGridManager->getCurrentGrid()->getGridName() + "'s web site\n"
                                 "and report the problem.";
                         break;
                         
@@ -460,7 +477,7 @@ void LLXMLRPCTransaction::Impl::setCurlStatus(CURLcode code)
                                 "are set correctly.\n"
                                 "\n"
                                 "If you continue to receive this error, please go\n"
-                                "to the Support section of " + gHippoGridManager->getCurrentGrid()->getGridNick() + "'s web site\n"
+                                "to the Support section of " + gHippoGridManager->getCurrentGrid()->getGridName() + "'s web site\n"
                                 "and report the problem.";
                         break;
                         
diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index a868ee2..c94c0d1 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -32,6 +32,7 @@
 #include "llagent.h"
 #include "llchat.h"
 #include "llfloateravatarinfo.h"
+#include "llfloateravatarlist.h"
 #include "llfloaterchat.h"
 #include "llfloaterfriends.h"
 #include "llfloatergroupinvite.h"
@@ -95,6 +96,7 @@ BOOL PanelRadar::postBuild()
         //childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
         //childSetAction("estate_ban_btn", onClickBanFromEstate, this);
         childSetAction("ban_btn", onClickBan, this);
+        childSetAction("full_radar_btn", onClickFullRadar, this);
 
         setDefaultBtn("im_btn");
 
@@ -1025,6 +1027,13 @@ void PanelRadar::onClickAR(void* user_data)
 }
 
 
+// static
+void PanelRadar::onClickFullRadar(void* user_data)
+{
+        LLFloaterAvatarList::toggle(NULL);
+}
+
+
 //static
 /* Don't use until the UI can be worked out
 void PanelRadar::onClickBanFromEstate(void* user_data)
diff --git a/linden/indra/newview/panelradar.h b/linden/indra/newview/panelradar.h
index 59e6aff..ff5912c 100644
--- a/linden/indra/newview/panelradar.h
+++ b/linden/indra/newview/panelradar.h
@@ -108,6 +108,7 @@ private:
         static void onClickAR(void* user_data);
         //static void onClickEjectFromEstate(void* user_data); Not working yet
         //static void onClickBanFromEstate(void* user_data);
+        static void onClickFullRadar(void* user_data);
 
         static void callbackAR(void* user_data);
         static bool     callbackFreeze(const LLSD& notification, const LLSD& response);
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 5458af5..ae0e605 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -257,7 +257,8 @@ BOOL	LLPipeline::sRenderFrameTest = FALSE;
 BOOL    LLPipeline::sRenderAttachedLights = TRUE;
 BOOL    LLPipeline::sRenderAttachedParticles = TRUE;
 BOOL    LLPipeline::sRenderDeferred = FALSE;
-S32             LLPipeline::sVisibleLightCount = 0;
+S32     LLPipeline::sVisibleLightCount = 0;
+F32     LLPipeline::sSculptSurfaceAreaFrame = 0.0;
 
 static LLCullResult* sCull = NULL;
 
@@ -2198,6 +2199,8 @@ void LLPipeline::postSort(LLCamera& camera)
         LLFastTimer ftm(LLFastTimer::FTM_STATESORT_POSTSORT);
 
         assertInitialized();
+        
+        sSculptSurfaceAreaFrame = 0.0;
 
         //rebuild drawable geometry
         for (LLCullResult::sg_list_t::iterator i = sCull->beginDrawableGroups(); i != sCull->endDrawableGroups(); ++i)
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h
index 1ecb56e..2252fbd 100644
--- a/linden/indra/newview/pipeline.h
+++ b/linden/indra/newview/pipeline.h
@@ -579,6 +579,8 @@ protected:
 public:
         static BOOL                             sRenderBeacons;
         static BOOL                             sRenderHighlight;
+        static F32                              sSculptSurfaceAreaFrame;
+
 };
 
 void render_bbox(const LLVector3 &min, const LLVector3 &max);
diff --git a/linden/indra/newview/skins/default/xui/da/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/da/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/da/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/de/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/de/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 0424b72..1ea4574 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -726,6 +726,10 @@ To buy direct, visit the land and click on the place name in the title bar.
                              mouse_opaque="true" name="result_text" v_pad="0" width="328" />
                 </panel>
         </tab_container>
+  <check_box name="save_results_check" label="Save search results"
+       bottom="-37" right="-80"  height="16" width="80"
+       follows="right|top" font="SansSerifSmall" control_name="SaveSearchResults"
+       initial_value="false" mouse_opaque="true" />
         <panel bottom="-580" follows="right|top" height="490" left="340"
              name="classified_details_panel" width="440" />
         <panel bottom="-580" follows="right|top" height="506" left="350" name="Panel Avatar"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml b/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
index 3c26d30..157588d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_grid_default_selector.xml
@@ -7,10 +7,11 @@
     Or use the Grid Manager to add a new one
   </text>
   <scroll_list background_visible="true" bottom_delta="30" draw_border="true"
-      draw_stripes="false" sort_column="0"
+      draw_stripes="false" sort_column="1"
       follows="top|left|bottom" height="280" left="10" multi_select="false"
       name="grid_list" width="240">
-    <column label="" name="grid" width="230" />
+    <column label="" name="grid_nick" width="0" />
+    <column label="" name="grid_name" width="230" />
   </scroll_list>
   <button bottom="5" follows="bottom|right" height="20" label="Cancel"
       right="-5" name="btn_cancel" width="85" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml b/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml
index f635d59..bc07373 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml
@@ -1,90 +1,112 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="true" height="400" min_height="400" min_width="600"
+     can_resize="true" height="420" min_height="420" min_width="600"
      name="floater_login" title="Grid Manager" width="600">
 
-  <!-- Grid Selector -->
+  <!-- GRID LIST -->
+  
   <text type="string" length="1" enabled="true" name="grid_selector_label"
-                height="16" width="100" left="10" top="-18"
-                h_pad="0" v_pad="0" halign="left"
-                font="SansSerif"
-                follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+                  height="16" width="100" left="10" top="-18"
+                  h_pad="0" v_pad="0" halign="left"
+                  font="SansSerif"
+                  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
             drop_shadow_visible="true" border_drop_shadow_visible="false">
     Select a Grid:
   </text>
   
   <scroll_list background_visible="true" bottom_delta="65" draw_border="true"
-             draw_stripes="false" sort_column="0"
-             follows="top|left|bottom" height="300" left="10" multi_select="false"
-             name="grid_selector" width="170">
-    <column label="Grid List" name="grid" width="170" />
+             draw_stripes="false" sort_column="1"
+             follows="top|left|bottom" height="320" left="10" multi_select="false"
+             name="grid_selector" width="200">
+    <column label="Grid List" name="grid_nick" width="0" />
+    <column label="Grid List" name="grid_name" width="200" />
   </scroll_list>
   
-  <!-- Grid Selector Buttons -->
+  <!-- GRID BUTTONS -->
+  
   <button label="Add New Grid" enabled="true" name="btn_add"
-                height="18" width="150" left="10" bottom_delta="-22"
-                halign="center"
-                follows="left|bottom" scale_image="true"
+                  height="18" width="150" left="35" bottom_delta="-22"
+                  halign="center"
+                  follows="left|bottom" scale_image="true"
             font="SansSerifSmall" mouse_opaque="true" />
   <button label="Duplicate Grid" enabled="true" name="btn_copy"
-                height="18" width="150" left_delta="0" bottom_delta="-20"
-                halign="center"
-                follows="left|bottom" scale_image="true"
+                  height="18" width="150" left_delta="0" bottom_delta="-20"
+                  halign="center"
+                  follows="left|bottom" scale_image="true"
             font="SansSerifSmall" mouse_opaque="true" />
   <button label="Delete Grid" enabled="true" name="btn_delete"
-                height="18" width="150" left_delta="0" bottom_delta="-20"
-                halign="center"
-                follows="left|bottom" scale_image="true"
+                  height="18" width="150" left_delta="0" bottom_delta="-20"
+                  halign="center"
+                  follows="left|bottom" scale_image="true"
             font="SansSerifSmall" mouse_opaque="true" />
 
-  <!-- Grid Details -->
+  <!-- GRID NAME AND NICK -->
+  
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="365" drop_shadow_visible="true" follows="left|top"
+       font="SansSerif" h_pad="0" halign="left" height="16"
+       left="220" mouse_opaque="true" name="gridnick_text" v_pad="0" width="120">
+    Grid nick (unique):
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" 
+             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" max_height="20" left_delta="110" max_length="40" mouse_opaque="true"
+             name="gridnick" select_all_on_focus_received="true" width="260" label="required" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     top="-45" drop_shadow_visible="true" follows="left|top"
-     font="SansSerif" h_pad="0" halign="left" height="16"
-     left="195" mouse_opaque="true" name="gridnick_text" v_pad="0" width="120">
+       bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+       font="SansSerif" h_pad="0" halign="left" height="16"
+       left="220" mouse_opaque="true" name="gridname_text" v_pad="0" width="120">
     Grid name:
   </text>
-  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="335" 
-             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" max_height="20" left_delta="90" max_length="40" mouse_opaque="true"
-             name="gridnick" select_all_on_focus_received="true" width="300" />
-
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" max_height="20" left_delta="110" max_length="40" mouse_opaque="true"
+             name="gridname" select_all_on_focus_received="true" width="260" label="required" />
 
-  <!--
+  <!-- NAME AND PASSWORD -->
+  
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+             bottom="315" drop_shadow_visible="true" follows="left|top"
              font="SansSerif" h_pad="0" halign="left" height="16"
-             left_delta="-90" mouse_opaque="true" name="first_name_text" v_pad="0" width="100">
-                First Name:
-        </text>
+             left="220" mouse_opaque="true" name="first_name_text" v_pad="0" width="100">
+    First Name:
+  </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-   follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-   height="20" left_delta="90" max_length="45" mouse_opaque="true"
-   name="first_name" select_all_on_focus_received="true" width="200" />
-
+       follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+       height="20" left_delta="110" max_length="45" mouse_opaque="true"
+       name="first_name" select_all_on_focus_received="true" width="200" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+       bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+       font="SansSerif" h_pad="0" halign="left" height="16"
+       left_delta="-110" mouse_opaque="true" name="username_text" v_pad="0" width="100">
+    Username:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+       follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+       height="20" left_delta="110" max_length="45" mouse_opaque="true"
+       name="username" select_all_on_focus_received="true" width="200" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
              font="SansSerif" h_pad="0" halign="left" height="16"
-             left_delta="-90" mouse_opaque="true" name="last_name_text" v_pad="0" width="100">
+             left_delta="-110" mouse_opaque="true" name="last_name_text" v_pad="0" width="100">
     Last Name:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-   follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-   height="20" left_delta="90" max_length="45" mouse_opaque="true"
-   name="last_name" select_all_on_focus_received="true" width="200" />
-
+       follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+       height="20" left_delta="110" max_length="45" mouse_opaque="true"
+       name="last_name" select_all_on_focus_received="true" width="200" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
              font="SansSerif" h_pad="0" halign="left" height="16"
-             left_delta="-90" mouse_opaque="true" name="avatar_password_text" v_pad="0" width="120">
-                Password:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             left_delta="-110" mouse_opaque="true" name="avatar_password_text" v_pad="0" width="120">
+    Password:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="16" mouse_opaque="true"
+             height="20" left_delta="110" max_length="16" mouse_opaque="true"
              name="avatar_password" select_all_on_focus_received="true" width="200" />
 
-  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <!--<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
              font="SansSerif" h_pad="0" halign="left" height="16"
              left_delta="-90" mouse_opaque="true" name="start_location_text" v_pad="0"
@@ -105,112 +127,110 @@
     </combo_item>
   </combo_box>
   -->
+  
+  <!-- LOGIN URI STUFF -->
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
         bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
         font="SansSerif" h_pad="0" halign="left" height="16"
-        left_delta="-90" mouse_opaque="true" name="loginuri_text" v_pad="0" width="120">
+        left_delta="-110" mouse_opaque="true" name="loginuri_text" v_pad="0" width="120">
     Login URI:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
               follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
-              height="20" left_delta="90" max_length="255" mouse_opaque="true"
-              name="loginuri" select_all_on_focus_received="true" width="300" />
+              height="20" left_delta="110" max_length="255" mouse_opaque="true"
+              name="loginuri" select_all_on_focus_received="true" width="260" label="required" />
 
   <button label="Get Grid Info" enabled="true" name="btn_gridinfo"
-        height="18" width="100" bottom_delta="-25" left_delta="0" 
+        height="18" width="100" bottom_delta="-38" left_delta="0" 
         halign="center" follows="left|top" scale_image="true"
         font="SansSerifSmall" mouse_opaque="true" />
   <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
         height="18" label="Clear Info" left_delta="104"
         mouse_opaque="true" name="btn_clear" scale_image="true" width="100" />
 
+  <!-- LOGIN URI RETURN URLS-->
+  
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-      bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
-      font="SansSerif" h_pad="0" halign="left" height="16"
-      left="195" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
-    Grid Info URLs:
-  </text>
-  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-28" drop_shadow_visible="true" follows="left|top"
-     font="SansSerifSmall" h_pad="0" halign="left" height="16"
-     left="205" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
+       bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       left="230" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
     Login page:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="loginpage" select_all_on_focus_received="true" width="280" />
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
+             name="loginpage" select_all_on_focus_received="true" width="250" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-     font="SansSerifSmall" h_pad="0" halign="left" height="16"
-     left_delta="-90" mouse_opaque="true" name="helperuri_text" v_pad="0" width="120">
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       left_delta="-100" mouse_opaque="true" name="helperuri_text" v_pad="0" width="120">
     Helper URI:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="helperuri" select_all_on_focus_received="true" width="280" />
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
+             name="helperuri" select_all_on_focus_received="true" width="250" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerifSmall" h_pad="0" halign="left" height="16"
-   left_delta="-90" mouse_opaque="true" name="website_text" v_pad="0" width="120">
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       left_delta="-100" mouse_opaque="true" name="website_text" v_pad="0" width="120">
     Website:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="website" select_all_on_focus_received="true" width="280" />
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
+             name="website" select_all_on_focus_received="true" width="250" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerifSmall" h_pad="0" halign="left" height="16"
-   left_delta="-90" mouse_opaque="true" name="support_text" v_pad="0" width="120">
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       left_delta="-100" mouse_opaque="true" name="support_text" v_pad="0" width="120">
     Support:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="support" select_all_on_focus_received="true" width="280" />
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
+             name="support" select_all_on_focus_received="true" width="250" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerifSmall" h_pad="0" halign="left" height="16"
-   left_delta="-90" mouse_opaque="true" name="register_text" v_pad="0" width="120">
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       left_delta="-100" mouse_opaque="true" name="register_text" v_pad="0" width="120">
     Account:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="register" select_all_on_focus_received="true" width="280" />
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
+             name="register" select_all_on_focus_received="true" width="250" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerifSmall" h_pad="0" halign="left" height="16"
-   left_delta="-90" mouse_opaque="true" name="password_text" v_pad="0" width="120">
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       left_delta="-100" mouse_opaque="true" name="password_text" v_pad="0" width="120">
     Password:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="password" select_all_on_focus_received="true" width="280" />
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
+             name="password" select_all_on_focus_received="true" width="250" />
 
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-   font="SansSerifSmall" h_pad="0" halign="left" height="16"
-   left_delta="-90" mouse_opaque="true" name="websearch_text" v_pad="0" width="120">
+       bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16"
+       left_delta="-100" mouse_opaque="true" name="search_text" v_pad="0" width="120">
     Web Search:
   </text>
   <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
              follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
-             height="20" left_delta="90" max_length="255" mouse_opaque="true"
-             name="search" select_all_on_focus_received="true" width="280" />
+             height="20" left_delta="100" max_length="255" mouse_opaque="true"
+             name="search" select_all_on_focus_received="true" width="250" />
 
   <view_border bevel_style="none" border_thickness="1" bottom_delta="-10" 
-               follows="top|left|right" height="168" left="195" 
-               name="OptionalPrefsBorder" width="390" />
+       follows="top|left|right" height="193" left="220" 
+       name="OptionalPrefsBorder" width="370" />
 
   <!-- Combo box for multi avatar grid manager avatar name
         <combo_box allow_text_entry="true" bevel_style="in" border_style="line" border_thickness="1"
@@ -236,39 +256,32 @@
              initial_value="false" label="Global Avatar"
              left_delta="0" mouse_opaque="true" name="global_check" width="138" />
 
-  <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
+  <check_box bottom="10" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Remember password"
              left_delta="165" mouse_opaque="true" name="remember_check" width="138" />
   
-  <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
+  <check_box bottom="10" follows="left|top" font="SansSerifSmall" height="16"
      initial_value="false" label="secret level"
      left_delta="165" mouse_opaque="true" name="gawd_mode" width="138" />
   -->
 
   <!-- Cancel/Connect Buttons -->
 
-  <!--
-  <button bottom="-44" follows="right|top" font="SansSerif" halign="center"
-             height="24" label="Set as Default" label_selected="Set as Default"
-             left="470" mouse_opaque="true" name="set_default" scale_image="TRUE"
-             width="110" />
-  -->
-
   <!-- <button bottom="28" follows="right|bottom" font="SansSerif" halign="center"
              height="24" label="Connect" label_selected="Connect"
              left="280" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
              width="100" />  -->
   <button bottom="2" follows="right|bottom" font="SansSerif" halign="center"
-     height="24" label="Apply" label_selected="Apply" left="-108"
-     mouse_opaque="true" name="btn_apply" scale_image="TRUE" width="100" />
+       height="24" label="Apply" label_selected="Apply" left="-108"
+       mouse_opaque="true" name="btn_apply" scale_image="TRUE" width="100" />
   <button bottom="2" follows="right|bottom" font="SansSerif" halign="center"
-     height="24" label="Cancel" label_selected="Cancel" left_delta="-104"
-     mouse_opaque="true" name="btn_cancel" scale_image="TRUE" width="100" />
+       height="24" label="Cancel" label_selected="Cancel" left_delta="-104"
+       mouse_opaque="true" name="btn_cancel" scale_image="TRUE" width="100" />
   <button bottom="2" follows="right|bottom" font="SansSerif" halign="center"
-     height="24" label="OK" label_selected="OK" left_delta="-104"
-     mouse_opaque="true" name="btn_ok" scale_image="TRUE" width="100" />
+       height="24" label="OK" label_selected="OK" left_delta="-104"
+       mouse_opaque="true" name="btn_ok" scale_image="TRUE" width="100" />
   <!--
-        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
+        <combo_box allow_text_entry="true" bottom="32" follows="left|top" height="18"
              left_delta="135" max_chars="40" mouse_opaque="true"
              name="server_combo" width="200" />
   -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
index fbb1133..5e9cacd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inspect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     min_height="300" min_width="400" name="inspect"
+     min_height="300" min_width="550" name="inspect"
      rect_control="FloaterInspectRect" title="Inspect Objects">
         <scroll_list bottom="30" can_resize="false" column_padding="0" draw_heading="true"
              follows="top|right|left|bottom" left="10" multi_select="false"
@@ -9,16 +9,26 @@
              top="-20">
                 <column dynamicwidth="true" label="Object Name" name="object_name" />
                 <column dynamicwidth="true" label="Owner Name" name="owner_name" />
+                <column dynamicwidth="true" label="Last Owner Name" name="last_owner_name" />
                 <column dynamicwidth="true" label="Creator Name" name="creator_name" />
+                <column label="Faces" name="face_num" width="70" />
+                <column label="Vertices" name="vertex_num" width="70" />
+                <column label="Scripts" name="script_num" width="70" />
+                <column label="Inv Total" name="inv_num" width="70" />
                 <column label="Creation Date" name="creation_date" width="150" />
         </scroll_list>
         <button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
-             label="See Owner Profile..." label_selected="" left="10"
+             label="Owner Profile" label_selected="" left="10"
              mouse_opaque="true" name="button owner"
-             tool_tip="See profile of the highlighted object&apos;s owner" width="150" />
+             tool_tip="See profile of the highlighted object&apos;s owner" width="130" />
         <button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
-             label="See Creator Profile..." label_selected="" left="170"
+             label="Last Owner Profile" label_selected="" left="150"
+             mouse_opaque="true" name="button_last_owner"
+             tool_tip="See profile of the highlighted object&apos;s last owner"
+             width="130" />
+        <button bottom="5" follows="left|bottom" font="SansSerif" halign="center" height="20"
+             label="Creator Profile" label_selected="" left="290"
              mouse_opaque="true" name="button creator"
              tool_tip="See profile of the highlighted object&apos;s original creator"
-             width="150" />
+             width="130" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml b/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml
new file mode 100644
index 0000000..7db7330
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_radar.xml
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="radar" title="Radar"
+        can_resize="true" can_minimize="true" can_close="true" can_drag_on_left="false"
+        rect_control="FloaterRadarRect" min_width="300" min_height="300">
+
+        <scroll_list name="avatar_list"
+                    left="10" right="-10" top="-20" bottom="140" can_resize="true"
+                    column_padding="0" follows="left|top|bottom|right"
+                    draw_heading="true" multi_select="true" search_column="1"
+                    tool_tip="Hold shift or control while clicking to select multiple avatars">
+                <column name="marked" label="Mark" width="12" tool_tip="Marked avatars"/>
+                <column name="avatar_name" label="Name" dynamicwidth="true" tool_tip="Hold shift or control while clicking to select multiple avatars"/>
+                <column name="distance" label="Dist." width="48" tool_tip="Distance from your avatar (red=within chat range, yellow=within shout range, green=within draw distance)"/>
+                <column name="position" label="Pos." width="60" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/>
+                <column name="altitude" label="Alt." width="48" tool_tip="Altitude"/>
+        </scroll_list>
+
+        <tab_container border="false" bottom_delta="-130" height="120" left="6" mouse_opaque="false"
+                       name="actions_tab_container" tab_position="top" follows="left|right|bottom">
+                <panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
+                       label="Avatar" left="1" mouse_opaque="true"
+                     name="actions_tab" width="398">
+                        <!-- upper row -->
+                        <button
+                               name="profile_btn"
+                               label="Profile"
+                               tool_tip="Show picture, groups, and other information"
+                               left="10"
+                               bottom_delta="-180"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="track_btn"
+                               label="(Un)Track"
+                               tool_tip="Toggle tracking of this avatar's position"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="get_key_btn"
+                               label="Get Key"
+                               tool_tip="Copies avatar's key to the clipboard"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <!-- upper middle row -->
+                        <button
+                               name="im_btn"
+                               label="IM"
+                               tool_tip="Open Instant Message session"
+                               left="10"
+                               bottom_delta="-22"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="offer_btn"
+                               label="Offer TP"
+                               tool_tip="Offer Teleport"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="teleport_btn"
+                               label="TP to"
+                               tool_tip="Teleport to avatar's position"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />                       
+                        <!-- lower middle row-->
+                        <button
+                               name="mark_btn"
+                               label="(Un)Mark"
+                               tool_tip="(Un)Mark this avatar in the list"
+                               left="10"
+                               bottom_delta="-22"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="prev_marked_btn"
+                               label="Prev Marked"
+                               tool_tip="Focus camera on previous marked avatar"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="next_marked_btn"
+                               label="Next Marked"
+                               tool_tip="Focus camera on next marked avatar"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <!-- lower row-->
+                        <button
+                               name="focus_btn"
+                               label="Focus"
+                               tool_tip="Focus camera on this avatar in the list"
+                               left="10"
+                               bottom_delta="-22"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="prev_in_list_btn"
+                               label="Previous"
+                               tool_tip="Focus camera on previous avatar in list"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="next_in_list_btn"
+                               label="Next"
+                               tool_tip="Focus camera on next avatar in list"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+
+                </panel>
+
+                <panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
+                       label="Alerts" left="1" mouse_opaque="true"
+                       name="alerts_tab" width="398">
+                        <check_box height="16" label="Display alerts in chat"
+                                   left="10" bottom_delta="-176" name="radar_alerts" 
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false" 
+                                   control_name="RadarChatAlerts"
+                                   tool_tip="Announce alerts about incoming and outgoing avatars in chat" />
+
+                        <check_box height="16" label="Avatars entering/exiting the sim"
+                                   left="20" bottom_delta="-18" name="alerts_sim"
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false"
+                                   control_name="RadarAlertSim"
+                                   tool_tip="Report avatars entering or exiting the sim" />
+
+                        <check_box height="16" label="Avatars within/beyond the draw distance"
+                                   left="20" bottom_delta="-18" name="alerts_draw"
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false"
+                                   control_name="RadarAlertDraw"
+                                   tool_tip="Report avatars getting within or beyond the draw distance" />
+
+                        <check_box height="16" label="Avatars within/beyond the shout range"
+                                   left="20" bottom_delta="-18" name="alerts_chat"
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false"
+                                   control_name="RadarAlertShoutRange"
+                                   tool_tip="Report avatars getting within or beyond the shout range" />
+
+                        <check_box height="16" label="Avatars within/beyond the chat range"
+                                   left="20" bottom_delta="-18" name="alerts_chat"
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false"
+                                   control_name="RadarAlertChatRange"
+                                   tool_tip="Report avatars getting within or beyond the chat range" />
+                </panel>
+
+                <panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
+                       label="Moderation" left="1" mouse_opaque="true"
+                       name="land_tab" width="398">
+                        
+                        <!-- Upper row -->
+                        <button
+                               name="mute_btn"
+                               label="(Un)Mute"
+                               tool_tip="Mute or unmute this avatar (muted avatars' names are highlighted in red in the list)."
+                               left="10"
+                               bottom_delta="-200"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="freeze_btn"
+                               label="Freeze"
+                               tool_tip="Freeze the avatar, preventing it from moving"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <button
+                               name="ar_btn"
+                               label="AR"
+                               tool_tip="Report abuse on this avatar"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        <!-- Lower row -->
+                        <button
+                               name="eject_btn"
+                               label="Eject"
+                               tool_tip="Eject the avatar from the parcel"
+                               left="10"
+                               bottom_delta="-24"
+                               width="80"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                        
+                        <button
+                               name="estate_eject_btn"
+                               label="Eject from estate"
+                               tool_tip="Eject this avatar from the estate"
+                               left_delta="90"
+                               bottom_delta="0"
+                               width="170"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                </panel>
+
+                <panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
+                       label="Options" left="1" mouse_opaque="true"
+                       name="options_tab" width="398">
+                        <check_box height="16" label="Update"
+                                   left="10" bottom_delta="-180" name="update_enabled_cb" 
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false" 
+                                   tool_tip="Set whether the avatar list should update" />
+                        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                                   bottom_delta="-24" drop_shadow_visible="true" enabled="true" font="SansSerifSmall" height="18" left="24"
+                                   mouse_opaque="false" name="rate" width="30">
+                                        Rate:
+                        </text>
+                        <radio_group draw_border="true" bottom_delta="2" left_delta="44" follows="bottom|left" width="196" height="20"
+                                   mouse_opaque="true" name="update_rate" control_name="RadarUpdateRate" enabled="true"
+                                   tool_tip="Rate of the radar updates (eats up more FPS when higher)">
+                                <radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="4" mouse_opaque="true"
+                                        name="high" width="20" follows="bottom|left">
+                                        High
+                                </radio_item>
+                                <radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="30" mouse_opaque="true"
+                                        name="medium" width="25" follows="bottom|left">
+                                        Medium
+                                </radio_item>
+                                <radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="35" mouse_opaque="true"
+                                        name="low" width="20" follows="bottom|left">
+                                        Low
+                                </radio_item>
+                        </radio_group>
+                        <check_box height="16" label="Announce even when closed"
+                                   left="10" bottom_delta="-24" name="keep_open"
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false"
+                                   control_name="RadarKeepOpen"
+                                   tool_tip="Hides floater instead of closing to still announce in chat" />
+                        <check_box height="16" label="Announce keys to HUD"
+                                   left="10" bottom_delta="-20" name="radar_chat_keys" 
+                                   width="200" follows="bottom|left"
+                                   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+                                   initial_value="true" enabled="true" radio_style="false" 
+                                   control_name="RadarChatKeys"
+                                   tool_tip="Set whether to send keys of avatars to LSL scripts" />
+                        <button
+                               name="send_keys_btn"
+                               label="Announce now"
+                               tool_tip="Send all keys to HUD now"
+                               left_delta="150"
+                               bottom_delta="-2"
+                               width="100"
+                               height="20"
+                               font="SansSerifSmall"
+                               follows="bottom|left"
+                               />
+                </panel>
+        </tab_container>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
index a8c0840..1dc8a5e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_settings_debug.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="215" name="settings_debug"
+     can_resize="false" height="235" name="settings_debug"
      title="Debug Settings" width="350">
-        <combo_box allow_text_entry="true" bottom="-50" follows="top|left" font="SansSerifSmall"
+  <search_editor bottom="-45" height="20" name="control_search" visible="true" width="320" 
+                 left="15" label="Type here to search" />
+        <combo_box allow_text_entry="false" bottom_delta="-30" follows="top|left" font="SansSerifSmall"
              height="20" left="15" max_chars="255" name="settings_combo" />
-        <text_editor bottom_delta="-75" enabled="false" height="60" width="320" hide_scrollbar="true"
+        <text_editor bottom_delta="-70" enabled="false" height="60" width="320" hide_scrollbar="true"
              name="comment_text" word_wrap="true" />
         <combo_box bottom_delta="-30" follows="top|left" font="SansSerifSmall" height="20"
              left="15" name="boolean_combo" visible="false">
@@ -15,7 +17,7 @@
                         FALSE
                 </combo_item>
         </combo_box>
-        <line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="300" />
+        <line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="320" />
         <color_swatch bottom="30" can_apply_immediately="true" height="55" label="Color"
              name="color_swatch" visible="true" width="37" />
         <spinner bottom_delta="25" height="20" label="x" label_width="40" max_val="10000000"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index c665563..3f476cf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -908,12 +908,12 @@
                                 Slice Begin and End:
                         </text>
                         <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.025" initial_val="0" label="B" label_width="10" left="121"
-                             max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
+                             increment="0.02" initial_val="0" label="B" label_width="10" left="121"
+                             max_val="0.98" min_val="0" mouse_opaque="true" name="Path Limit Begin"
                              width="68" />
                         <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.025" initial_val="1" label="E" label_width="10" left_delta="73"
-                             max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
+                             increment="0.02" initial_val="1" label="E" label_width="10" left_delta="73"
+                             max_val="1" min_val="0.02" mouse_opaque="true" name="Path Limit End"
                              width="68" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/en-us/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
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 93ebd1c..626e6e7 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
@@ -1063,6 +1063,10 @@
       <on_click function="ShowFloater" userdata="animation list" />
       <on_check function="FloaterVisible" userdata="animation list" />
     </menu_item_check>
+    <menu_item_check label="Full Radar" name="Full Radar">
+      <on_click function="ShowFloater" userdata="full radar" />
+      <on_check function="FloaterVisible" userdata="full radar" />
+    </menu_item_check>
                 <menu_item_check label="Area Object Search" name="Area Object Search" 
                      shortcut="alt|A">
                         <on_click function="ShowFloater" userdata="areasearch" />
@@ -2044,13 +2048,6 @@
         <on_click function="Advanced.DumpAttachments"
                   userdata="" />
       </menu_item_call>
-      <menu_item_call
-              label="Reload Avatar Cloud Particle"
-              name="Reload Avatar Cloud Particle">
-                <on_click
-                 function="Advanced.ReloadAvatarCloudParticle"
-                 userdata="" />
-      </menu_item_call>
     </menu>
 
     <!-- CRASH -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
index 26491e0..5217dbe 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
@@ -439,8 +439,8 @@
                         movie
                 </widgettype>
                 <impl>
-                        media_plugin_gstreamer
-                </impl>
+      media_plugin_quicktime
+    </impl>
         </mimetype>
         <mimetype menu="1" name="video/quicktime">
                 <label name="video/quicktime_label">
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 97a020d..9ff00a4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7135,11 +7135,14 @@ You need to specify a unique grid nickname.
 
 <notification
  icon="alertmodal.tga"
- name="GridsNoLoginUri"
+ name="GridInfoDirty"
  type="alertmodal">
-Cannot save new grid '[NAME]'.
-
-You need to specify a login URI.
+You have unsaved changes that will be lost. Continue?
+  <usetemplate
+   ignoretext="When creating new grids"
+   name="okcancelignore"
+   notext="Cancel"
+   yestext="Continue"/>
 </notification>
 
 <notification
@@ -7152,6 +7155,13 @@ A grid with the same nickname already exists.
 </notification>
 
 <notification
+  icon="alertmodal.tga"
+  name="GridInfoNoLoginUri"
+  type="alertmodal">
+  A login URI is required to retrieve the grid info.
+</notification>
+  
+<notification
  icon="alertmodal.tga"
  name="GridInfoNoLoginUri"
  type="alertmodal">
@@ -7195,6 +7205,20 @@ If you don't have an account, would you like to create one now?
 </notification>
 
 <notification
+  icon="alertmodal.tga"
+  name="InvalidPassword"
+  type="alertmodal">
+You have entered an invalid password! Please try again.
+</notification>
+  
+<notification
+   icon="notifytip.tga"
+   name="IncompleteInventoryItem"
+   type="notifytip">
+The item you are accessing is not yet locally available. Please try again in a minute.
+</notification>
+  
+<notification
  icon="alert.tga"
  name="ShowLookAtInfo"
  type="alert">
@@ -7372,6 +7396,62 @@ Media/audio URL blocked for [DOMAIN]
 The media filters have been cleared
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ProxyNeedRestart"
+   type="alertmodal">
+Socks proxy settings will take effect after you restart [VIEWER_NAME].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_CONNECT_OK"
+   type="alertmodal">
+Connection to Socks5 proxy [PROXY] was successful.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_PERMITTED"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the connection, not allowed by rule set
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_CONNECT_ERROR"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the connection, could not open TCP channel
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_ACCEPTABLE"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the selected authentication system
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_AUTH_FAIL"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" reported your credentials are invalid
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_UDP_FWD_NOT_GRANTED"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the UDP associate request
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="SOCKS_HOST_CONNECT_FAILED"
+   type="alert">
+Could not connect to Socks5 proxy server "[PROXY]"
+  </notification>
+
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
   <notification
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_particle_settings.xml b/linden/indra/newview/skins/default/xui/en-us/panel_particle_settings.xml
new file mode 100644
index 0000000..c1e1da9
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_particle_settings.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Particle Settings"
+left="1" mouse_opaque="true" name="ParticleSettings" width="418">
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                bottom_delta="-36" drop_shadow_visible="true" enabled="true" follows="left|top"
+                font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                mouse_opaque="true" name="part_start_color_textbox" v_pad="0" width="394">
+                Start Color:
+        </text>
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
+                can_apply_immediately="true" color="1 1 1 1"
+                enabled="true" follows="left|top" height="55" label="" left_delta="53"
+                mouse_opaque="true" name="part_start_color_swatch"
+                tool_tip="Click to open Color Picker" width="45" />
+        <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="10" left="10"
+                mouse_opaque="true" name="part_end_color_textbox" v_pad="0" width="394">
+                End Color:
+        </text>
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
+                can_apply_immediately="true" color="1 1 1 1"
+                enabled="true" follows="left|top" height="55" label="" left_delta="53"
+                mouse_opaque="true" name="part_end_color_swatch"
+                tool_tip="Click to open Color Picker" width="45" />
+        <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="10" left="10"
+                mouse_opaque="true" name="part_texture_textbox" v_pad="0" width="394">
+                Texture:
+        </text>
+
+        <texture_picker  border_color="0.45098 0.517647 0.607843 1" bottom_delta="-44"
+                can_apply_immediately="true" color="1 1 1 1"
+                enabled="true" follows="left|top" height="55" label="" left_delta="53"
+                mouse_opaque="true" name="part_texture_picker"
+                tool_tip="Click to open Texture Chooser" width="45" />
+        <button name="reset_cloud_this_account" label="reset for this account" halign="center"
+                tool_tip="reset the Avatar particle cloud to default for this account" left="12"
+                bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
+        <button name="save_cloud_this_account" label="save for this account" halign="center"
+                tool_tip="save the Avatar particle cloud for this account" left="12"
+                bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
+        <button name="save_cloud_any_account" label="save for any account" halign="center"
+                tool_tip="save the Avatar particle cloud for any account" left="12"
+                bottom_delta="-24" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
+</panel>
+
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index b8f6e7d..3b66fb8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -24,16 +24,21 @@
           name="client_name_tag_check" radio_style="false" width="160" />
       <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
-           label="Show client names with color" left_delta="0" mouse_opaque="true"
-           name="client_name_color_check" radio_style="false" width="160" />
-      <check_box bottom_delta="-18" enabled="true" follows="left|top"
-           font="SansSerifSmall" height="16" initial_value="false"
            label="Show client names in hovertip" left_delta="0" mouse_opaque="true"
            name="client_name_hover_check" radio_style="false" width="160" />
       <check_box bottom_delta="-18" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
            label="Show your client name to others" left_delta="0" mouse_opaque="true"
            name="client_name_tag_broadcast_check" radio_style="false" width="217" />
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-122"
+           can_apply_immediately="true" color="0.79 0.44 0.88 1"
+           enabled="true" follows="left|top"
+           height="65" label="Imprudence" left="250" mouse_opaque="true"
+           name="client_tag_color" width="65" />
+      <check_box bottom_delta="-18" enabled="true" follows="left|top"
+           font="SansSerifSmall" height="16" initial_value="false"
+           label="Show client names with color" left_delta="0" mouse_opaque="true"
+           name="client_name_color_check" radio_style="false" width="160" />
       <check_box bottom_delta="-25" enabled="true" follows="left|top"
            font="SansSerifSmall" height="16" initial_value="false"
            label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
@@ -77,6 +82,11 @@
            tool_tip="Toggle editing animation and standing up when entering appearance mode" 
            label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
            name="appearance_anim_check" radio_style="false" width="217" />
+      <check_box bottom_delta="-25" control_name="HeadFollowsMouse" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" 
+           label="Head follows mouse" tooltip="If your avatars head follows your mouse movements" left="12"
+           mouse_opaque="true" name="head_follows_mouse_checkbox" radio_style="false"
+           width="256" />
       <check_box bottom_delta="-25" enabled="true"
            follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
            label="Use legacy pie menus" left="12"
@@ -176,6 +186,20 @@ To use spellcheck, right-click a misspelled word
          tool_tip="Modify the AutoCorrect word list and settings" left="12"
          bottom_delta="-50" width="180" height="20" font="SansSerifSmall" follows="left|top"/>
     </panel>
-
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Eye Candy"
+       left="1" mouse_opaque="true"  filename="panel_particle_settings.xml" name="AvatarCloud" width="418">
+        <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="10" left="10"
+                mouse_opaque="true" name="must_be_logged_in_textbox" v_pad="0" width="394">
+                You must be logged in to change this
+        </text>
+        <check_box bottom_delta="-4" control_name="PreviewAvatarAsCloud" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16"
+             label="Preview avatar as cloud" left="10"
+             mouse_opaque="true" name="preview_cloud"
+             radio_style="false" tool_tip="Preview avatar as cloud when already rezzed"
+             width="80" />
+    </panel>
   </tab_container>
 </panel>
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 6ced7d6..8b354b4 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
@@ -216,8 +216,8 @@
              mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
                 Language:
         </text>
-        <combo_box allow_text_entry="true" bottom_delta="0" enabled="true"
-             follows="left|top" height="16" left="153" max_chars="135"
+        <combo_box allow_text_entry="false" bottom_delta="0" enabled="true"
+             follows="left|top" height="18" 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">
                         System Default
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 86aa353..7d6bb4a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -32,9 +32,9 @@
              increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
              mouse_opaque="true" name="cache_size" show_text="true" width="180" />
         <button bottom_delta="-4" enabled="true" follows="left|top"
-             font="SansSerif" halign="center" height="22" label="Clear Cache" left="340"
+             font="SansSerif" halign="center" height="22" label="Clear Disk Cache" left="340"
              left_delta="186" mouse_opaque="true" name="clear_cache" scale_image="true"
-             width="100" />
+             width="150" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-17" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
@@ -56,39 +56,123 @@
              name="reset_cache" scale_image="true" width="100" />
         <check_box bottom="-173" bottom_delta="-25" control_name="ConnectionPortEnabled"
              enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Custom port connection" left="12"
+             initial_value="false" label="Enable custom outgoing port" left="12"
              mouse_opaque="true" name="connection_port_enabled" radio_style="false"
+       tool_tip="Enables custom port for outgoing connections" 
              width="256" />
         <spinner bottom="-193" bottom_delta="-20" control_name="ConnectionPort"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="1" initial_val="13000" label="Port number:" label_width="75"
              left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
-             name="connection_port" width="150" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="15" mouse_opaque="false" name="proxy_label" v_pad="0"
-             width="250">
-                XMLRPC Proxy (Login, Land- and Money purchase):
-        </text>
-        <check_box bottom_delta="-25" enabled="true"
+             name="connection_port" width="140" />
+  
+  <!-- XMLRPC PROXY -->
+
+  <check_box bottom_delta="-25" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable XMLRPC proxy" left_delta="199" mouse_opaque="true"
-             name="xmlrpc_proxy_enabled" radio_style="false" width="256" />
+             label="Enable XMLRPC proxy (Login, Land, and Money purchases)" left="15" mouse_opaque="true"
+             name="xmlrpc_proxy_enabled" radio_style="false" width="300" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="140" mouse_opaque="false" name="xmlrpc_proxy_text_label"
+             height="10" left_delta="20" mouse_opaque="false" name="xmlrpc_proxy_text_label"
              v_pad="0" width="128">
                 Address:
         </text>
         <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="217" name="xmlrpc_proxy_editor"
+             height="20" left="112" name="xmlrpc_proxy_editor"
              tool_tip="The name or IP address of the proxy you would like to use"
              width="200" />
-        <spinner bottom_delta="-25" decimal_digits="0"
+        <spinner bottom_delta="-20" decimal_digits="0"
+             enabled="true" follows="left|top" height="16" increment="1"
+             initial_val="80" label="Port number:" label_width="75" left="35"
+             max_val="65535" min_val="10" mouse_opaque="true" name="xmlrpc_proxy_port"
+             width="140" />
+
+  <!-- SOCKS 5 PROXY -->
+
+  <check_box bottom_delta="-24" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Enable SOCKS 5 proxy" left="15" mouse_opaque="true"
+             name="socks5_proxy_enabled" radio_style="false" width="256" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left="35" mouse_opaque="false" name="socks5_host_label"
+             v_pad="0" width="128">
+    SOCKS 5 host:
+  </text>
+  <line_editor bottom_delta="-6" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="113" name="socks5_proxy_host"
+             tool_tip="The name or IP address of the SOCKS5 proxy you would like to use"
+             width="200" />
+  <spinner bottom_delta="-20" decimal_digits="0"
              enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="80" label="Port number:" label_width="75" left="140"
-             max_val="12000" min_val="10" mouse_opaque="true" name="xmlrpc_proxy_port"
+             initial_val="80" label="Port number:" label_width="75" left="35"
+             max_val="65535" min_val="10" mouse_opaque="true" name="socks5_proxy_port"
              width="140" />
+  <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="10" left="35" mouse_opaque="false" name="socks5_auth_label"
+             v_pad="0" width="128">
+    SOCKS 5 authentication:
+  </text>
+  <radio_group bottom_delta="-6" draw_border="false" follows="left|top" height="20" left="35"
+             name="socks5_auth" width="420">
+    <radio_item bottom="0" height="20" left_delta="80" name="None" width="50"
+        tool_tip="No authentication">
+      None
+    </radio_item>
+    <radio_item bottom="0" height="20" left_delta="50" name="UserPass" width="50"
+        tool_tip="Username / Password authentication">
+      Username / Password
+    </radio_item>
+  </radio_group>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-16" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left="122" mouse_opaque="false" name="socks5_username_label"
+             v_pad="0" width="128">
+    Username:
+  </text>
+  <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="200" name="socks5_proxy_username"
+             tool_tip="Username for the Socks5 proxy"
+             width="200" />
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-14" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
+             height="10" left="122" mouse_opaque="false" name="socks5_password_label"
+             v_pad="0" width="128">
+    Password:
+  </text>
+  <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
+             height="20" left="200" name="socks5_proxy_password"
+             tool_tip="Password for the Socks5 proxy"
+             width="200" />
+
+  <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="10" left="35" mouse_opaque="false" name="http_proxy_label"
+     v_pad="0" width="128">
+    HTTP proxy:
+  </text>
+  <radio_group bottom_delta="-8" draw_border="false" follows="left|top" height="20" left="35"
+             name="socks5_http_proxy_type" width="380" >
+    <radio_item height="20" bottom="0" left="100" name="None" width="50"
+        tool_tip="No HTTP proxy">
+      None
+    </radio_item>
+    <radio_item height="20" bottom="0" left="170" name="Socks" width="50"
+        tool_tip="Use Socks for HTTP proxy">
+      SOCKS 5
+    </radio_item>
+    <radio_item height="20" bottom="0" left="250" name="Web" width="50"
+        tool_tip="Use web proxy for HTTP proxy">
+      Web
+    </radio_item>
+  </radio_group>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index d855a6f..b4dbbb5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
-     height="408" label="Web" left="102" mouse_opaque="true" name="web"
+     height="408" label="Web Browser" left="102" mouse_opaque="true" name="web"
      width="517">
         <radio_group bottom="-45" draw_border="false" follows="top|left" height="40" left="12"
              name="use_external_browser" width="480">
@@ -13,76 +13,56 @@
                         Use built-in web browser
                 </radio_item>
         </radio_group>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="15" mouse_opaque="false" name="cache_size_label_l"
-             v_pad="0" width="128">
-                Browser Cache:
-        </text>
-        <button bottom_delta="-10" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="22" label="Clear Now" left="140"
-             mouse_opaque="true" name="clear_cache" scale_image="true" width="100" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-30" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="15" mouse_opaque="false" name="cookie_label" v_pad="0"
-             width="128">
-                Cookies:
-        </text>
-        <check_box bottom_delta="-7" enabled="true" follows="left|top" 
-                 font="SansSerifSmall" height="16" initial_value="false"
-             label="Accept cookies from sites" left="140" mouse_opaque="true"
+        <button bottom_delta="-30" enabled="true" follows="left|top" font="SansSerif"
+             halign="center" height="22" label="Clear Built-In Browser Cache" left="35"
+             mouse_opaque="true" name="clear_cache" scale_image="true" width="250" />
+        <check_box bottom_delta="-35" enabled="true" follows="left|top" 
+                   font="SansSerifSmall" height="16" initial_value="false"
+             label="Accept cookies while using built-in web browser" left="15" mouse_opaque="true"
+       tool_top="Allows the built-in web browser to accept cookies from websites" 
              name="cookies_enabled" radio_style="false" width="256" />
-        <button  bottom_delta="-20" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="18" label="Clear Cookies" left_delta="0" 
+        <button  bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
+             halign="center" height="20" label="Clear Cookies" left_delta="20" 
              tool_tip="Clear Cookies"
              mouse_opaque="true" name="clear_ookies" scale_image="true" width="110" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-24" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="15" mouse_opaque="false" name="proxy_label" v_pad="0"
-             width="128">
-                Web Proxy:
-        </text>
-        <check_box bottom_delta="-7" enabled="true"
+        <check_box bottom_delta="-35" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Enable web proxy" left="140" mouse_opaque="true"
+             label="Enable proxy for built-in web browser" left="15" mouse_opaque="true"
              name="web_proxy_enabled" radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-18" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left="140" mouse_opaque="false" name="proxy_text_label"
+             height="10" left_delta="20" mouse_opaque="false" name="proxy_text_label"
              v_pad="0" width="128">
                 Address:
         </text>
         <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
-             height="20" left="217" name="web_proxy_editor"
+             height="20" left="112" name="web_proxy_editor"
              tool_tip="The name or IP address of the proxy you would like to use"
              width="200" />
-        <spinner bottom_delta="-25" decimal_digits="0"
+        <spinner bottom_delta="-20" decimal_digits="0"
              enabled="true" follows="left|top" height="16" increment="1"
-             initial_val="80" label="Port number:" label_width="75" left="140"
+             initial_val="80" label="Port number:" label_width="75" left="35"
              max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
              width="140" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-25" drop_shadow_visible="true" enabled="true"
+             bottom_delta="-30" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
              height="10" left="15" mouse_opaque="false" name="cache_size_label_l"
-             v_pad="0" width="128">
-                World search:
-        </text>
-        <line_editor bottom_delta="-8" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="18" left="100" name="world_search_editor"
+             v_pad="0" width="200">
+    Custom All (web) search tab URL:
+  </text>
+        <line_editor bottom_delta="-25" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="18" left="15" name="world_search_editor"
              tool_tip="Address of the world search engine you would like to use"
-             width="355" />
+             width="400" />
         <button bottom_delta="-22" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="18" label="Reset" left="100" 
+             halign="center" height="20" label="Reset" left="15" 
              tool_tip="Reset to default"
-             mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="65" />
+             mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="80" />
         <button  bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
-             halign="center" height="18" label="Clear" left="170" 
+             halign="center" height="20" label="Clear" left_delta="85" 
              tool_tip="clear field"
-             mouse_opaque="true" name="world_search_clear" scale_image="true" width="65" />
+             mouse_opaque="true" name="world_search_clear" scale_image="true" width="80" />
 
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/es/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/es/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/es/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/fr/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/fr/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/fr/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/hu/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/hu/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/hu/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/it/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/it/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/it/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/ja/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/ko/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/ko/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ko/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/pl/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/pl/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pl/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/pt/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/pt/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/ru/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/ru/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ru/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/tr/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/tr/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/tr/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/uk/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/uk/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/uk/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml b/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml
new file mode 100644
index 0000000..36fa667
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/menu_rightclick_text.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<menu drop_shadow="true"
+     mouse_opaque="false" name="Text Edit Menu" opaque="true">
+        <menu_item_call label="Cut" mouse_opaque="true"
+             name="Cut Text">
+                <on_click function="textfield_cut" userdata="about" />
+                <on_enable function="textfield_cut_enable" />
+        </menu_item_call>
+        <menu_item_call label="Copy" mouse_opaque="true"
+                        name="Copy Text" >
+                <on_click function="textfield_copy" userdata="" />
+                <on_enable function="textfield_copy_enable"  />
+        </menu_item_call>
+        <menu_item_call label="Paste" mouse_opaque="true"
+                        name="Paste Text" >
+                <on_click function="textfield_paste" userdata="" />
+                <on_enable function="textfield_paste_enable" />
+        </menu_item_call>
+        <menu_item_call label="Delete" mouse_opaque="true"
+                        name="Delete Text" >
+                <on_click function="textfield_delete" userdata="" />
+                <on_enable function="textfield_delete_enable" />
+        </menu_item_call>
+                <menu_item_separator />
+        <menu_item_call label="Select All" mouse_opaque="true"
+                        name="Select All Text" >
+                <on_click function="textfield_selectall" userdata="" />
+                <on_enable function="textfield_selectall_enable" />
+        </menu_item_call>
+        <menu_item_separator name="Translate" />
+        <menu drop_shadow="true"
+              mouse_opaque="false" name="Translation Options"
+              bottom_delta="0" label="Translate To..." opaque="true" >
+          <menu_item_call label="English" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="en" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Danish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="da" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Deutsch (German)" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="de" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Spanish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="es" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="French" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="fr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Italian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="it" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Hungarian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="hu" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Dutch" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="nl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Polish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pl" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Portugese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="pt" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Russian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ru" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Turkish" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="tr" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Ukrainian" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="uk" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Chinese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="zh" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Japanese" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ja" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+          <menu_item_call label="Korean" mouse_opaque="true"
+                        name="Translate Text" >
+                <on_click function="textfield_translate" translate="true" userdata="ko" />
+                <on_enable function="textfield_translate_enable" />
+          </menu_item_call>
+        </menu>
+</menu>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 3a7039b..9ff1107 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -912,6 +912,7 @@ class LinuxManifest(ViewerManifest):
 
         self.path("res/meta-impy_icon.png","meta-impy_icon.png")
         if self.prefix("linux_tools", dst=""):
+            self.path("alsoft.conf")
             #self.path("client-readme.txt","README-linux.txt")
             self.path("client-readme-voice.txt","README-linux-voice.txt")
             #self.path("client-readme-joystick.txt","README-linux-joystick.txt")
diff --git a/linden/indra/newview/viewertime.cpp b/linden/indra/newview/viewertime.cpp
index 5ed9465..9892aa5 100644
--- a/linden/indra/newview/viewertime.cpp
+++ b/linden/indra/newview/viewertime.cpp
@@ -107,7 +107,13 @@ void ViewerTime::refresh()
                 // it's daylight savings time there.
                 internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
         }
-        
+
+        if(NULL == internal_time)
+        {
+                llwarns << "internal_time == NULL - Kaboom!" << llendl;
+                return;
+        }
+
         mMinute = internal_time->tm_min;
         mSecond = internal_time->tm_sec;
         S32 hour = internal_time->tm_hour;