Merge branch 'next' of git://github.com/imprudence/imprudence into next

Conflicts:
	linden/indra/newview/installers/windows/meta-impy_installer_template.iss
Branding conflict, fixed.
	linden/indra/newview/llviewerwindow.cpp
Already had this change, but merged the minor difference.

23 files changed, 276 insertions, 262 deletions

diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index dab6c1d..3545309 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -358,7 +358,9 @@ static unsigned get_till_eol(std::istream& input, char *buf, unsigned bufsize)
                 char c = input.get();
                 buf[count++] = c;
                 if (is_eol(c))
+                {
                         break;
+                }
         }
         return count;
 }
@@ -391,14 +393,36 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
 
                 if (status == XML_STATUS_ERROR)
                 {
-                        std::string error_string( XML_ErrorString(XML_GetErrorCode( mParser )));
-                        if ("parsing aborted" != error_string )//end of input
+                        std::string error_string(XML_ErrorString(XML_GetErrorCode( mParser )));
+                        if (input.gcount() == 0)
+                        {
+                                // nothing to do -- MC
+                                data = LLSD();
+                                return LLSDParser::PARSE_FAILURE;
+                        }
+                        else if (error_string != "parsing aborted") // end of input
                         {
                                 S32 line_number = XML_GetCurrentLineNumber( mParser );
-                                llwarns << "LLXmlTree parse failed.  Line " << line_number << ": " 
-                                        << error_string << llendl;
+                                // This parses LLCurl::Responder::completedRaw always, even
+                                // when not using XML. We have to do this little ugliness 
+                                // in order to make this error message meaningful.
+                                // See Expat's xmlparse.c for the full list of errors -- MC
+                                if (error_string == "not well-formed (invalid token)")
+                                {
+                                        std::string text((char*)buffer);
+                                        if ((text.find('>') != std::string::npos) ||
+                                                (text.find('<') != std::string::npos))
+                                        {
+                                                llwarns << "LLSDXMLParser::Impl::parse error.  Line " << line_number << ": " 
+                                                                << error_string << llendl;
+                                        }
+                                        break;
+                                }
+                                
+                                llinfos << "Possible LLSDXMLParser::Impl::parse error.  Line " << line_number << ": " 
+                                                << error_string << llendl;
                         }
-
+                        // Always break here -- MC
                         break;
                 }
         }
@@ -417,14 +441,13 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
                         ((char*) buffer)[count ? count - 1 : 0] = '\0';
                 }
 
-
                 data = LLSD();
                 return LLSDParser::PARSE_FAILURE;
         }
 
         clear_eol(input);
         data = mResult;
-        return mParseCount;
+        return mParseCount; // why return mParseCount?! -- MC
 }
 
 
