Second Life viewer sources 1.19.1.4

42 files changed, 122 insertions, 105 deletions

diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 4d8f521..f00657a 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 19;
 const S32 LL_VERSION_PATCH = 1;
-const S32 LL_VERSION_BUILD = 3;
+const S32 LL_VERSION_BUILD = 4;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 3eb4872..73753c3 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -2011,12 +2011,16 @@ void LLWindowSDL::gatherInput()
             // and crashness. (SL-35450)
             std::string saved_locale = setlocale(LC_ALL, NULL);
 
-            // Do a limited number of pumps so SL doesn't starve!
-            // *TODO: this should ideally be time-limited, not count-limited.
-            gtk_main_iteration_do(0); // Always do one non-blocking pump
-            for (int iter=0; iter<10; ++iter)
-                    if (gtk_events_pending())
-                            gtk_main_iteration();
+            // Pump until we've nothing left to do or passed 1/15th of a
+            // second pumping for this frame.
+            static LLTimer pump_timer;
+            pump_timer.reset();
+            pump_timer.setTimerExpirySec(1.0f / 15.0f);
+            do {
+                     // Always do at least one non-blocking pump
+                    gtk_main_iteration_do(0);
+            } while (gtk_events_pending() &&
+                     !pump_timer.hasExpired());
 
             setlocale(LC_ALL, saved_locale.c_str() );
     }
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 905341e..bb7ddc1 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.19.1.3";
-CFBundleGetInfoString = "Second Life version 1.19.1.3, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.19.1.4";
+CFBundleGetInfoString = "Second Life version 1.19.1.4, Copyright 2004-2008 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 45ee9f6..492e589 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
                 </dict>
         </array>
         <key>CFBundleVersion</key>
-        <string>1.19.1.3</string>
+        <string>1.19.1.4</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 7cee898..cb94e51 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -538,7 +538,7 @@ static void saved_settings_to_globals()
 #endif
 
         // propagate push to talk preference to current status
-        gSavedSettings.setBOOL("PTTCurrentlyEnabled", gSavedSettings.getBOOL("EnablePushToTalk"));
+        gSavedSettings.setBOOL("PTTCurrentlyEnabled", TRUE); //gSavedSettings.getBOOL("EnablePushToTalk"));
 
         settings_setup_listeners();
 
