Second Life viewer sources 1.21.0-RC

1 files changed, 29 insertions, 34 deletions

diff --git a/linden/indra/newview/llhippo.cpp b/linden/indra/newview/llagentlanguage.cpp
index 27c27e8..5656f76 100644
--- a/linden/indra/newview/llhippo.cpp
+++ b/linden/indra/newview/llagentlanguage.cpp
@@ -1,10 +1,10 @@
-/** 
- * @file llhippo.cpp
- * @brief Create a bug for our users to find
+/**
+ * @file llagentlanguage.cpp
+ * @brief Transmit language information to server
  *
- * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2008, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -30,41 +30,36 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-
-#include "llhippo.h"
-
-#include "llchat.h"
-
+#include "llagentlanguage.h"
 #include "llagent.h"
+#include "llviewercontrol.h"
 #include "llviewerregion.h"
-#include "llfloaterchat.h"      // for add_chat
 
-void trigger_hippo_bug(void*)
+LLAgentLanguage::LLAgentLanguage()
 {
-        BOOL chat = FALSE;
-        LLViewerRegion* region = gAgent.getRegion();
-        const char* name = (region ? region->getName().c_str() : NULL);
+        gSavedSettings.getControl("Language")->getSignal()->connect(boost::bind(&update));
+        gSavedSettings.getControl("SystemLanguage")->getSignal()->connect(boost::bind(&update));
+        gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&update));
+}
 
-        if (name)
-        {
-                if (   name[0] == 'A'
-                        || name[0] == 'E'
-                        || name[0] == 'I'
-                        || name[0] == 'O'
-                        || name[0] == 'U')
-                {
-                        chat = TRUE;
-                }
-                else if (ll_frand() > 0.5f)
-                {
-                        chat = TRUE;
-                }
-        }
 
-        if (chat)
+// send language settings to the sim
+// static
+bool LLAgentLanguage::update()
+{
+        LLSD body;
+        std::string url = gAgent.getRegion()->getCapability("UpdateAgentLanguage");
+        if (!url.empty())
         {
-                LLChat chat("hippos!");
-                chat.mFromName = "Ghostly Bug";
-                LLFloaterChat::addChat(chat);
+                std::string language = gSavedSettings.getString("Language");
+                if (language == "default")
+                        language = gSavedSettings.getString("SystemLanguage");
+                
+                body["language"] = language;
+                body["language_is_public"] = gSavedSettings.getBOOL("LanguageIsPublic");
+                
+                LLHTTPClient::post(url, body, new LLHTTPClient::Responder);
         }
+    return true;
 }
+