@@ -499,7 +522,7 @@ S32 LLSDXMLParser::Impl::parseLines(std::istream& input, LLSD& data)
                 if ("parsing aborted" != error_string )//end of input
                 {
                         S32 line_number = XML_GetCurrentLineNumber( mParser );
-                        llwarns << "LLXmlTree parse failed.  Line " << line_number << ": " 
+                        llwarns << "LLSDXMLParser::Impl::parseLines failed.  Line " << line_number << ": " 
                                 << error_string << llendl;
                 }
                 return LLSDParser::PARSE_FAILURE;
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 9ccaac8..ecbeb9b 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1292,7 +1292,7 @@ set_source_files_properties(${viewer_CHARACTER_FILES}
 list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
 
 if (WINDOWS)
-  file(GLOB viewer_INSTALLER_FILES installers/windows/*.nsi)
+  file(GLOB viewer_INSTALLER_FILES installers/windows/*.iss)
 
   source_group("Installer Files" FILES ${viewer_INSTALLER_FILES})
 
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 74a8189..c979d73 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -53,7 +53,7 @@
                                                         <!--<string>AudioEngine</string>-->
                                                         <!--<string>BodyPhysics</string>-->
               <!--<string>InitInfo</string>-->
-              <string>Inventory</string>
+              <!--<string>Inventory</string>-->
               <!--<string>isOwnedSelf</string>-->
                                                         <!--<string>HUDEffect</string>-->
               <!--<string>MarkerFile</string>-->
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 0ac7841..e701c3e 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7926,17 +7926,6 @@
       <key>Value</key>
       <string>default</string>
     </map>
-    <key>TranslateChat</key>
-    <map>
-      <key>Comment</key>
-      <string>Translate incoming chat messages</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>LastFeatureVersion</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/installers/windows/meta-impy_installer_template.iss b/linden/indra/newview/installers/windows/meta-impy_installer_template.iss
index 833c2f1..6731402 100644
--- a/linden/indra/newview/installers/windows/meta-impy_installer_template.iss
+++ b/linden/indra/newview/installers/windows/meta-impy_installer_template.iss
@@ -46,7 +46,7 @@ Name: english; MessagesFile: compiler:Default.isl
 
 [Tasks]
 Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce
-Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce; OnlyBelowVersion: 0,6.1
 Name: slurlassociate; Description: Associate meta-impy with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce
 ; TODO: use scripting for something like this on uninstall:
 ; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall:
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 681cbb2..f1749ac 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -115,8 +115,6 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
         LLUICtrlFactory::getInstance()->buildFloater(this,"floater_chat_history.xml",&getFactoryMap(),no_open);
 
         childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
-        childSetCommitCallback("translate chat",onClickToggleTranslateChat,this);
-        childSetValue("translate chat", gSavedSettings.getBOOL("TranslateChat"));
         childSetVisible("Chat History Editor with mute",FALSE);
         childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
         setDefaultBtn("Chat");
@@ -446,26 +444,6 @@ void LLFloaterChat::onClickToggleShowMute(LLUICtrl* caller, void *data)
         }
 }
 
-// Update the "TranslateChat" pref after "translate chat" checkbox is toggled in
-// the "Local Chat" floater.
-//static
-void LLFloaterChat::onClickToggleTranslateChat(LLUICtrl* caller, void *data)
-{
-        LLFloaterChat* floater = (LLFloaterChat*)data;
-
-        BOOL translate_chat = floater->getChild<LLCheckBoxCtrl>("translate chat")->get();
-        gSavedSettings.setBOOL("TranslateChat", translate_chat);
-}
-
-// Update the "translate chat" checkbox after the "TranslateChat" pref is set in
-// some other place (e.g. prefs dialog).
-//static
-void LLFloaterChat::updateSettings()
-{
-        BOOL translate_chat = gSavedSettings.getBOOL("TranslateChat");
-        LLFloaterChat::getInstance(LLSD())->getChild<LLCheckBoxCtrl>("translate chat")->set(translate_chat);
-}
-
 BOOL checkStringInText(const std::string &text_line, std::string textToMatch)
 {
         boost::smatch what;
diff --git a/linden/indra/newview/llfloaterchat.h b/linden/indra/newview/llfloaterchat.h
index f8683b9..14c2242 100644
--- a/linden/indra/newview/llfloaterchat.h
+++ b/linden/indra/newview/llfloaterchat.h
@@ -66,7 +66,6 @@ public:
         virtual void onVisibilityChange(BOOL cur_visibility);
         virtual void setMinimized(BOOL);
         void updateConsoleVisibility();
-        void updateSettings();
 
         static void setHistoryCursorAndScrollToEnd();
         
@@ -82,7 +81,6 @@ public:
 
         static void onClickMute(void *data);
         static void onClickToggleShowMute(LLUICtrl* caller, void *data);
-        static void onClickToggleTranslateChat(LLUICtrl* caller, void *data);
         static void onClickToggleActiveSpeakers(void* userdata);
         static void chatFromLogFile(LLLogChat::ELogLineType type,std::string line, void* userdata);
         static void loadHistory();
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index fc483dd..5f62e87 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -155,29 +155,76 @@ void LLFloaterOpenObject::moveToInventory(bool wear)
         {
                 parent_category_id = gAgent.getInventoryRootID();
         }
+
+        LLCategoryCreate* cat_data = new LLCategoryCreate(object_id, wear);
         LLUUID category_id = gInventory.createNewCategory(parent_category_id, 
-                LLAssetType::AT_NONE, 
-                name);
-
-        LLCatAndWear* data = new LLCatAndWear;
-        data->mCatID = category_id;
-        data->mWear = wear;
-
-        // Copy and/or move the items into the newly created folder.
-        // Ignore any "you're going to break this item" messages.
-        BOOL success = move_inv_category_world_to_agent(object_id, category_id, TRUE,
-                                                                                                        callbackMoveInventory, 
-                                                                                                        (void*)data);
-        if (!success)
-        {
-                delete data;
-                data = NULL;
+                LLAssetType::AT_NONE,
+                                                                                                          name,
+                                                                                                          callbackCreateInventoryCategory,
+                                                                                                          (void*)cat_data);
+
 
-                LLNotifications::instance().add("OpenObjectCannotCopy");
+        // If we get a null category ID, we are using a capability in
+        // createNewCategory and we will handle the following in the
+        // callbackCreateInventoryCategory routine.
+        if (category_id.notNull())
+        {
+                delete cat_data;
+
+                LLCatAndWear* data = new LLCatAndWear;
+                data->mCatID = category_id;
+                data->mWear = wear;
+                data->mFolderResponded = false;
+
+                // Copy and/or move the items into the newly created folder.
+                // Ignore any "you're going to break this item" messages.
+                BOOL success = move_inv_category_world_to_agent(object_id, category_id, TRUE,
+                                                                        callbackMoveInventory,
+                                                                        (void*)data);
+                if (!success)
+                {
+                        delete data;
+                        data = NULL;
+        
+                        LLNotifications::instance().add("OpenObjectCannotCopy");
+                }
         }
 }
 
 // static
+void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLSD& result, void* data)
+{
+        LLCategoryCreate* cat_data = (LLCategoryCreate*)data;
+        if (result.has("failure") && result["failure"])
+        {
+                delete cat_data;
+                return;
+        }
+
+        LLUUID category_id = result["folder_id"].asUUID();
+        LLCatAndWear* wear_data = new LLCatAndWear;
+
+        wear_data->mCatID = category_id;
+        wear_data->mWear = cat_data->mWear;
+        wear_data->mFolderResponded = true;
+
+        // Copy and/or move the items into the newly created folder.
+        // Ignore any "you're going to break this item" messages.
+
+        BOOL success = move_inv_category_world_to_agent(cat_data->mObjectID, category_id, TRUE,
+                                                                                                        callbackMoveInventory, 
+                                                                                                        (void*)wear_data);
+        if (!success)
+        {
+                delete wear_data;
+                wear_data = NULL;
+
+                LLNotifications::instance().add("OpenObjectCannotCopy");
+        }
+        delete cat_data;        
+ }
+
+// static
 void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data)
 {
         LLCatAndWear* cat = (LLCatAndWear*)data;
diff --git a/linden/indra/newview/llfloateropenobject.h b/linden/indra/newview/llfloateropenobject.h
index 27653a5..4b89158 100644
--- a/linden/indra/newview/llfloateropenobject.h
+++ b/linden/indra/newview/llfloateropenobject.h
@@ -50,10 +50,24 @@ public:
         static void show();
         static void dirty();
         
+        class LLCategoryCreate
+        {
+                public:
+                        LLCategoryCreate(LLUUID object_id, bool wear)
+                        :       mObjectID(object_id),
+                                mWear(wear)
+                        {}
+
+                public:
+                        LLUUID mObjectID;
+                        bool mWear;
+        };
+
         struct LLCatAndWear
         {
                 LLUUID mCatID;
                 bool mWear;
+                bool mFolderResponded;
         };
 
 protected:
@@ -67,6 +81,7 @@ protected:
 
         static void onClickMoveToInventory(void* data);
         static void onClickMoveAndWear(void* data);
+        static void callbackCreateInventoryCategory(const LLSD& result, void* data);
         static void callbackMoveInventory(S32 result, void* data);
         static void* createPanelInventory(void* data);
 
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index f71df2d..eb2170a 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -1610,18 +1610,21 @@ void LLRightClickInventoryFetchDescendentsObserver::done()
 class LLInventoryCopyAndWearObserver : public LLInventoryObserver
 {
 public:
-        LLInventoryCopyAndWearObserver(const LLUUID& cat_id, int count) :mCatID(cat_id), mContentsCount(count), mFolderAdded(FALSE) {}
+        LLInventoryCopyAndWearObserver(const LLUUID& cat_id,
+                                                                   int count,
+                                                                   bool folder_added = false)
+        :       mCatID(cat_id),
+                mContentsCount(count),
+                mFolderAdded(folder_added) {}
         virtual ~LLInventoryCopyAndWearObserver() {}
         virtual void changed(U32 mask);
 
 protected:
         LLUUID mCatID;
         int    mContentsCount;
-        BOOL   mFolderAdded;
+        bool   mFolderAdded;
 };
 
-
-
 void LLInventoryCopyAndWearObserver::changed(U32 mask)
 {
         if((mask & (LLInventoryObserver::ADD)) != 0)
@@ -2331,13 +2334,16 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
 
         if(option == 0 && object)
         {
-                if (cat_and_wear && cat_and_wear->mWear)
+                if (cat_and_wear && cat_and_wear->mWear) // && !cat_and_wear->mFolderResponded)
                 {
                         InventoryObjectList inventory_objects;
                         object->getInventoryContents(inventory_objects);
                         int contents_count = inventory_objects.size()-1; //subtract one for containing folder
 
-                        LLInventoryCopyAndWearObserver* inventoryObserver = new LLInventoryCopyAndWearObserver(cat_and_wear->mCatID, contents_count);
+                        LLInventoryCopyAndWearObserver* inventoryObserver;
+                        inventoryObserver = new LLInventoryCopyAndWearObserver(cat_and_wear->mCatID,
+                                                                                                                                   contents_count,
+                                                                                                                                   cat_and_wear->mFolderResponded);
                         gInventory.addObserver(inventoryObserver);
                 }
 
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 58a2bdc..3f74965 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -60,6 +60,7 @@
 #include "llvoavatar.h"
 #include "llsdutil.h"
 #include <deque>
+#include "llfloateropenobject.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -396,25 +397,83 @@ LLUUID LLInventoryModel::findCategoryByName(std::string name)
         return LLUUID::null;
 }
 
+class LLCreateInventoryCategoryResponder : public LLHTTPClient::Responder
+{
+public:
+        LLCreateInventoryCategoryResponder(LLInventoryModel* model, 
+                                                                           void (*callback)(const LLSD&, void*),
+                                                                           void* user_data)
+        :       mModel(model),
+                mCallback(callback), 
+                mData(user_data) 
+        {
+        }
+
+        virtual void error(U32 status, const std::string& reason)
+        {
+                llwarns << "CreateInventoryCategory failed. status = " << status
+                                << ", reason = \"" << reason << "\"" << llendl;
+        }
+
+        virtual void result(const LLSD& content)
+        {
+                // Server has created folder.
+
+                LLUUID category_id = content["folder_id"].asUUID();
+
+                // Add the category to the internal representation
+                LLPointer<LLViewerInventoryCategory> cat;
+                cat = new LLViewerInventoryCategory(category_id,
+                                                                                        content["parent_id"].asUUID(),
+                                                                                        (LLAssetType::EType)content["type"].asInteger(),
+                                                                                        content["name"].asString(), 
+                                                                                        gAgent.getID());
+                cat->setVersion(LLViewerInventoryCategory::VERSION_INITIAL);
+                cat->setDescendentCount(0);
+                LLInventoryModel::LLCategoryUpdate update(cat->getParentUUID(), 1);
+                mModel->accountForUpdate(update);
+                mModel->updateCategory(cat);
+
+                if (mCallback && mData)
+                {
+                        mCallback(content, mData);
+                }
+        }
+
+private:
+        void (*mCallback)(const LLSD&, void*);
+        void* mData;
+        LLInventoryModel* mModel;
+};
+
 // Convenience function to create a new category. You could call
 // updateCategory() with a newly generated UUID category, but this
 // version will take care of details like what the name should be
 // based on preferred type. Returns the UUID of the new category.
 LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
-                                                                                   LLAssetType::EType preferred_type,
-                                                                                   const std::string& pname)
+                                                                                   LLAssetType::EType preferred_type,                                                                              const std::string& pname,
+                                                                                   void (*callback)(const LLSD&, void*),
+                                                                                   void* user_data)
 {
+        llassert_always(NULL != callback);
+
         LLUUID id;
+
         if(!isInventoryUsable())
         {
                 llwarns << "Inventory is broken." << llendl;
-                return id;
-        }
+                LLSD result;
+                result["failure"] = true;
+                callback(result, user_data);
+        }
+
 
         if(preferred_type == LLAssetType::AT_SIMSTATE)
         {
                 LL_DEBUGS("Inventory") << "Attempt to create simstate category." << LL_ENDL;
-                return id;
+                LLSD result;
+                result["failure"] = true;
+                callback(result, user_data);
         }
 
         id.generate();
@@ -433,6 +492,54 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
                 name.assign(NEW_CATEGORY_NAME);
         }
 
+        if (user_data)  // callback required for acked message.
+        {
+
+
+                LLViewerRegion* viewer_region = gAgent.getRegion();
+
+                if (!viewer_region->capabilitiesReceived())
+                {
+                        LL_DEBUGS("Inventory") << "We didn't get the region caps yet." << LL_ENDL;
+                }
+
+                std::string url;
+                if (viewer_region)
+                {
+                        url = viewer_region->getCapability("CreateInventoryCategory");
+                }
+
+                if (!url.empty())
+                {
+                        LL_DEBUGS("Inventory") << "Using the CreateInventoryCategory capability."   << LL_ENDL;
+                        // Let's use the new capability.
+                        LLSD request, body;
+                        body["folder_id"] = id;
+                        body["parent_id"] = parent_id;
+                        body["type"] = (LLSD::Integer) preferred_type;
+                        body["name"] = name;
+
+                        request["message"] = "CreateInventoryCategory";
+                        request["payload"] = body;
+
+                        LLHTTPClient::post(url, body,
+                                                           new LLCreateInventoryCategoryResponder(this,
+                                                                                                                                          callback,
+                                                                                                                                          user_data));
+                        return LLUUID::null;
+                }
+                else
+                {
+                        LL_DEBUGS("Inventory") << "Cap url empty"   << LL_ENDL;
+                }
+        }
+        else //NULL == user_data
+        {
+                // user_data is a LLCategoryCreate object instantiated in the calling
+                // function - bug (or low memory - any leaks?).
+                llwarns << "NULL user_data" << llendl;
+        }
+
         // Add the category to the internal representation
         LLPointer<LLViewerInventoryCategory> cat =
                 new LLViewerInventoryCategory(id, parent_id, preferred_type, name, gAgent.getID());
@@ -2090,6 +2197,9 @@ bool LLInventoryModel::loadSkeleton(const LLInventoryModel::options_t& options,
 
                                 if (cit == temp_cats.end())
                                 {
+                                        llwarns << "Can't load " << inventory_filename
+                                                        << " because cit == temp_cats.end()" 
+                                                        << llendl;
                                         continue; // cache corruption?? not sure why this happens -SJB
                                 }
                                 LLViewerInventoryCategory* tcat = *cit;
@@ -2098,6 +2208,9 @@ bool LLInventoryModel::loadSkeleton(const LLInventoryModel::options_t& options,
                                 // not sent down in the skeleton.
                                 if (cit == not_cached)
                                 {
+                                        llwarns << "Can't load " << inventory_filename
+                                                        << " because cit == not_cached" 
+                                                        << llendl;
                                         continue;
                                 }
 
@@ -3173,7 +3286,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
                 //              << titem->getParentUUID() << llendl;
                 U32 callback_id;
                 msg->getU32Fast(_PREHASH_ItemData, _PREHASH_CallbackID, callback_id);
-                if(titem->getUUID().notNull())
+                if (titem->getUUID().notNull()) // && callback_id.notNull())
                 {
                         items.push_back(titem);
                         cblist.push_back(InventoryCallbackInfo(callback_id, titem->getUUID()));
diff --git a/linden/indra/newview/llinventorymodel.h b/linden/indra/newview/llinventorymodel.h
index 7222c60..7788c34 100644
--- a/linden/indra/newview/llinventorymodel.h
+++ b/linden/indra/newview/llinventorymodel.h
@@ -308,9 +308,11 @@ public:
         // based on preferred type. Returns the UUID of the new
         // category. If you want to use the default name based on type,
         // pass in a NULL to the 'name parameter.
-        LLUUID createNewCategory(const LLUUID& parent_id,
-                                                         LLAssetType::EType preferred_type,
-                                                         const std::string& name);
+        LLUUID createNewCategory(const LLUUID& parent_id,
+                                                         LLAssetType::EType preferred_type,
+                                                         const std::string& name,
+                                                         void (*callback)(const LLSD&, void*) = NULL,
+                                                         void* user_data = NULL);
 
         LLUUID findCategoryByName(std::string name);
 
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 1cdab46..dd4df42 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -111,8 +111,6 @@ BOOL LLPrefsChatImpl::postBuild()
         childSetValue("toggle_channel_control", gSavedSettings.getBOOL("ChatChannelSelect"));
         childSetValue("console_opacity", gSavedSettings.getF32("ConsoleBackgroundOpacity"));
         childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
-        childSetValue("translate_language_combobox",    gSavedSettings.getString("TranslateLanguage"));
-        childSetValue("translate_chat",         gSavedSettings.getBOOL("TranslateChat"));
 
         mChatChannel = gSavedSettings.getBOOL("ChatChannelSelect");
 
@@ -205,8 +203,6 @@ void LLPrefsChatImpl::apply()
         gSavedSettings.setF32("ConsoleBackgroundOpacity", childGetValue("console_opacity").asReal());
         gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal());
 
-        gSavedSettings.setString("TranslateLanguage", childGetValue("translate_language_combobox"));
-        gSavedSettings.setBOOL("TranslateChat", childGetValue("translate_chat"));
 
         bool chan_check = childGetValue("toggle_channel_control");
         gSavedSettings.setBOOL("ChatChannelSelect", chan_check);
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 59d766f..016646e 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -511,19 +511,6 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
         return true;
 }
 
-bool handleTranslateChatPrefsChanged(const LLSD& newvalue)
-{
-        LLFloaterChat* floaterp = LLFloaterChat::getInstance();
-
-        if(floaterp)
-        {
-                // update "translate chat" pref in "Local Chat" floater
-                floaterp->updateSettings();
-        }
-        return true;
-}
-
-
 bool handleSliderScrollWheelMultiplierChanged(const LLSD& newvalue)
 {
         LLSlider::setScrollWheelMultiplier( newvalue.asInteger() );
@@ -675,7 +662,6 @@ void settings_setup_listeners()
         gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));     
         gSavedSettings.getControl("SliderScrollWheelMultiplier")->getSignal()->connect(boost::bind(&handleSliderScrollWheelMultiplierChanged, _1));     
-        gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _1));
 }
 
 template <> eControlType get_control_type<U32>(const U32& in, LLSD& out) 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 858137a..9a0cf47 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -139,7 +139,6 @@
 #include "llfloaterworldmap.h"
 #include "llviewerdisplay.h"
 #include "llkeythrottle.h"
-#include "lltranslate.h"
 
 #include "panelradarentry.h"
 
@@ -2930,52 +2929,6 @@ void process_decline_callingcard(LLMessageSystem* msg, void**)
         LLNotifications::instance().add("CallingCardDeclined");
 }
 
-class ChatTranslationReceiver : public LLTranslate::TranslationReceiver
-{
-public :
-        ChatTranslationReceiver(const std::string &fromLang, const std::string &toLang, const LLChat &chat,
-                const std::string &orig_mesg, const BOOL history)
-                : LLTranslate::TranslationReceiver(fromLang, toLang),
-                m_chat(chat),
-                m_origMesg(orig_mesg),
-                m_history(history)
-        {
-        }
-
-        static boost::intrusive_ptr<ChatTranslationReceiver> build(const std::string &fromLang, const std::string &toLang, const LLChat &chat, const std::string &orig_mesg, const BOOL history)
-        {
-                return boost::intrusive_ptr<ChatTranslationReceiver>(new ChatTranslationReceiver(fromLang, toLang, chat, orig_mesg, history));
-        }
-
-protected:
-        void handleResponse(const std::string &translation, const std::string &detected_language)
-        {
-                // filter out non-interesting responeses
-                if ( !translation.empty()
-                        && (m_toLang != detected_language)
-                        && (LLStringUtil::compareInsensitive(translation, m_origMesg) != 0) )
-                {
-                        m_chat.mText += " (" + translation + ")";
-                }
-
-                add_floater_chat(m_chat, m_history);
-        }
-
-        void handleFailure()
-        {
-                LLTranslate::TranslationReceiver::handleFailure();
-
-                m_chat.mText += " (?)";
-
-                add_floater_chat(m_chat, m_history);
-        }
-
-private:
-        LLChat m_chat;
-        std::string m_origMesg;
-        const BOOL m_history;
-};
-
 void add_floater_chat(const LLChat &chat, const BOOL history)
 {
         if (history)
@@ -2990,26 +2943,6 @@ void add_floater_chat(const LLChat &chat, const BOOL history)
         }
 }
 
-void check_translate_chat(const std::string &mesg, const LLChat &chat, const BOOL history)
-{
-        const bool translate = gSavedSettings.getBOOL("TranslateChat");
-
-        if (translate && chat.mSourceType != CHAT_SOURCE_SYSTEM)
-        {
-                // fromLang hardcoded to "" (autodetection) pending implementation of
-                // SVC-4879
-                const std::string &fromLang = "";
-                const std::string &toLang = LLTranslate::getTranslateLanguage();
-
-                LLHTTPClient::ResponderPtr result = ChatTranslationReceiver::build(fromLang, toLang, chat, mesg, history);
-                LLTranslate::translateMessage(result, fromLang, toLang, mesg);
-        }
-        else
-        {
-                add_floater_chat(chat, history);
-        }
-}
-
 void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 {
         LLChat          chat;
@@ -3429,12 +3362,12 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                         && (is_god || !is_busy || is_owned_by_me))
                 {
                         // show on screen and add to history
-                        check_translate_chat(mesg, chat, FALSE);
+                        add_floater_chat(chat, FALSE);
                 }
                 else
                 {
                         // just add to chat history
-                        check_translate_chat(mesg, chat, TRUE);
+                        add_floater_chat(chat, TRUE);
                 }
         }
 }
diff --git a/linden/indra/newview/llviewermessage.h b/linden/indra/newview/llviewermessage.h
index 11a3554..0201ce4 100644
--- a/linden/indra/newview/llviewermessage.h
+++ b/linden/indra/newview/llviewermessage.h
@@ -76,7 +76,6 @@ void process_script_question(LLMessageSystem *msg, void **user_data);
 void process_chat_from_simulator(LLMessageSystem *mesgsys, void **user_data);
 
 void add_floater_chat(const LLChat &chat, const BOOL history);
-void check_translate_chat(const std::string &mesg, const LLChat &chat, const BOOL history);
 
 //void process_agent_to_new_region(LLMessageSystem *mesgsys, void **user_data);
 void send_agent_update(BOOL force_send, BOOL send_reliable = FALSE);
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index a43e0c0..2fafe30 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1428,6 +1428,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
         LLSD capabilityNames = LLSD::emptyArray();
         capabilityNames.append("ChatSessionRequest");
         capabilityNames.append("CopyInventoryFromNotecard");
+        capabilityNames.append("CreateInventoryCategory");
         // Aurora settings -- MC
         capabilityNames.append("DispatchOpenRegionSettings");
         capabilityNames.append("DispatchRegionInfo");
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index a49dde6..f9d38b1 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2920,9 +2920,9 @@ BOOL LLViewerWindow::handlePerFrameHover()
 
                 // Always update console
                 LLRect console_rect = getChatConsoleRect();
-                // Add a magic number so the pre login console does not cover the login panel.
-                // TODO: Would be nice to only do this for the pre login window.
-                console_rect.mBottom = gHUDView->getRect().mBottom + getChatConsoleBottomPad() + 20;
+                // Add a magic number so the pre login console does not cover the login panel.  
+                S32 magic_num = (LLStartUp::isLoggedIn()) ? 20 : 0;
+                console_rect.mBottom = gHUDView->getRect().mBottom + getChatConsoleBottomPad() + magic_num;
                 gConsole->reshape(console_rect.getWidth(), console_rect.getHeight());
                 gConsole->setRect(console_rect);
         }
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 4a5fb48..559bc31 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1054,6 +1054,11 @@ void LLVoiceClientCapResponder::result(const LLSD& content)
 
                 gVoiceClient->setSpatialChannel(uri, credentials, mResponseID);
         }
+        else
+        {
+                llwarns << "ParcelVoiceInfoRequest response malformed, disabling voice." << llendl;
+                gVoiceClient->close();
+        }
 }
 
 
@@ -1774,11 +1779,13 @@ void LLVoiceClient::close()
 {
         LL_DEBUGS("VoiceSession") << "Cancel Session: LLVoiceClient::close() called."
                                 << llendl;
+        mAccountActive = false;
         setState(stateDisableCleanup);
 }
 
 void LLVoiceClient::start()
 {
+        mAccountActive = true;
         setState(stateStart);
 }
 
@@ -7219,6 +7226,11 @@ class LLViewerParcelVoiceInfo : public LLHTTPNode
                                 gVoiceClient->setPIRCapResponseID(response_id);
                                 gVoiceClient->setSpatialChannel(uri, credentials, response_id);
                         }
+                        else
+                        {
+                                llwarns << "ParcelVoiceInfoRequest response malformed, disabling voice." << llendl;
+                                gVoiceClient->close();
+                        }
                 }
         }
 };
diff --git a/linden/indra/newview/llwldaycycle.cpp b/linden/indra/newview/llwldaycycle.cpp
index 1d17c60..07ac2a4 100644
--- a/linden/indra/newview/llwldaycycle.cpp
+++ b/linden/indra/newview/llwldaycycle.cpp
@@ -51,9 +51,6 @@ LLWLDayCycle::~LLWLDayCycle()
 
 void LLWLDayCycle::loadDayCycle(const std::string & fileName)
 {
-        // clear the first few things
-        mTimeMap.clear();
-
         // now load the file
         std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, 
                 "windlight/days", fileName));
@@ -62,6 +59,9 @@ void LLWLDayCycle::loadDayCycle(const std::string & fileName)
         llifstream day_cycle_xml(pathName);
         if (day_cycle_xml.is_open())
         {
+                // clear the first few things
+                mTimeMap.clear();
+
                 // load and parse it
                 LLSD day_data(LLSD::emptyArray());
                 LLPointer<LLSDParser> parser = new LLSDXMLParser();
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index e83a930..0d80a21 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -75,12 +75,9 @@
                                         Gestures
                                 </combo_item>
                         </combo_box>
-                        <check_box bottom_delta="7" enabled="true" follows="left|top" font="SansSerifSmall"
+                        <check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="20" initial_value="false" label="Show muted text" left_delta="125"
                              name="show mutes" radio_style="false" width="116" />
-                        <check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="20" initial_value="false" label="Translate chat (powered by Google)" left_delta="0"
-                             name="translate chat" radio_style="false" width="100" />
                         <button name="toggle_active_speakers_btn"
                              label="&lt;&lt;" label_selected="&gt;&gt;" follows="right|top"
                              bottom_delta="0" left="262" right="305" height="20"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index cf947ee..566fdad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -192,10 +192,10 @@ USE left="270" FOR TABBING OPTIONS
     </panel>
     
     
-    <!-- SPELL CHECKING AND TRANSLATE PANEL -->
+    <!-- SPELL CHECKING PANEL -->
 
 
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Spell Checking &amp; Translate"
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Spell Checking"
          left="1" mouse_opaque="true" name="spell_check_tab" width="418">
 
 
@@ -252,89 +252,7 @@ USE left="270" FOR TABBING OPTIONS
       <button name="ac_button" label="AutoCorrect..." halign="center"
          tool_tip="Modify the AutoCorrect word list and settings" left="50"
          bottom_delta="-40" width="160" height="20" font="SansSerifSmall" follows="left|top"/>
-
-
-      <view_border bevel_style="none" border_thickness="1" bottom_delta="-15" follows="left|top"
-            height="1" left="55" name="border" width="380" />
-
-
-      <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-style="BOLD|SHADOW"
-          font="SansSerifSmall" h_pad="0" halign="left" height="10" left="20"
-          mouse_opaque="false" name="text_translate" v_pad="0" width="128">
-        Translate Chat:
-      </text>
-      <check_box bottom_delta="-25" control_name="TranslateChat" enabled="true" follows="left|top"
-           font="SansSerifSmall" height="16" initial_value="false"
-           label="Use machine translation while chatting (powered by Google)" left_delta="30" mouse_opaque="true"
-           name="translate_chat" radio_style="false" width="237" />
-
-      <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_delta="0"
-           mouse_opaque="false" name="text_translate_chat" v_pad="0" width="160">
-        Translate into this language:
-      </text>
-
-      <combo_box allow_text_entry="false" bottom_delta="-5" enabled="true"
-           follows="left|top" height="16" left="270" max_chars="135"
-           mouse_opaque="true" name="translate_language_combobox" width="160">
-        <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
-          System Default
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="English" value="en">
-          English
-        </combo_item>
-
-        <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
-
-        <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
-          Dansk (Danish)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
-          Deutsch (German)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
-          Español (Spanish)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="French" value="fr">
-          Français (French)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Italian" value="it">
-          Italiano (Italian)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
-          Magyar (Hungarian)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Dutch" value="nl">
-          Nederlands (Dutch)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
-          Polski (Polish)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
-          Portugués (Portuguese)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Russian" value="ru">
-          Русский (Russian)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Turkish" value="tr">
-          Türkçe (Turkish)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Ukrainian" value="uk">
-          Українська (Ukrainian)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-          中文 (简体) (Chinese)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
-          日本語 (Japanese)
-        </combo_item>
-        <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
-          한국어 (Korean)
-        </combo_item>
-      </combo_box>
-
+      
 
       <button bottom="-20" follows="left|top" font="SansSerifSmall" height="18" label="?"
              name="EmeraldHelp_SpellCheck" tool_tip="Click here for help regarding the settings in this page."
diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index c69644b..a7c0a48 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -36,6 +36,7 @@ $/LicenseInfo$
 import sys
 import os.path
 import re
+import string
 
 # Look for indra/lib/python in all possible parent directories ...
 # This is an improvement over the setup-path.py method used previously:
@@ -106,7 +107,7 @@ class InstallFile(object):
 
     def _is_md5sum_match(self):
         hasher = md5(file(self.filename, 'rb').read())
-        if hasher.hexdigest() == self.md5sum:
+        if string.lower(hasher.hexdigest()) == string.lower(self.md5sum):
             return  True
         return False