@@ -2304,7 +2304,9 @@ bool LLAppViewer::doConfigFromCommandLine()
 
                         for(token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
                         {
-                                llinfos << "argument: '" << (token_iter->c_str()) << "'" << llendl;
+                                // people can put their password in the file. :(
+                                // http://jira.secondlife.com/browse/SEC-42
+                                //llinfos << "argument: '" << (token_iter->c_str()) << "'" << llendl;
                                 
                                 arglist.push_back(*token_iter);
                         }
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index 9751ea7..773ddfe 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -93,7 +93,7 @@ void LLPrefsVoiceLogic::init()
         mEnableVoice = gSavedSettings.getBOOL("EnableVoiceChat");
 
         mVoiceCallsFriendsOnly = gSavedSettings.getBOOL("VoiceCallsFriendsOnly");
-        mEnablePushToTalk = gSavedSettings.getBOOL("EnablePushToTalk");
+//      mEnablePushToTalk = gSavedSettings.getBOOL("EnablePushToTalk");
         mModifier = gSavedSettings.getString("PushToTalkButton");
         mPushToTalkToggle = gSavedSettings.getBOOL("PushToTalkToggle");
         mEarLocation = gSavedSettings.getS32("VoiceEarLocation");
@@ -122,17 +122,17 @@ void LLPrefsVoiceLogic::refresh()
         mPanel->childSetEnabled("push_to_talk_check", enable);
         mPanel->childSetEnabled("push_to_talk_label", enable);
         mPanel->childSetEnabled("voice_call_friends_only_check", enable);
-        mPanel->childSetEnabled("push_to_talk_toggle_check", enable /*&& gSavedSettings.getBOOL("EnablePushToTalk")*/);
+        mPanel->childSetEnabled("push_to_talk_toggle_check", enable);
         mPanel->childSetEnabled("ear_location", enable);
-        mPanel->childSetEnabled("set_voice_hotkey_button", enable /*&& gSavedSettings.getBOOL("EnablePushToTalk")*/);
-        mPanel->childSetEnabled("set_voice_middlemouse_button", enable /*&& gSavedSettings.getBOOL("EnablePushToTalk")*/);
+        mPanel->childSetEnabled("set_voice_hotkey_button", enable);
+        mPanel->childSetEnabled("set_voice_middlemouse_button", enable);
 }
 
 void LLPrefsVoiceLogic::cancel()
 {
         gSavedSettings.setBOOL("EnableVoiceChat", mEnableVoice);
         gSavedSettings.setBOOL("VoiceCallsFriendsOnly", mVoiceCallsFriendsOnly);
-        gSavedSettings.setBOOL("EnablePushToTalk", mEnablePushToTalk );
+//      gSavedSettings.setBOOL("EnablePushToTalk", mEnablePushToTalk );
         gSavedSettings.setString("PushToTalkButton", mModifier);
         gSavedSettings.setBOOL("PushToTalkToggle", mPushToTalkToggle );
         gSavedSettings.setS32("VoiceEarLocation", mEarLocation);
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index de88ac0..ddc67d0 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -1259,28 +1259,30 @@ const LLString& LLViewerParcelMgr::getAgentParcelName() const
 
 void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_agent_region)
 {
-        if (!parcel) return;
+        if(!parcel) return;
         if(!gWorldp) return;
-        LLViewerRegion *region = use_agent_region ? gAgent.getRegion() : gWorldp->getRegionFromPosGlobal( mWestSouth );
+        //llinfos << "passed parcel: " << parcel->getName() << llendl;
+
+        LLViewerRegion* region = use_agent_region ?
+                gAgent.getRegion() : gWorldp->getRegionFromPosGlobal( mWestSouth );
         if (!region) return;
+        //llinfos << "found region: " << region->getName() << llendl;
 
         LLSD body;
-        std::string url = gAgent.getRegion()->getCapability("ParcelPropertiesUpdate");
+        std::string url = region->getCapability("ParcelPropertiesUpdate");
         if (!url.empty())
         {
-                U32 message_flags = 0x01;
                 // request new properties update from simulator
+                U32 message_flags = 0x01;
                 body["flags"] = ll_sd_from_U32(message_flags);
                 parcel->packMessage(body);
-
-                llinfos << "Sending parcel properties update via capability to:" << url << llendl;
-
+                llinfos << "Sending parcel properties update via capability to: "
+                        << url << llendl;
                 LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
         }
         else
         {
-                LLMessageSystem *msg = gMessageSystem;
-
+                LLMessageSystem* msg = gMessageSystem;
                 msg->newMessageFast(_PREHASH_ParcelPropertiesUpdate);
                 msg->nextBlockFast(_PREHASH_AgentData);
                 msg->addUUIDFast(_PREHASH_AgentID,      gAgent.getID() );
@@ -1295,8 +1297,6 @@ void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_ag
 
                 msg->sendReliable( region->getHost() );
         }
-
-
 }
 
 
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 45935db..f0dafef 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -848,7 +848,7 @@ LLVoiceClient::LLVoiceClient()
 
         // Load initial state from prefs.
         mVoiceEnabled = gSavedSettings.getBOOL("EnableVoiceChat");
-        mUsePTT = gSavedSettings.getBOOL("EnablePushToTalk");
+        mUsePTT = TRUE; //gSavedSettings.getBOOL("EnablePushToTalk");
         std::string keyString = gSavedSettings.getString("PushToTalkButton");
         setPTTKey(keyString);
         mPTTIsToggle = gSavedSettings.getBOOL("PushToTalkToggle");
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index 49cc03d..10175ab 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,13 @@
+Release Notes for Second Life 1.19.1(4) March 28th, 2008
+=====================================
+* Fixed a bug causing the viewer to update the wrong parcel. 
+* SEC-42: Do not log contents of arguments.txt. 
+* revert name of "Local Chat(history)" tab to "Local Chat"
+* Removed confusing "Start in Push-to-Talk mode" preference.
+* JA, KO, DE localizations are truncated on Preferences>Graphics tab> Run in a window descriptor
+* commit JA,KO,DE localization changes to accommodate truncations
+* <Ctrl> + <apple>+"D" crashes mac client (Updated llmozlib)
+
 Release Notes for Second Life 1.19.1(3) March 26th, 2008
 =====================================
 Changes and fixes:
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 2738fa4..6254613 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -231,8 +231,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,19,1,3
- PRODUCTVERSION 1,19,1,3
+ FILEVERSION 1,19,1,4
+ PRODUCTVERSION 1,19,1,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -249,12 +249,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.19.1.3"
+            VALUE "FileVersion", "1.19.1.4"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright � 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.19.1.3"
+            VALUE "ProductVersion", "1.19.1.4"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/xui/de/floater_about_land.xml b/linden/indra/newview/skins/xui/de/floater_about_land.xml
index fdb7257..62664c7 100644
--- a/linden/indra/newview/skins/xui/de/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/de/floater_about_land.xml
@@ -451,7 +451,7 @@
                         <combo_box name="media type"
                              tool_tip="Geben Sie einen URL für den Film, die Webseite oder ein anderes Medium ein" />
                         <text name="Description:">
-                                Beschreibung:
+                                Inhalt:
                         </text>
                         <line_editor name="url_description"
                              tool_tip="Text, der neben der Abspielen/Laden-Schaltfläche angezeigt wird" />
@@ -471,7 +471,7 @@ Optionen:
                              tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Musik-URL sehen können." />
                         <text name="media_size"
                              tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen.">
-                                Mediengröße:
+                                Größe:
                         </text>
                         <spinner name="media_size_width"
                              tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen." />
diff --git a/linden/indra/newview/skins/xui/de/floater_chat_history.xml b/linden/indra/newview/skins/xui/de/floater_chat_history.xml
index 73c0bb8..13644ba 100644
--- a/linden/indra/newview/skins/xui/de/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/de/floater_chat_history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="chat floater" title="Chat-Verlauf">
+<floater name="chat floater" title="Lokaler Chat">
         <button label="Chat" name="Chat" />
         <button label="Stummschalten" name="Mute resident" />
         <check_box label="Stummgeschalteten Text anzeigen" name="show mutes" />
diff --git a/linden/indra/newview/skins/xui/de/floater_day_cycle_options.xml b/linden/indra/newview/skins/xui/de/floater_day_cycle_options.xml
index 78f6d87..d2e981c 100644
--- a/linden/indra/newview/skins/xui/de/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/xui/de/floater_day_cycle_options.xml
@@ -86,7 +86,7 @@
                         </text>

                         <button label="Start" label_selected="Start" name="WLAnimSky" />

                         <button label="Stopp" label_selected="Stopp" name="WLStopAnimSky" />

-                        <button label="Grundstückszeit verw." label_selected="Zur Grundstückszeit"

+                        <button label="Grundstückszeit verw" label_selected="Zur Grundstückszeit"

                              name="WLUseLindenTime" />

                         <button label="Testtag speichern" label_selected="Testtag speichern"

                              name="WLSaveDayCycle" />

diff --git a/linden/indra/newview/skins/xui/de/floater_env_settings.xml b/linden/indra/newview/skins/xui/de/floater_env_settings.xml
index 2848e92..b97e3d5 100644
--- a/linden/indra/newview/skins/xui/de/floater_env_settings.xml
+++ b/linden/indra/newview/skins/xui/de/floater_env_settings.xml
@@ -14,7 +14,8 @@
         </text>

         <color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />

         <text name="EnvWaterFogText">

-                Wassertrübung

+                Wasser

+trübung

         </text>

         <button label="Grundstückszeit verw." name="EnvUseEstateTimeButton" />

         <button label="Himmel (erweitert)" name="EnvAdvancedSkyButton" />

diff --git a/linden/indra/newview/skins/xui/de/floater_water.xml b/linden/indra/newview/skins/xui/de/floater_water.xml
index 2fd8247..efd606c 100644
--- a/linden/indra/newview/skins/xui/de/floater_water.xml
+++ b/linden/indra/newview/skins/xui/de/floater_water.xml
@@ -14,7 +14,7 @@
                         <button label=" ?" name="WaterFogColorHelp" />

                         <color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />

                         <text name="WaterFogDensText">

-                                Wassertrübungsdichte-Exponent

+                                Wassertrübungsdichte

                         </text>

                         <button label=" ?" name="WaterFogDensityHelp" />

                         <text name="WaterUnderWaterFogModText">

diff --git a/linden/indra/newview/skins/xui/de/panel_preferences_audio.xml b/linden/indra/newview/skins/xui/de/panel_preferences_audio.xml
index 381cb8f..9bbe83f 100644
--- a/linden/indra/newview/skins/xui/de/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/xui/de/panel_preferences_audio.xml
@@ -18,7 +18,7 @@
                 Streaming:
         </text>
         <check_box label="Streaming-Musik abspielen, falls verfügbar" name="streaming_music" />
-        <check_box label="Streaming-Musik abspielen, falls verfügbar (belegt mehr Bandbreite)"
+        <check_box label="Streaming-Media abspielen, falls verfügbar (mehr Bandbreite)"
              name="streaming_video" />
         <text type="string" length="1" name="system_volume_text">
                 Soundeffekte:
diff --git a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
index 49bdde9..a887c54 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_chat_history.xml
@@ -2,7 +2,7 @@
 <floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false"
      can_resize="true" can_tear_off="true" enabled="true" height="270" left="15"
      min_height="150" min_width="425" mouse_opaque="true" name="chat floater"
-     rect_control="FloaterChatRect" title="Local Chat (history)" width="435">
+     rect_control="FloaterChatRect" title="Local Chat" width="435">
         <string name="ringing">
                 Connecting to in-world Voice Chat...
         </string>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
index 720f1c4..1314971 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_voice.xml
@@ -36,11 +36,11 @@
              name="voice_chat_description" tab_stop="false" width="450" word_wrap="true">

                 Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.

         </text_editor>

-        <check_box bottom_delta="-20" control_name="EnablePushToTalk" enabled="true"

-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"

-             label="Start Viewer in Push-to-Talk mode" left_delta="0"

-             mouse_opaque="true" name="push_to_talk_check" radio_style="false"

-             width="200" />

+<!--    <check_box bottom_delta="-20" control_name="EnablePushToTalk" enabled="true" -->

+<!--         follows="left|top" font="SansSerifSmall" height="16" initial_value="false" -->

+<!--         label="Start Viewer in Push-to-Talk mode" left_delta="0" -->

+<!--         mouse_opaque="true" name="push_to_talk_check" radio_style="false" -->

+<!--         width="200" /> -->

         <check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true"

              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"

              label="Use Push-to-Talk in toggle mode" left_delta="0" mouse_opaque="true"

diff --git a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml b/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
index 1fb6b97..0ecf3fc 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_voice_options.xml
@@ -20,10 +20,10 @@
              font="SansSerifSmall" height="16" initial_value="false"

              label="Only allow Friends to initiate Voice Calls with me" left="20"

              left_delta="2" name="friends_only_check" width="200" />

-        <check_box bottom_delta="-20" control_name="EnablePushToTalk" follows="left|top"

-             font="SansSerifSmall" height="16" initial_value="false"

-             label="Start Viewer in Push-to-Talk mode" left_delta="0"

-             name="push_to_talk_check" width="200" />

+<!--    <check_box bottom_delta="-20" control_name="EnablePushToTalk" follows="left|top" -->

+<!--         font="SansSerifSmall" height="16" initial_value="false" -->

+<!--         label="Start Viewer in Push-to-Talk mode" left_delta="0" -->

+<!--         name="push_to_talk_check" width="200" /> -->

         <check_box bottom_delta="-20" control_name="PushToTalkToggle" follows="left|top"

              font="SansSerifSmall" height="16" initial_value="false"

              label="Use Push-to-Talk in toggle mode" left_delta="0"

diff --git a/linden/indra/newview/skins/xui/ja/floater_about_land.xml b/linden/indra/newview/skins/xui/ja/floater_about_land.xml
index 12ed9f3..15ac0cf 100644
--- a/linden/indra/newview/skins/xui/ja/floater_about_land.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_about_land.xml
@@ -363,11 +363,11 @@
                 </panel>
                 <panel label="メディア" name="land_media_panel">
                         <text name="at URL:">
-                                メディア URL：
+                                URL：
                         </text>
                         <button label="設定..." label_selected="設定..." name="set_media_url" />
                         <text name="with media:">
-                                ���デ���ア・��イプ：
+                                タイプ：
                         </text>
                         <combo_box name="media type"
                              tool_tip="URL が動画、ウェブ・ページ、その他のメディアの場合に指定します" />
@@ -392,7 +392,7 @@
                              tool_tip="このオプションをオンにすると、許可なしでこの区画情報にアクセスしているユーザーには音楽の URL が表示されません。" />
                         <text name="media_size"
                              tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。">
-                                ���デ���ア・��イズ：
+                                サイズ：
                         </text>
                         <spinner name="media_size_width"
                              tool_tip="レンダリングするウェブ・メディアのサイズ。デフォルトの 0 のままにします。" />
@@ -412,8 +412,8 @@
                                 ミュージックURL：
                         </text>
                         <text type="string" length="1" name="Media texture:">
-                                置換
-��クスチ��ー：
+                                テクスチ
+ャ取替：
                         </text>
                         <text type="string" length="1" name="Replace this texture:">
                                 このテクスチャーを置換：
diff --git a/linden/indra/newview/skins/xui/ja/floater_buy_object.xml b/linden/indra/newview/skins/xui/ja/floater_buy_object.xml
index 0ca20ea..1b5dd8b 100644
--- a/linden/indra/newview/skins/xui/ja/floater_buy_object.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_buy_object.xml
@@ -4,9 +4,9 @@
                 およびそのコンテンツ：
         </text>
         <text name="buy_text">
-                コンテンツを[NAME]からL$[AMOUNT]で購入しますか？
+                [NAME]からL$[AMOUNT]で購入しますか？
         </text>
-        <button label="取り消し" label_selected="取り消し" name="cancel_btn" />
+        <button label="取消" label_selected="取消" name="cancel_btn" />
         <button label="購入" label_selected="購入" name="buy_btn" />
         <text name="title_buy_text">
                 購入
diff --git a/linden/indra/newview/skins/xui/ja/floater_chat_history.xml b/linden/indra/newview/skins/xui/ja/floater_chat_history.xml
index 8e9f5fa..6bcd2bb 100644
--- a/linden/indra/newview/skins/xui/ja/floater_chat_history.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_chat_history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="chat floater" title="チャット履歴">
+<floater name="chat floater" title="��ーカル・��ャット">
         <button label="ﾁｬｯﾄ" name="Chat" />
         <button label="ﾐｭｰﾄ" name="Mute resident" />
         <check_box label="ﾐｭｰﾄされたﾃｷｽﾄを表示" name="show mutes" />
diff --git a/linden/indra/newview/skins/xui/ja/floater_day_cycle_options.xml b/linden/indra/newview/skins/xui/ja/floater_day_cycle_options.xml
index 4694e3b..1b0c89a 100644
--- a/linden/indra/newview/skins/xui/ja/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_day_cycle_options.xml
@@ -4,31 +4,31 @@
                 <panel label="デイ・サイクル" name="Day Cycle">

                         <button label="?" name="WLDayCycleHelp" />

                         <text name="WL12am">

-                                深夜 12 時

+                                深夜 12時

                         </text>

                         <text name="WL3am">

-                                午前 3 時

+                                午前 3時

                         </text>

                         <text name="WL6am">

-                                午前 6 時

+                                午前 6時

                         </text>

                         <text name="WL9amHash">

-                                午前 9 時

+                                午前 9時

                         </text>

                         <text name="WL12pmHash">

-                                正午 12 時

+                                正午 12時

                         </text>

                         <text name="WL3pm">

-                                午後 3 時

+                                午後 3時

                         </text>

                         <text name="WL6pm">

-                                午後 6 時

+                                午後 6時

                         </text>

                         <text name="WL9pm">

-                                午後 9 時

+                                午後 9時

                         </text>

                         <text name="WL12am2">

-                                深夜 12 時

+                                深夜 12時

                         </text>

                         <text name="WL12amHash">

                                 |

diff --git a/linden/indra/newview/skins/xui/ja/floater_env_settings.xml b/linden/indra/newview/skins/xui/ja/floater_env_settings.xml
index 7a5413d..4c19de1 100644
--- a/linden/indra/newview/skins/xui/ja/floater_env_settings.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_env_settings.xml
@@ -15,7 +15,7 @@
         <color_swatch name="EnvWaterColor"

              tool_tip="カラー・ピッカーをクリックして開く" />

         <text name="EnvWaterFogText">

-                水中のフォグ���果

+                水中照���

         </text>

         <button label="不動産の時刻を使用" name="EnvUseEstateTimeButton" />

         <button label="空の高度な設定" name="EnvAdvancedSkyButton" />

diff --git a/linden/indra/newview/skins/xui/ja/floater_hardware_settings.xml b/linden/indra/newview/skins/xui/ja/floater_hardware_settings.xml
index 6a8dd33..e864838 100644
--- a/linden/indra/newview/skins/xui/ja/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_hardware_settings.xml
@@ -8,14 +8,14 @@
              name="ani" />

         <spinner label="ガンマ：" name="gamma" />

         <text name="(brightness, lower is brighter)">

-                （明るさ、低いほど������い���0＝デフォルト値を使用）

+                （輝度：低い＝��輝度、0＝デフォルト値）

         </text>

         <text name="Enable VBO:">

                 VBO を有効化：

         </text>

         <check_box label="OpenGL Vertex Buffer オブジェクトを有効化" name="vbo"

              tool_tip="最新のハードウェアでこの設定を有効にすると、パフォーマンスが向上します。  しかし、旧型のハードウェアでは VBO の実装が貧弱な場合が多く、この設定を有効にすることでクラッシュにつながるおそれがあります。" />

-        <slider label="テクスチャー・メモリ (MB)：" name="GrapicsCardTextureMemory"

+        <slider label="テクスチャ記憶(MB)：" name="GrapicsCardTextureMemory"

              tool_tip="テクスチャーに割り当てるメモリの合計。 ビデオ・カード・メモリをデフォルトにします。 この数値を減らすと、パフォーマンスが改善されますが、テクスチャーがぼやけた感じになる場合があります。" />

         <spinner label="フォグの距離比率：" name="fog" />

         <button label="OK" label_selected="OK" name="OK" />

diff --git a/linden/indra/newview/skins/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/xui/ja/floater_instant_message.xml
index 0616be9..ab20016 100644
--- a/linden/indra/newview/skins/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_instant_message.xml
@@ -20,7 +20,7 @@
         </string>
         <button label="プロフィール..." name="profile_callee_btn" />
         <button label="コール" name="start_call_btn" />
-        <button label="コ��ルの終了" name="end_call_btn" />
+        <button label="��出終了" name="end_call_btn" />
         <panel name="speaker_controls">
                 <check_box label="ボイスチャットをミュート" name="mute_btn"
                      tool_tip="ボイスをミュート(消声)" />
diff --git a/linden/indra/newview/skins/xui/ja/floater_media_browser.xml b/linden/indra/newview/skins/xui/ja/floater_media_browser.xml
index 20e7394..55707b9 100644
--- a/linden/indra/newview/skins/xui/ja/floater_media_browser.xml
+++ b/linden/indra/newview/skins/xui/ja/floater_media_browser.xml
@@ -12,7 +12,7 @@
                 </layout_panel>

                 <layout_panel name="external_controls">

                         <button label="自分の Web ブラウザーで開く" name="open_browser" />

-                        <check_box label="常に自分���ウェ������ブラウザーで開く" name="open_always" />

+                        <check_box label="常に�����ブラウザーで開く" name="open_always" />

                         <button label="閉じる" name="close" />

                 </layout_panel>

         </layout_stack>

diff --git a/linden/indra/newview/skins/xui/ja/panel_audio.xml b/linden/indra/newview/skins/xui/ja/panel_audio.xml
index 9284d4e..02be06d 100644
--- a/linden/indra/newview/skins/xui/ja/panel_audio.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_audio.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <panel label="オーディオとビデオ" name="Media panel" width="170">

         <check_box label="ミュート" name="disable audio" />

-        <slider label="マスター" name="System Volume" label_width="80"  width="130" />

-        <slider label="ミュージック" name="Music Volume" label_width="80"  width="130" />

-        <slider label="メディア" name="Media Volume" label_width="80" width="130" />

-        <slider label="ボイス" name="Voice Volume" label_width="80" width="130" />

-        <slider label="サウンド" name="SFX Volume" label_width="80" width="130" />

-        <slider label="アンビエント" name="Wind Volume" label_width="80" width="130" />

-        <slider label="UI" name="UI Volume" label_width="80" width="130" />

+        <slider label="マスター" name="System Volume" label_width="80" />

+        <slider label="ミュージック" name="Music Volume" label_width="80" />

+        <slider label="メディア" name="Media Volume" label_width="80" />

+        <slider label="ボイス" name="Voice Volume" label_width="80" />

+        <slider label="サウンド" name="SFX Volume" label_width="80" />

+        <slider label="アンビエント" name="Wind Volume" label_width="80" />

+        <slider label="UI" name="UI Volume" label_width="80" />

 </panel>

diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_audio.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_audio.xml
index bf3d972..057d236 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_audio.xml
@@ -5,7 +5,7 @@
         </text>
         <check_box label="オーディオをミュート" name="disable audio" />
         <text name="streaming_prefs_text">
-                ストリー��ング環境設定：
+                ストリー��環境設定：
         </text>
         <text name="audio_prefs_text">
                 オーディオ環境設定：
@@ -21,7 +21,7 @@
         <check_box label="音楽がある場合再生する（通信が重くなる）"
              name="streaming_music" />
         <check_box
-             label="ストリーミング・メディアが使用可能��ら再生（帯域幅の消費増）"
+             label="ストリーミング・メディア使用可時��再生（帯域幅の消費増）"
              name="streaming_video" />
         <text type="string" length="1" name="system_volume_text">
                 サウンド効果：
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
index a6806e9..e5deeb3 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_general.xml
@@ -65,7 +65,7 @@
                 言語：
         </text>
         <text type="string" length="1" name="language_textbox2">
-                （���全に反映するには���起動��必��）
+                （再起動�����反映）
         </text>
         <text name="region_name_prompt">
                 &lt;地域の名前入力&gt;
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
index 93f4095..d3d3734 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_graphics1.xml
@@ -54,7 +54,7 @@
                 品質および
         </text>
         <text name="QualityText">
-                パフォーマンス：
+                実行：
         </text>
         <text name="FasterText">
                 速い
@@ -104,7 +104,7 @@
                 </radio_item>
         </radio_group>
         <text name="AvatarRenderingText">
-                アバター・レンダリング：
+                アバター表示:
         </text>
         <check_box label="アバターの精度を下げる" name="AvatarImpostors" />
         <check_box label="ハードウェア・スキニング" name="AvatarVertexProgram" />
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_im.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_im.xml
index 091b0c7..4c79ae2 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_im.xml
@@ -16,7 +16,7 @@
         <check_box label="チャット履歴にIMを含める" name="include_im_in_chat_history" />
         <check_box label="IMにタイムスタンプを表示" name="show_timestamps_check" />
         <text name="text_box4">
-                ������イン・��プション：
+                記録オプション：
         </text>
         <check_box label="IMを記録" name="log_instant_messages" />
         <check_box label="IMログにタイムスタンプを表示"
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_input.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_input.xml
index 80778a1..e43e535 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_input.xml
@@ -22,7 +22,7 @@
         <check_box label="容姿カメラの自動移動" name="appearance camera movement"
              tool_tip="編集モードでは、カメラ自動位置調整を使用" />
         <text name="text2">
-                アバター表示オプション：
+                アバター表示：
         </text>
         <check_box label="アバターをマウスルックで表示" name="avfp" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml b/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml
index c545fa7..48cfc23 100644
--- a/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/xui/ja/panel_preferences_web.xml
@@ -10,7 +10,7 @@
                 </radio_item>

         </radio_group>

         <text name="cache_size_label_l">

-                ���ラ���ザー��ャッシュ:

+                キャッシュ:

         </text>

         <button label="今すぐクリア" name="clear_cache" />

         <text name="cookie_label">

@@ -19,7 +19,7 @@
         <check_box label="サイトからのクッキーを承認" name="cookies_enabled" />

         <button label="今すぐクリア" name="clear_cookies" />

         <text name="proxy_label">

-                ���ェ���・��ロキシ：

+                プロキシ:

         </text>

         <check_box label="ウェブ・プロキシを有効にします。"

              name="web_proxy_enabled" />

diff --git a/linden/indra/newview/skins/xui/ko/floater_day_cycle_options.xml b/linden/indra/newview/skins/xui/ko/floater_day_cycle_options.xml
index 9f4d72c..9d41de9 100644
--- a/linden/indra/newview/skins/xui/ko/floater_day_cycle_options.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_day_cycle_options.xml
@@ -88,9 +88,9 @@
                         <button label="중지!" label_selected="중지" name="WLStopAnimSky" />

                         <button label="사유지 시간 사용" label_selected="사유지 시간으로 이동"

                              name="WLUseLindenTime" />

-                        <button label="테스트 날��� 저장" label_selected="테스트 날��� 저장"

+                        <button label="테스트 ���기 저장" label_selected="테스트 ���기 저장"

                              name="WLSaveDayCycle" />

-                        <button label="테스트 날��� 로드" label_selected="테스트 날��� 로드"

+                        <button label="테스트 ���기 로드" label_selected="테스트 ���기 로드"

                              name="WLLoadDayCycle" />

                 </panel>

         </tab_container>

diff --git a/linden/indra/newview/skins/xui/ko/floater_env_settings.xml b/linden/indra/newview/skins/xui/ko/floater_env_settings.xml
index 1f00608..d455910 100644
--- a/linden/indra/newview/skins/xui/ko/floater_env_settings.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_env_settings.xml
@@ -18,7 +18,7 @@
                 물안개

         </text>

         <button label="사유지 시간 사용" name="EnvUseEstateTimeButton" />

-        <button label=" 하늘 ���������" name="EnvAdvancedSkyButton" />

-        <button label="수면 ���������" name="EnvAdvancedWaterButton" />

+        <button label=" 하늘 세��� ������" name="EnvAdvancedSkyButton" />

+        <button label="수면 세��� ������" name="EnvAdvancedWaterButton" />

         <button label="?" name="EnvSettingsHelpButton" />

 </floater>

diff --git a/linden/indra/newview/skins/xui/ko/floater_instant_message.xml b/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
index 881c04d..994f238 100644
--- a/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_instant_message.xml
@@ -7,10 +7,10 @@
                 연결하는 중...
         </string>
         <string name="connected">
-                연결되었습니다. 연결을 끊으려면 통화 종료 버튼을 클릭하십시오.
+                연결되었습니다. 연결을 끊으려면 ���결���료 버튼을 클릭하십시오.
         </string>
         <string name="hang_up">
-                통화 종료
+                ���결���료
         </string>
         <string name="voice_icon">
                 icn_voice-pvtfocus.tga
@@ -18,9 +18,9 @@
         <string name="default_text_label">
                 메신저를 사용하려면 여기를 클릭하십시오.
         </string>
-        <button label="프로필¡¦}" name="profile_callee_btn" />
-        <button label="���화" name="start_call_btn" />
-        <button label="���화 종료" name="end_call_btn" />
+        <button label="프로필" name="profile_callee_btn" />
+        <button label="������연결" name="start_call_btn" />
+        <button label="���결종료" name="end_call_btn" />
         <panel name="speaker_controls">
                 <check_box label="음성 소거" name="mute_btn" tool_tip="음성 소거" />
         </panel>
diff --git a/linden/indra/newview/skins/xui/ko/floater_media_browser.xml b/linden/indra/newview/skins/xui/ko/floater_media_browser.xml
index c506ce9..7047368 100644
--- a/linden/indra/newview/skins/xui/ko/floater_media_browser.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_media_browser.xml
@@ -11,8 +11,8 @@
                         <button label="현재 URL을 구획으로 보내기" name="assign" />

                 </layout_panel>

                 <layout_panel name="external_controls">

-                        <button label="내 웹 브라우저에서 열기" name="open_browser" />

-                        <check_box label="항상 내 웹 브라우저에서 열기" name="open_always" />

+                        <button label="웹 브라우저에서 열기" name="open_browser" />

+                        <check_box label="항상 웹 브라우저에서 열기" name="open_always" />

                         <button label="닫기" name="close" />

                 </layout_panel>

         </layout_stack>

diff --git a/linden/indra/newview/skins/xui/ko/floater_snapshot.xml b/linden/indra/newview/skins/xui/ko/floater_snapshot.xml
index 0087f15..9afdd60 100644
--- a/linden/indra/newview/skins/xui/ko/floater_snapshot.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_snapshot.xml
@@ -8,10 +8,10 @@
                         엽서 보내기
                 </radio_item>
                 <radio_item name="texture">
-                        ��������� ���로드
+                        �����토������ ���장
                 </radio_item>
                 <radio_item name="local">
-                        하드 드라이브에 저장하기
+                        하드 드라이브에 저장
                 </radio_item>
         </radio_group>
         <button label="자세히 &gt;&gt;" name="more_btn" tool_tip="고급 옵션" />
diff --git a/linden/indra/newview/skins/xui/ko/floater_windlight_options.xml b/linden/indra/newview/skins/xui/ko/floater_windlight_options.xml
index d999c3e..57bc9aa 100644
--- a/linden/indra/newview/skins/xui/ko/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/xui/ko/floater_windlight_options.xml
@@ -6,7 +6,7 @@
         <button label="신규" label_selected="신규" name="WLNewPreset" />

         <button label="저장" label_selected="저장" name="WLSavePreset" />

         <button label="삭제" label_selected="삭제" name="WLDeletePreset" />

-        <button label="날��� 주기 편집기" label_selected="날��� 주기 편집기"

+        <button label="���일 주기 편집기" label_selected="���일 주기 편집기"

              name="WLDayCycleMenuButton" />

         <tab_container name="WindLight Tabs">

                 <panel label="대기" name="Atmosphere">

diff --git a/linden/indra/newview/skins/xui/ko/menu_viewer.xml b/linden/indra/newview/skins/xui/ko/menu_viewer.xml
index 5303388..d8e85c8 100644
--- a/linden/indra/newview/skins/xui/ko/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/ko/menu_viewer.xml
@@ -140,7 +140,7 @@
                 <menu_item_call label="홈으로 텔리포트" name="Teleport Home" />
                 <menu_item_separator label="-----------" name="separator3" />
                 <menu_item_call label="자리비움 설정" name="Set Away" />
-                <menu_item_call label="다른 용무 중 설정" name="Set Busy" />
+                <menu_item_call label="다른 용무중 설정" name="Set Busy" />
                 <menu_item_separator label="-----------" name="separator4" />
                 <menu_item_call label="계정 기록" name="Account History..." />
                 <menu_item_call label="내 계정 관리" name="Manage My Account..." />
@@ -159,7 +159,7 @@
                         <menu_item_separator label="-----------" name="separator" />
                         <menu_item_call label="지역 기본 설정으로 되돌리기" name="Revert to Region Default" />
                 </menu>
-                <menu label="환경 설정" name="Environment Settings">
+                <menu label="주변 환경 설정" name="Environment Settings">
                         <menu_item_call label="일출" name="Sunrise" />
                         <menu_item_call label="정오" name="Noon" />
                         <menu_item_call label="일몰" name="Sunset" />
diff --git a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml b/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
index 075fcd2..1a61390 100644
--- a/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
+++ b/linden/indra/newview/skins/xui/ko/panel_toolbar.xml
@@ -4,7 +4,7 @@
         <string name="Redock Windows">
                 창 합치기
         </string>
-        <button label="���뮤���케이트" name="communicate_btn"
+        <button label="통��" name="communicate_btn"
              tool_tip="친구 및 그룹과 통신합니다." />
         <button label="" name="chat_btn" tool_tip="채팅 표시줄 표시 (입력)" />
         <button label="친구" name="friends_btn"