From 95fc42c3219151d085f139a8f239bdc5fb6b30f3 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 19 Jan 2010 15:19:11 -0500
Subject: Ensure Lynx's Boost patch is in place -- Windows

---
 install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.xml b/install.xml
index 5069e44d46..5cb960c506 100644
--- a/install.xml
+++ b/install.xml
@@ -214,9 +214,9 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>6746ae9fd9aff98b15f7b9f0f40334ab</string>
+            <string>acbf7a4165a917a4e087879d1756b355</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20091204.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20100119.tar.bz2</uri>
           </map>
         </map>
       </map>
-- 
cgit v1.2.3


From dab8a89df68fe29ce3794d7763e9890da5ff7ed2 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 19 Jan 2010 12:23:25 -0800
Subject: Ensure Lynx's Boost patch is in place -- linux, linux64

---
 install.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install.xml b/install.xml
index fdd7458384..e94654e175 100644
--- a/install.xml
+++ b/install.xml
@@ -200,16 +200,16 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>7085044567999489d82b9ed28f16e480</string>
+            <string>ee8e1b4bbcf137a84d6a85a1c51386ff</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20091202.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100119.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>b4aeefcba3d749f1e9f2a12c6f70192b</string>
+            <string>af4badd6b2c10bc4db82ff1256695892</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux64-20091202.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux64-20100119.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
-- 
cgit v1.2.3


From 56c021f606d249e4b7ba334809b0332fe2fdcc11 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 19 Jan 2010 15:28:10 -0500
Subject: Ensure Lynx's Boost patch is in place -- darwin

---
 install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.xml b/install.xml
index fdd7458384..e08676d869 100644
--- a/install.xml
+++ b/install.xml
@@ -193,9 +193,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>609c469ee1857723260b5a9943b9c2c1</string>
+            <string>84821102cb819257a66c8f38732647fc</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20091202.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100119.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
-- 
cgit v1.2.3


From 6294d4f7bf809de91c910ff56391bcf9fa78b124 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Mon, 1 Feb 2010 15:24:38 -0800
Subject: Use "standard" llsd::equals

---
 indra/llprimitive/tests/llmediaentry_test.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp
index 277e370ca4..88cd96ebe4 100644
--- a/indra/llprimitive/tests/llmediaentry_test.cpp
+++ b/indra/llprimitive/tests/llmediaentry_test.cpp
@@ -157,14 +157,9 @@ namespace
 
 namespace tut
 {
-    bool llsd_equals(const LLSD& a, const LLSD& b) {
-        // cheesy, brute force, but it works
-        return std::string(ll_pretty_print_sd(a)) == std::string(ll_pretty_print_sd(b));
-    }
-
     void ensure_llsd_equals(const std::string& msg, const LLSD& expected, const LLSD& actual)
     {
-        if (!tut::llsd_equals(expected, actual))
+        if (!llsd_equals(expected, actual))
         {
             std::string message = msg;
             message += ": actual: ";
-- 
cgit v1.2.3


From 84e985e255b66e9ffb09deba373136c97eeb86b3 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Mon, 1 Feb 2010 17:24:03 -0800
Subject: Preferences clean up in advance of qa beta branch

---
 .../default/xui/en/panel_preferences_advanced.xml  | 307 ++++++++++-----------
 .../default/xui/en/panel_preferences_alerts.xml    |  46 ++-
 .../default/xui/en/panel_preferences_general.xml   |  24 +-
 .../default/xui/en/panel_preferences_sound.xml     | 109 ++++----
 4 files changed, 229 insertions(+), 257 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 141678f7eb..4d14d46743 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <panel
  border="true"
- follows="left|top|right|bottom"
+ follows="all"
  height="408"
+ label="Advanced"
  layout="topleft"
  left="102"
  name="advanced"
@@ -13,130 +13,29 @@
      name="aspect_ratio_text">
         [NUM]:[DEN]
     </panel.string>
-    <check_box
-     control_name="UseChatBubbles"
-     follows="left|top"
-     height="16"
-     label="Bubble chat"
-     layout="topleft"
-     left="30"
-     top="10"
-     name="bubble_text_chat"
-     width="150" />
-    <color_swatch
-     can_apply_immediately="true"
-     color="0 0 0 1"
-     control_name="BackgroundChatColor"
-     follows="left|top"
-     height="47"
-     layout="topleft"
-     left_delta="280"
-     name="background"
-     tool_tip="Choose color for bubble chat"
-     top_delta="1"
-     width="44">
-        <color_swatch.init_callback
-		     function="Pref.getUIColor"
-		     parameter="BackgroundChatColor" />
-		    <color_swatch.commit_callback
-		     function="Pref.applyUIColor"
-		     parameter="BackgroundChatColor" />
-    </color_swatch>
-    <slider
-     control_name="ChatBubbleOpacity"
-     follows="left|top"
-     height="16"
-     increment="0.05"
-     initial_value="1"
-     label="Opacity"
-     layout="topleft"
-     left_delta="-230"
-     top_pad="-28"
-     label_width="50"
-     name="bubble_chat_opacity"
-     width="200" />
-    <text
-     follows="left|top"
-     type="string"
-     length="1"
-     height="25"
-     layout="topleft"
-     left="30"
-     top_pad="5"
-     name="AspectRatioLabel1"
-     tool_tip="width / height"
-     label_width="50"
-     width="120">
-        Aspect ratio
-    </text>
-    <combo_box
-     allow_text_entry="true"
-     height="23"
-     follows="left|top"
-     layout="topleft"
-     left_pad="0"
-     max_chars="100"
-     name="aspect_ratio"
-     tool_tip="width / height"
-     top_delta="0"
-     width="150">
-        <combo_box.item
-         enabled="true"
-         label=" 4:3 (Standard CRT)"
-         name="item1"
-         value="1.333333" />
-        <combo_box.item
-         enabled="true"
-         label=" 5:4 (1280x1024 LCD)"
-         name="item2"
-         value="1.25" />
-        <combo_box.item
-         enabled="true"
-         label=" 8:5 (Widescreen)"
-         name="item3"
-         value="1.6" />
-        <combo_box.item
-         enabled="true"
-         label=" 16:9 (Widescreen)"
-         name="item4"
-         value="1.7777777" />
-    </combo_box>
-    <check_box
-     control_name="FullScreenAutoDetectAspectRatio"
-     follows="left|top"
-     height="25"
-     label="Auto-detect"
-     layout="topleft"
-     left_pad="10"
-     name="aspect_auto_detect"
-     width="256">
-        <check_box.commit_callback
-         function="Pref.AutoDetectAspect" />
-    </check_box>
-     <text
-     follows="left|top"
-     type="string"
-     length="1"
-     height="10"
-     left="30"
-     name="heading1"
-     top_pad="5"
-     width="270">
-Camera:
-	</text>
+         <icon
+	 follows="left|top"
+	 height="18"
+	 image_name="Cam_FreeCam_Off"
+         layout="topleft"
+	 name="camera_icon"
+	 mouse_opaque="false"
+	 visible="true"
+	 width="18"
+         left="30"
+         top="10"/>
     <slider
      can_edit_text="true"
-	 control_name="CameraAngle"
+     control_name="CameraAngle"
      decimal_digits="2"
-     top_pad="5"
      follows="left|top"
      height="16"
      increment="0.025"
      initial_value="1.57"
      layout="topleft"
      label_width="100"
-     label="View Angle"
-     left_delta="50"
+     label="View angle"
+     left_pad="30"
      max_val="2.97"
      min_val="0.17"
      name="camera_fov"
@@ -165,11 +64,11 @@ Camera:
      type="string"
      length="1"
      height="10"
-     left="30"
+     left="80"
      name="heading2"
      width="270"
      top_pad="5">
-Automatic positioning for:
+Automatic position for:
 	</text>
         <check_box
      control_name="EditCameraMovement"
@@ -177,7 +76,7 @@ Automatic positioning for:
      follows="left|top"
      label="Build/Edit"
      layout="topleft"
-     left_delta="50"
+     left_delta="30"
      name="edit_camera_movement"
      tool_tip="Use automatic camera positioning when entering and exiting edit mode"
      width="280"
@@ -191,27 +90,27 @@ Automatic positioning for:
      name="appearance_camera_movement"
      tool_tip="Use automatic camera positioning while in edit mode"
      width="242" />
-     <text
-     follows="left|top"
-     type="string"
-     length="1"
-     height="10"
-     left="30"
-     name="heading3"
-     top_pad="5"
-     width="270">
-Avatars:
-	</text>
+     	<icon
+	 follows="left|top"
+	 height="18"
+	 image_name="Move_Walk_Off"
+         layout="topleft"
+	 name="avatar_icon"
+	 mouse_opaque="false"
+	 visible="true"
+	 width="18"
+         top_pad="2"
+         left="30"
+         />
     <check_box
      control_name="FirstPersonAvatarVisible"
      follows="left|top"
      height="20"
      label="Show me in Mouselook"
      layout="topleft"
-     left_delta="50"
+     left_pad="30"
      name="first_person_avatar_visible"
-     width="256"
-     top_pad="0"/>
+     width="256" />
     <check_box
      control_name="ArrowKeysAlwaysMove"
      follows="left|top"
@@ -242,22 +141,61 @@ Avatars:
      name="enable_lip_sync"
      width="237"
      top_pad="0" />
+        <check_box
+     control_name="UseChatBubbles"
+     follows="left|top"
+     height="16"
+     label="Bubble chat"
+     layout="topleft"
+     left="78"
+     top_pad="6"
+     name="bubble_text_chat"
+     width="150" />
+    <slider
+     control_name="ChatBubbleOpacity"
+     follows="left|top"
+     height="16"
+     increment="0.05"
+     initial_value="1"
+     label="Opacity"
+     layout="topleft"
+     left="80"
+     label_width="50"
+     name="bubble_chat_opacity"
+     width="200" />
+    <color_swatch
+     can_apply_immediately="true"
+     color="0 0 0 1"
+     control_name="BackgroundChatColor"
+     follows="left|top"
+     height="50"
+     layout="topleft"
+     left_pad="10"
+     name="background"
+     tool_tip="Choose color for bubble chat"
+     width="38">
+        <color_swatch.init_callback
+		     function="Pref.getUIColor"
+		     parameter="BackgroundChatColor" />
+		    <color_swatch.commit_callback
+		     function="Pref.applyUIColor"
+		     parameter="BackgroundChatColor" />
+    </color_swatch>
     <check_box
      control_name="ShowScriptErrors"
      follows="left|top"
      height="20"
-     label="Show script errors"
+     label="Show script errors in:"
      layout="topleft"
      left="30"
      name="show_script_errors"
-     width="256"
-     top_pad="5"/>
+     width="256" />
     <radio_group
      enabled_control="ShowScriptErrors"
      control_name="ShowScriptErrorsLocation"
      follows="top|left"
      draw_border="false"
-     height="40"
+     height="16"
      layout="topleft"
      left_delta="50"
      name="show_location"
@@ -265,7 +203,7 @@ Avatars:
      width="364">
         <radio_item
          height="16"
-         label="In chat"
+         label="Nearby chat"
          layout="topleft"
          left="3"
          name="0"
@@ -273,7 +211,7 @@ Avatars:
          width="315" />
         <radio_item
          height="16"
-         label="In a window"
+         label="Separate window"
          layout="topleft"
          left_delta="175"
          name="1"
@@ -284,50 +222,105 @@ Avatars:
      follows="top|left"
      enabled_control="EnableVoiceChat"
      control_name="PushToTalkToggle"
-     height="20"
-     label="Toggle mode for microphone when I press the Speak trigger key:"
+     height="15"
+     label="Toggle speak on/off when I press:"
      layout="topleft"
      left="30"
      name="push_to_talk_toggle_check"
      width="237"
-     top_pad="-25"
      tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."/>
     <line_editor
      follows="top|left"
      control_name="PushToTalkButton"
-     enabled="false" 
+     enabled="false"
      enabled_control="EnableVoiceChat"
-     height="19"
-     left_delta="50"
-     max_length="254"
+     height="23"
+     left="80"
+     max_length="200"
      name="modifier_combo"
      label="Push-to-Speak trigger"
-     top_pad="0"
-     width="280" />
+     top_pad="5"
+     width="200" />
     <button
      follows="top|left"
      enabled_control="EnableVoiceChat"
      height="23"
      label="Set Key"
-     left_delta="0"
+     left_pad="5"
      name="set_voice_hotkey_button"
-     width="115"
-     top_pad="5">
+     width="100">
           <button.commit_callback
           function="Pref.VoiceSetKey" />
     </button>
     <button
-     bottom_delta="0"
      enabled_control="EnableVoiceChat"
-     follows="left"
+     follows="top|left"
      halign="center"
      height="23"
-     label="Middle Mouse Button"
-     left_delta="120"
+     image_overlay="Refresh_Off"
+     tool_tip="Reset to Middle Mouse Button"
      mouse_opaque="true"
      name="set_voice_middlemouse_button"
-     width="160">
+     left_pad="5"
+     width="25">
           <button.commit_callback
           function="Pref.VoiceSetMiddleMouse" />
     </button>
+       <text
+     follows="left|top"
+     type="string"
+     length="1"
+     height="13"
+     layout="topleft"
+     left="30"
+     top_pad="8"
+     name="AspectRatioLabel1"
+     tool_tip="width / height"
+     label_width="50"
+     width="120">
+        Aspect ratio
+    </text>
+    <combo_box
+     allow_text_entry="true"
+     height="23"
+     follows="left|top"
+     layout="topleft"
+     left="80"
+     max_chars="100"
+     name="aspect_ratio"
+     tool_tip="width / height"
+     width="150">
+        <combo_box.item
+         enabled="true"
+         label=" 4:3 (Standard CRT)"
+         name="item1"
+         value="1.333333" />
+        <combo_box.item
+         enabled="true"
+         label=" 5:4 (1280x1024 LCD)"
+         name="item2"
+         value="1.25" />
+        <combo_box.item
+         enabled="true"
+         label=" 8:5 (Widescreen)"
+         name="item3"
+         value="1.6" />
+        <combo_box.item
+         enabled="true"
+         label=" 16:9 (Widescreen)"
+         name="item4"
+         value="1.7777777" />
+    </combo_box>
+    <check_box
+     control_name="FullScreenAutoDetectAspectRatio"
+     follows="left|top"
+     height="25"
+     label="Automatic"
+     layout="topleft"
+     left_pad="10"
+     name="aspect_auto_detect"
+     width="256">
+        <check_box.commit_callback
+         function="Pref.AutoDetectAspect" />
+    </check_box>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index ace8281b4e..188fd3b7bc 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  border="true"
- height="500"
+ height="408"
  label="Popups"
  layout="topleft"
  left="0"
@@ -14,7 +14,7 @@
      follows="top|left"
      height="12"
      layout="topleft"
-     left="30"
+     left="10"
      name="tell_me_label"
      top="10"
      width="300">
@@ -32,7 +32,7 @@
     <check_box
      control_name="ChatOnlineNotification"
      height="16"
-     label="When my friends log out or in"
+     label="When my friends log in or out"
      layout="topleft"
      left_delta="0"
      name="friends_online_notify_checkbox"
@@ -42,38 +42,33 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerifBold"
      height="12"
      layout="topleft"
-     left="30"
+     left="10"
      name="show_label"
-     top_pad="14"
+     top_pad="8"
      width="450">
-        Always show these notifications:
+        Always show:
     </text>
     <scroll_list
      follows="top|left"
-     height="92"
+     height="140"
      layout="topleft"
      left="10"
-     multi_select="true" 
+     multi_select="true"
      name="enabled_popups"
      width="475" />
 	 <button
 	 enabled_control="FirstSelectedDisabledPopups"
      follows="top|left"
      height="23"
-     image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled"
      image_overlay="Arrow_Up"
-     image_selected="PushButton_Selected"
-     image_unselected="PushButton_Off"
      hover_glow_amount="0.15"
      layout="topleft"
-     left_delta="137"
+     left="180"
      name="enable_this_popup"
-     top_pad="10"
-     width="43">
+     top_pad="5"
+     width="40">
         <button.commit_callback
          function="Pref.ClickEnablePopup" />
     </button>
@@ -81,17 +76,13 @@
 	 enabled_control="FirstSelectedEnabledPopups"
 	 follows="top|left"
      height="23"
-     image_disabled="PushButton_Disabled"
-     image_disabled_selected="PushButton_Disabled"
      image_overlay="Arrow_Down"
-     image_selected="PushButton_Selected"
-     image_unselected="PushButton_Off"
      hover_glow_amount="0.15"
      layout="topleft"
-     left_pad="50"
+     left_pad="40"
      name="disable_this_popup"
      top_delta="0"
-     width="43">
+     width="40">
         <button.commit_callback
          function="Pref.ClickDisablePopup" />
     </button>
@@ -99,21 +90,20 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerifBold"
      height="12"
      layout="topleft"
-     left="30"
+     left="10"
      name="dont_show_label"
-     top_pad="10"
+     top_pad="-10"
      width="450">
-        Never show these notifications:
+        Never show:
     </text>
     <scroll_list
      follows="top|left"
-     height="92"
+     height="140"
      layout="topleft"
      left="10"
-     multi_select="true" 
+     multi_select="true"
      name="disabled_popups"
      width="475" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 22c75a595e..099c789e4b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -89,11 +89,12 @@
     <text
  font="SansSerifSmall"
      type="string"
+     text_color="White_50"
      length="1"
      follows="left|top"
      height="18"
      layout="topleft"
-     left_pad="5"
+     left_pad="10"
      name="language_textbox2"
      width="200">
         (Requires restart)
@@ -179,7 +180,7 @@
      left_pad="5"
      name="show_location_checkbox"
      top_delta="5"
-     width="256" />        
+     width="256" />
    <text
     type="string"
     length="1"
@@ -203,21 +204,21 @@
          layout="topleft"
          name="radio"
          value="0"
-         width="100" />
+         width="75" />
         <radio_item
          label="On"
          layout="topleft"
          left_pad="12"
          name="radio2"
          value="1"
-         width="100" />
+         width="75" />
         <radio_item
          label="Show briefly"
          layout="topleft"
          left_pad="12"
          name="radio3"
-         value="2" 
-         width="100" />
+         value="2"
+         width="160" />
     </radio_group>
     <check_box
 	 enabled_control="AvatarNameTagMode"
@@ -323,11 +324,10 @@
      follows="left|top"
      height="13"
      layout="topleft"
-     text_color="white"
      left="30"
      mouse_opaque="false"
      name="text_box3"
-     top_pad="15"
+     top_pad="10"
      width="240">
        Busy mode response:
     </text>
@@ -336,18 +336,16 @@
       text_readonly_color="LabelDisabledColor"
       bg_writeable_color="LtGray"
       use_ellipses="false"
-      bg_visible="true"
-      border_visible="true"
       hover="false"
      commit_on_focus_lost = "true"
      follows="left|top"
-     height="50"
+     height="60"
      layout="topleft"
      left="50"
      name="busy_response"
-     width="400"
+     width="440"
      word_wrap="true">
        log_in_to_change
     </text_editor>
-    
+
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index c01a032209..8bff865eb1 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -33,16 +33,15 @@
     <button
      control_name="MuteAudio"
      follows="top|right"
-     height="18"
-     image_selected="Parcel_VoiceNo_Dark"
-     image_unselected="Parcel_Voice_Dark"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="16"
+     left_pad="10"
      name="mute_audio"
      tab_stop="false"
-     top_delta="-2"
-     width="22" />
+     width="16" />
     <check_box
      control_name="MuteWhenMinimized"
      height="15"
@@ -74,20 +73,19 @@
          function="Pref.setControlFalse"
          parameter="MuteAmbient" />
     </slider>
-    <button
-     control_name="MuteAmbient"
+        <button
+    control_name="MuteAmbient"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="18"
-     image_selected="Parcel_VoiceNo_Dark"
-     image_unselected="Parcel_Voice_Dark"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="16"
-     name="mute_wind"
+     left_pad="10"
+     name="mute_audio"
      tab_stop="false"
-     top_delta="-2"
-     width="22" />
+     width="16" />
         <slider
      control_name="AudioLevelUI"
      disabled_control="MuteAudio"
@@ -113,16 +111,15 @@
      control_name="MuteUI"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="18"
-     image_selected="Parcel_VoiceNo_Dark"
-     image_unselected="Parcel_Voice_Dark"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="16"
-     name="mute_ui"
+     left_pad="10"
+     name="mute_audio"
      tab_stop="false"
-     top_delta="-2"
-     width="22" />
+     width="16" />
         <slider
      control_name="AudioLevelMedia"
      disabled_control="MuteAudio"
@@ -144,20 +141,19 @@
      function="Pref.setControlFalse"
      parameter="MuteMedia" />
     </slider>
-    <button
+   <button
      control_name="MuteMedia"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="18"
-     image_selected="Parcel_VoiceNo_Dark"
-     image_unselected="Parcel_Voice_Dark"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="16"
-     name="mute_media"
+     left_pad="10"
+     name="mute_audio"
      tab_stop="false"
-     top_delta="-2"
-     width="22" />
+     width="16" />
     <slider
      control_name="AudioLevelSFX"
      disabled_control="MuteAudio"
@@ -179,20 +175,19 @@
          function="Pref.setControlFalse"
          parameter="MuteSounds" />
     </slider>
-    <button
+   <button
      control_name="MuteSounds"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="18"
-     image_selected="Parcel_VoiceNo_Dark"
-     image_unselected="Parcel_Voice_Dark"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="16"
-     name="mute_sfx"
+     left_pad="10"
+     name="mute_audio"
      tab_stop="false"
-     top_delta="-2"
-     width="22" />
+     width="16" />
     <slider
      control_name="AudioLevelMusic"
      disabled_control="MuteAudio"
@@ -214,20 +209,19 @@
          function="Pref.setControlFalse"
          parameter="MuteMusic" />
     </slider>
-    <button
+      <button
      control_name="MuteMusic"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="18"
-     image_selected="Parcel_VoiceNo_Dark"
-     image_unselected="Parcel_Voice_Dark"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="16"
-     name="mute_music"
+     left_pad="10"
+     name="mute_audio"
      tab_stop="false"
-     top_delta="-2"
-     width="22" />
+     width="16" />
    <check_box
      label_text.halign="left"
      follows="left|top"
@@ -236,10 +230,9 @@
      disabled_control="CmdLineDisableVoice"
      label="Enable voice"
      layout="topleft"
-     font.style="BOLD"
-     left="101"
+     left="28"
      name="enable_voice_check"
-     top_pad="13"
+     top_pad="5"
      width="110"
      >
     </check_box>
@@ -265,21 +258,19 @@
          function="Pref.setControlFalse"
          parameter="MuteVoice" />
     </slider>
-    <button
+     <button
      control_name="MuteVoice"
-     enabled_control="EnableVoiceChat"
      disabled_control="MuteAudio"
      follows="top|right"
-     height="18"
-     image_selected="Parcel_VoiceNo_Dark"
-     image_unselected="Parcel_Voice_Dark"
+     height="16"
+     image_selected="AudioMute_Off"
+     image_unselected="Audio_Off"
      is_toggle="true"
      layout="topleft"
-     left_pad="16"
-     name="mute_voice"
+     left_pad="10"
+     name="mute_audio"
      tab_stop="false"
-     top_delta="-2"
-     width="22" />
+     width="16" />
     <text
      type="string"
      length="1"
@@ -366,7 +357,7 @@
      name="device_settings_panel"
      class="panel_voice_device_settings"
      width="501"
-     top="280">
+     top="285">
       <panel.string
         name="default_text">
         Default
-- 
cgit v1.2.3


From 63b1305e4cc878290a9c66c685196e6a7cedc0cf Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Mon, 1 Feb 2010 18:03:17 -0800
Subject: EXT-4698 Object, avatar menu has

---
 .../skins/default/xui/en/menu_avatar_self.xml      | 10 ++++----
 indra/newview/skins/default/xui/en/menu_object.xml | 28 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index 9212d2d648..1e32cfd9df 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -13,11 +13,11 @@
          function="Self.EnableStandUp" />
     </menu_item_call>
     <context_menu
-     label="Take Off &gt;"
+     label="Take Off  ▶"
      layout="topleft"
      name="Take Off &gt;">
         <context_menu
-         label="Clothes &gt;"
+         label="Clothes  ▶"
          layout="topleft"
          name="Clothes &gt;">
             <menu_item_call
@@ -151,7 +151,7 @@
                     <menu_item_call.on_enable
                      function="Edit.EnableTakeOff"
                      parameter="alpha" />
-                </menu_item_call>				
+                </menu_item_call>
                 <menu_item_separator
                  layout="topleft" />
                 <menu_item_call
@@ -164,11 +164,11 @@
                 </menu_item_call>
         </context_menu>
         <context_menu
-         label="HUD &gt;"
+         label="HUD  ▶"
          layout="topleft"
          name="Object Detach HUD" />
         <context_menu
-         label="Detach &gt;"
+         label="Detach  ▶"
          layout="topleft"
          name="Object Detach" />
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 56028bb2e5..5a9509e284 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -65,7 +65,7 @@
   </menu_item_call>
 <menu_item_separator layout="topleft" />
    <context_menu
-         label="Put On &gt;"
+         label="Put On  ▶"
          name="Put On" >
    <menu_item_call
       enabled="false"
@@ -77,15 +77,25 @@
              function="Object.EnableWear" />
    </menu_item_call>
    <context_menu
-         label="Attach &gt;"
+         label="Attach  ▶"
          name="Object Attach" />
    <context_menu
-         label="Attach HUD &gt;"
+         label="Attach HUD  ▶"
          name="Object Attach HUD" />
    </context_menu>
    <context_menu
-         label="Remove &gt;"
+         label="Remove  ▶"
          name="Remove">
+   <menu_item_call
+     enabled="false"
+     label="Take"
+     name="Pie Object Take">
+        <menu_item_call.on_click
+         function="Tools.BuyOrTake" />
+        <menu_item_call.on_enable
+         function="Tools.EnableBuyOrTake"
+         parameter="Buy,Take" />
+    </menu_item_call>
    <menu_item_call
          enabled="false"
          label="Report Abuse"
@@ -124,16 +134,6 @@
     </menu_item_call>
     </context_menu>
    <menu_item_separator layout="topleft" />
-    <menu_item_call
-     enabled="false"
-     label="Take"
-     name="Pie Object Take">
-        <menu_item_call.on_click
-         function="Tools.BuyOrTake" />
-        <menu_item_call.on_enable
-         function="Tools.EnableBuyOrTake"
-         parameter="Buy,Take" />
-    </menu_item_call>
    <menu_item_call
    enabled="false"
    label="Take Copy"
-- 
cgit v1.2.3


From 6d44848ded11bc7f83b725909d266658fab0cb99 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 2 Feb 2010 17:14:29 -0500
Subject: For EXT-4173: New accounts sometimes appear half-naked.  Fixed race
 condition that sometimes caused incomplete auto-populate folder to be worn

---
 indra/newview/llstartup.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6b816f8786..4d814169cb 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1849,7 +1849,7 @@ bool idle_startup()
 			LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender );
 		}
 
-
+#if 0 // WHY 2x? BAP
 		// We now have an inventory skeleton, so if this is a user's first
 		// login, we can start setting up their clothing and avatar 
 		// appearance.  This helps to avoid the generic "Ruth" avatar in
@@ -1863,6 +1863,7 @@ bool idle_startup()
 			// Start loading the wearables, textures, gestures
 			LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender );
 		}
+#endif
 
 		// wait precache-delay and for agent's avatar or a lot longer.
 		if(((timeout_frac > 1.f) && gAgent.getAvatarObject())
@@ -2526,6 +2527,11 @@ bool callback_choose_gender(const LLSD& notification, const LLSD& response)
 void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
 								   const std::string& gender_name )
 {
+	// Not going through the processAgentInitialWearables path, so need to set this here.
+	LLAppearanceManager::instance().setAttachmentInvLinkEnable(true);
+	// Initiate creation of COF, since we're also bypassing that.
+	gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+	
 	S32 gender = 0;
 	std::string gestures;
 	if (gender_name == "male")
@@ -2544,7 +2550,7 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
 	LLInventoryModel::cat_array_t cat_array;
 	LLInventoryModel::item_array_t item_array;
 	LLNameCategoryCollector has_name(outfit_folder_name);
-	gInventory.collectDescendentsIf(LLUUID::null,
+	gInventory.collectDescendentsIf(gInventory.getLibraryRootFolderID(),
 									cat_array,
 									item_array,
 									LLInventoryModel::EXCLUDE_TRASH,
@@ -2555,7 +2561,10 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
 	}
 	else
 	{
-		LLAppearanceManager::instance().wearOutfitByName(outfit_folder_name);
+		LLInventoryCategory* cat = cat_array.get(0);
+		bool do_copy = true;
+		bool do_append = false;
+		LLAppearanceManager::instance().wearInventoryCategory(cat, do_copy, do_append);
 	}
 	LLAppearanceManager::instance().wearOutfitByName(gestures);
 	LLAppearanceManager::instance().wearOutfitByName(COMMON_GESTURES_FOLDER);
-- 
cgit v1.2.3


From 5e63efe1da6b72fc0ce9771b9ef1e5c9d9bcb537 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 3 Feb 2010 11:38:03 +0200
Subject: =?UTF-8?q?fixed=20EXT-4805=20=E2=80=9CFriend=20offer=20is=20corru?=
 =?UTF-8?q?pted=20in=20resized=20IM=20window=E2=80=9D,=20reverted=20IM=20f?=
 =?UTF-8?q?loater=20default=20width;=20made=20offer=20buttons=20have=20abs?=
 =?UTF-8?q?olute=20positions;=20avoided=20text=20message=20scrolling=20wit?=
 =?UTF-8?q?h=20default=20IM=20floater=20width;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/llchathistory.cpp                    | 38 ++++++++++++++++++++++
 .../skins/default/xui/en/floater_im_session.xml    | 10 +++---
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 581c210bd5..64226ac52b 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -55,6 +55,7 @@
 #include "lltoastnotifypanel.h"
 #include "llviewerregion.h"
 #include "llworld.h"
+#include "lluiconstants.h"
 
 
 #include "llsidetray.h"//for blocked objects panel
@@ -664,8 +665,36 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 		{
 			LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(
 					notification);
+			//we can't set follows in xml since it broke toasts behavior
 			notify_box->setFollowsLeft();
 			notify_box->setFollowsRight();
+			notify_box->setFollowsTop();
+
+			LLButton* accept_button = notify_box->getChild<LLButton> ("Accept",
+					TRUE);
+			if (accept_button != NULL)
+			{
+				accept_button->setFollowsNone();
+				accept_button->setOrigin(2*HPAD, accept_button->getRect().mBottom);
+			}
+
+			LLButton* decline_button = notify_box->getChild<LLButton> (
+					"Decline", TRUE);
+			if (accept_button != NULL && decline_button != NULL)
+			{
+				decline_button->setFollowsNone();
+				decline_button->setOrigin(4*HPAD
+						+ accept_button->getRect().getWidth(),
+						decline_button->getRect().mBottom);
+			}
+
+			LLTextEditor* text_editor = notify_box->getChild<LLTextEditor>("text_editor_box", TRUE);
+			S32 text_heigth = 0;
+			if(text_editor != NULL)
+			{
+				text_heigth = text_editor->getTextBoundingRect().getHeight();
+			}
+
 			//Prepare the rect for the view
 			LLRect target_rect = mEditor->getDocumentView()->getRect();
 			// squeeze down the widget by subtracting padding off left and right
@@ -675,6 +704,15 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 					notify_box->getRect().getHeight());
 			notify_box->setOrigin(target_rect.mLeft, notify_box->getRect().mBottom);
 
+			if (text_editor != NULL)
+			{
+				S32 text_heigth_delta =
+						text_editor->getTextBoundingRect().getHeight()
+								- text_heigth;
+				notify_box->reshape(target_rect.getWidth(),
+								notify_box->getRect().getHeight() + text_heigth_delta);
+			}
+
 			LLInlineViewSegment::Params params;
 			params.view = notify_box;
 			params.left_pad = mLeftWidgetPad;
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 9aaa660574..d2e5473157 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -12,7 +12,7 @@
  can_minimize="true"
  can_close="true"
  visible="false"
- width="440"
+ width="360"
  can_resize="true"
  min_width="250"
  min_height="190">
@@ -20,7 +20,7 @@
    animate="false" 
   follows="all"
   height="320"
-  width="440"
+  width="360"
   layout="topleft"
   orientation="horizontal"
   name="im_panels"
@@ -38,7 +38,7 @@
        left="0"
        top="0"
        height="200"
-	     width="325"
+	     width="245"
        user_resize="true">
         <button
           height="20"
@@ -65,7 +65,7 @@
          parse_highlights="true"
          allow_html="true"
         left="1"
-         width="320">
+         width="240">
         </chat_history>
         <line_editor
          bottom="0"
@@ -75,7 +75,7 @@
          label="To"
          layout="bottomleft"
          name="chat_editor"
-         width="320">
+         width="240">
         </line_editor>
     </layout_panel>
   </layout_stack>
-- 
cgit v1.2.3


From 007bc25f66bd54421a089777b1a1ab28eeed1a7d Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 3 Feb 2010 13:33:14 +0200
Subject: Fixed critical bug EXT-4838 ([NUX] Add empty Groups list condition
 text) - moved processing of empty list message into LLGroupList - implemented
 separate messages for empty list: No matched groups / no groups at all

--HG--
branch : product-engine
---
 indra/newview/llgrouplist.cpp                       | 19 ++++++++++++++++++-
 indra/newview/llgrouplist.h                         | 11 +++++++++++
 indra/newview/llpanelpeople.cpp                     |  1 -
 indra/newview/skins/default/xui/en/panel_people.xml |  5 ++---
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index e01709aa3a..e924e902df 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -72,6 +72,8 @@ public:
 static const LLGroupComparator GROUP_COMPARATOR;
 
 LLGroupList::Params::Params()
+: no_groups_msg("no_groups_msg")
+, no_filtered_groups_msg("no_filtered_groups_msg")
 {
 	
 }
@@ -79,6 +81,8 @@ LLGroupList::Params::Params()
 LLGroupList::LLGroupList(const Params& p)
 :	LLFlatListView(p)
 	, mDirty(true) // to force initial update
+	, mNoFilteredGroupsMsg(p.no_filtered_groups_msg)
+	, mNoGroupsMsg(p.no_groups_msg)
 {
 	// Listen for agent group changes.
 	gAgent.addListener(this, "new group");
@@ -158,6 +162,18 @@ void LLGroupList::refresh()
 	LLUUID				id;
 	bool				have_filter		= !mNameFilter.empty();
 
+	// set no items message depend on filter state & total count of groups
+	if (have_filter)
+	{
+		// groups were filtered
+		setNoItemsCommentText(mNoFilteredGroupsMsg);
+	}
+	else if (0 == count)
+	{
+		// user is not a member of any group
+		setNoItemsCommentText(mNoGroupsMsg);
+	}
+
 	clear();
 
 	for(S32 i = 0; i < count; ++i)
@@ -173,7 +189,8 @@ void LLGroupList::refresh()
 	sort();
 
 	// Add "none" to list at top if filter not set (what's the point of filtering "none"?).
-	if (!have_filter)
+	// but only if some real groups exists. EXT-4838
+	if (!have_filter && count > 0)
 	{
 		std::string loc_none = LLTrans::getString("GroupsNone");
 		addNewItem(LLUUID::null, loc_none, LLUUID::null, ADD_TOP);
diff --git a/indra/newview/llgrouplist.h b/indra/newview/llgrouplist.h
index f7afe0c0b2..f3ac676edd 100644
--- a/indra/newview/llgrouplist.h
+++ b/indra/newview/llgrouplist.h
@@ -53,6 +53,15 @@ class LLGroupList: public LLFlatListView, public LLOldEvents::LLSimpleListener
 public:
 	struct Params : public LLInitParam::Block<Params, LLFlatListView::Params> 
 	{
+		/**
+		 * Contains a message for empty list when user is not a member of any group
+		 */
+		Optional<std::string>	no_groups_msg;
+
+		/**
+		 * Contains a message for empty list when all groups don't match passed filter
+		 */
+		Optional<std::string>	no_filtered_groups_msg;
 		Params();
 	};
 
@@ -80,6 +89,8 @@ private:
 	bool mShowIcons;
 	bool mDirty;
 	std::string mNameFilter;
+	std::string mNoFilteredGroupsMsg;
+	std::string mNoGroupsMsg;
 };
 
 class LLButton;
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index b01cdcc832..fb6f36d4da 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -516,7 +516,6 @@ BOOL LLPanelPeople::postBuild()
 	mRecentList->setShowIcons("RecentListShowIcons");
 
 	mGroupList = getChild<LLGroupList>("group_list");
-	mGroupList->setNoItemsCommentText(getString("no_groups"));
 
 	mNearbyList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu);
 	mRecentList->setContextMenu(&LLPanelPeopleMenus::gNearbyMenu);
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index ac98bb9bd9..9b83e0c68e 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -23,9 +23,6 @@ background_visible="true"
     <string
      name="no_friends"
      value="No friends" />
-    <string
-     name="no_groups"
-     value="No groups" />
     <string
      name="people_filter_label"
      value="Filter People" />
@@ -226,6 +223,8 @@ background_visible="true"
              layout="topleft"
              left="0"
              name="group_list"
+             no_filtered_groups_msg="No groups"
+             no_groups_msg="[secondlife:///app/search/groups Trying searching for some groups to join.]"
              top="0"
              width="313" />
             <panel
-- 
cgit v1.2.3


From e1637b79a426df8cef575352bbee299458bf42b3 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 3 Feb 2010 13:34:00 +0200
Subject: No ticket: removed deprecated commented out code

--HG--
branch : product-engine
---
 indra/newview/llgrouplist.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp
index e924e902df..1ed1113f4d 100644
--- a/indra/newview/llgrouplist.cpp
+++ b/indra/newview/llgrouplist.cpp
@@ -89,9 +89,6 @@ LLGroupList::LLGroupList(const Params& p)
 
 	mShowIcons = gSavedSettings.getBOOL("GroupListShowIcons");
 	setCommitOnSelectionChange(true);
-	// TODO: implement context menu
-	// display a context menu appropriate for a list of group names
-//	setContextMenu(LLScrollListCtrl::MENU_GROUP);
 
 	// Set default sort order.
 	setComparator(&GROUP_COMPARATOR);
-- 
cgit v1.2.3


From 2a77ef80cec7cacb6c812eb358caef6a73332289 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 3 Feb 2010 14:18:06 +0200
Subject: Backed out changeset 5add97e5b6cf Related to major bug EXT-3985 [BSI]
 Landmarks created in Viewer 2.0 show up with 1@ in Viewer 1.23.x Removed
 auto-cleanup patch to repair Lanmarks in Favorite bar (remove LM Sort
 prefixes)

--HG--
branch : product-engine
---
 indra/newview/llinventorymodel.cpp | 134 -------------------------------------
 1 file changed, 134 deletions(-)

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 9e96bbc55f..961f7adc0a 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -142,105 +142,6 @@ bool LLCanCache::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
 	return rv;
 }
 
-/*
-This namespace contains a functionality to remove LM prefixes were used to store sort order of
-Favorite Landmarks in landmarks' names.
-Once being in Favorites folder LM inventory Item has such prefix.
-Due to another solution is implemented in EXT-3985 these prefixes should be removed.
-
-*NOTE: It will be unnecessary after the first successful session in viewer 2.0.
-Can be removed before public release.
-
-Implementation details:
-At the first run with this patch it patches all cached landmarks: removes LM sort prefixes and
-updates them on the viewer and server sides.
-Also it calls fetching agent's inventory to process not yet loaded landmarks too.
-If fetching is successfully done it will store special per-agent empty file-marker
-in the user temporary folder (where cached inventory is loaded) while caching agent's inventory.
-After that in will not affect the viewer until cached marker is removed.
-*/
-namespace LMSortPrefix
-{
-	bool cleanup_done = false;
-	const std::string getMarkerPath()
-	{
-		std::string path(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, gAgentID.asString()));
-		std::string marker_filename = llformat("%s-lm_prefix_marker", path.c_str());
-
-		return marker_filename;
-	}
-	bool wasClean()
-	{
-		static bool was_clean = false;
-		static bool already_init = false;
-		if (already_init) return was_clean;
-
-		already_init = true;
-		std::string path_to_marker = getMarkerPath();
-		was_clean = LLFile::isfile(path_to_marker);
-
-		return was_clean;
-	}
-
-	void setLandmarksWereCleaned()
-	{
-		if (cleanup_done)
-		{
-			std::string path_to_marker = getMarkerPath();
-			LLFILE* file = LLFile::fopen(path_to_marker, "w");
-			if(!file)
-			{
-				llwarns << "unable to save marker that LM prefixes were removed: " << path_to_marker << llendl;
-				return;
-			}
-
-			fclose(file);
-		}
-	}
-
-	void removePrefix(LLPointer<LLViewerInventoryItem> inv_item)
-	{
-		if (wasClean())
-		{
-			LL_INFOS_ONCE("") << "Inventory was cleaned for this avatar. Patch can be removed." << LL_ENDL;
-			return;
-		}
-
-		if (LLInventoryType::IT_LANDMARK != inv_item->getInventoryType()) return;
-
-		std::string old_name = inv_item->getName();
-
-		S32 sort_field = -1;
-		std::string display_name;
-		BOOL exists = LLViewerInventoryItem::extractSortFieldAndDisplayName(old_name, &sort_field, &display_name);
-		if (exists && sort_field != -1)
-		{
-			llinfos << "Removing Landmark sort field and separator for: " << old_name << " | " << inv_item->getUUID() << llendl;
-			LLUUID parent_uuid = inv_item->getParentUUID();
-			if (gInventory.getCategory(parent_uuid))
-			{
-				llinfos << "parent folder is: " << gInventory.getCategory(parent_uuid)->getName() << llendl;
-			}
-
-
-			// mark item completed to avoid error while copying and updating server
-			inv_item->setComplete(TRUE);
-			LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(inv_item);
-			new_item->rename(display_name);
-			gInventory.updateItem(new_item);
-			new_item->updateServer(FALSE);
-
-			gInventory.notifyObservers();
-		}
-	}
-
-	void completeCleanup()
-	{
-		// background fetch is completed. can save marker
-		cleanup_done = true;
-	}
-}
-
 ///----------------------------------------------------------------------------
 /// Class LLInventoryModel
 ///----------------------------------------------------------------------------
@@ -1835,8 +1736,6 @@ void LLInventoryModel::stopBackgroundFetch()
 		gIdleCallbacks.deleteFunction(&LLInventoryModel::backgroundFetch, NULL);
 		sBulkFetchCount=0;
 		sMinTimeBetweenFetches=0.0f;
-
-		LMSortPrefix::completeCleanup();
 	}
 }
 
@@ -1983,13 +1882,6 @@ void LLInventoryModel::cache(
 	const LLUUID& parent_folder_id,
 	const LLUUID& agent_id)
 {
-	if (getRootFolderID() == parent_folder_id)
-	{
-		// *TODO: mantipov: can be removed before public release, EXT-3985
-		//save marker to avoid fetching inventory on future sessions
-		LMSortPrefix::setLandmarksWereCleaned();
-	}
-
 	lldebugs << "Caching " << parent_folder_id << " for " << agent_id
 			 << llendl;
 	LLViewerInventoryCategory* root_cat = getCategory(parent_folder_id);
@@ -2800,28 +2692,6 @@ void LLInventoryModel::buildParentChildMap()
 			// The inv tree is built.
 			mIsAgentInvUsable = true;
 
-			{// *TODO: mantipov: can be removed before public release, EXT-3985
-				/*
-				*HACK: mantipov: to cleanup landmarks were marked with sort index prefix in name.
-				Is necessary to be called once per account after EXT-3985 is implemented.
-				So, let fetch agent's inventory, processing will be done in processInventoryDescendents()
-				Should be removed before public release.
-				*/
-				if (!LMSortPrefix::wasClean())
-				{
-					cat_array_t cats;
-					item_array_t items;
-					collectDescendents(agent_inv_root_id, cats, items, INCLUDE_TRASH);
-
-					for (item_array_t::const_iterator it= items.begin(); it != items.end(); ++it)
-					{
-						LMSortPrefix::removePrefix(*it);
-					}
-
-					gInventory.startBackgroundFetch(agent_inv_root_id);
-				}
-			}
-
 			llinfos << "Inventory initialized, notifying observers" << llendl;
 			addChangedMask(LLInventoryObserver::ALL, LLUUID::null);
 			notifyObservers();
@@ -3587,10 +3457,6 @@ void LLInventoryModel::processInventoryDescendents(LLMessageSystem* msg,void**)
 			continue;
 		}
 		gInventory.updateItem(titem);
-
-		{// *TODO: mantipov: can be removed before public release, EXT-3985
-			LMSortPrefix::removePrefix(titem);
-		}
 	}
 
 	// set version and descendentcount according to message.
-- 
cgit v1.2.3


From 19ba010137a2b43759cbe5d871fb430784e15db2 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 3 Feb 2010 12:49:38 +0200
Subject: Fixed low bug EXT-4802 - Clearing whole teleport history doesn't
 clear TP history from nav bar

--HG--
branch : product-engine
---
 indra/newview/llpanelteleporthistory.cpp | 3 +++
 indra/newview/llteleporthistory.cpp      | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 43e0f9a88c..90c8f2551f 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -940,6 +940,9 @@ bool LLTeleportHistoryPanel::onClearTeleportHistoryDialog(const LLSD& notificati
 
 	if (0 == option)
 	{
+		// order does matter, call this first or teleport history will contain one record(current location)
+		LLTeleportHistory::getInstance()->purgeItems();
+
 		LLTeleportHistoryStorage *th = LLTeleportHistoryStorage::getInstance();
 		th->purgeItems();
 		th->save();
diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp
index ce00dec802..dcc85392f7 100644
--- a/indra/newview/llteleporthistory.cpp
+++ b/indra/newview/llteleporthistory.cpp
@@ -173,6 +173,8 @@ void LLTeleportHistory::purgeItems()
 	// reset the count
 	mRequestedItem = -1;
 	mCurrentItem = 0;
+
+	onHistoryChanged();
 }
 
 // static
-- 
cgit v1.2.3


From 2a755eca16567e9566007e9771cce78b3f92bc0b Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 3 Feb 2010 14:44:32 +0200
Subject: Fixed normal bug EXT-4766 - System notifications in nearby chat has
 default avatar icon and behave like sent from object

--HG--
branch : product-engine
---
 indra/newview/llviewermessage.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 26c9a1dd79..3bf0fb6f71 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2181,6 +2181,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				chat.mFromID = from_id ^ gAgent.getSessionID();
 			}
 
+			if(SYSTEM_FROM == name)
+			{
+				// System's UUID is NULL (fixes EXT-4766)
+				chat.mFromID = from_id = LLUUID::null;
+			}
+
 			LLSD query_string;
 			query_string["owner"] = from_id;
 			query_string["slurl"] = location;
-- 
cgit v1.2.3


From cc98d2f034a5109a05b40bd88dfa8dd6b6f7d275 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 3 Feb 2010 14:51:02 +0200
Subject: Updated comment for ticket EXT-4772(No new IM notification when in
 tabbed IM mode)

--HG--
branch : product-engine
---
 indra/newview/llimfloater.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 4a18c8640f..36f7304074 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -515,7 +515,7 @@ BOOL LLIMFloater::getVisible()
 	if(isChatMultiTab())
 	{
 		LLIMFloaterContainer* im_container = LLIMFloaterContainer::getInstance();
-		// Tabbed IM window is "visible" when we minimize it.
+		// getVisible() returns TRUE when Tabbed IM window is minimized.
 		return !im_container->isMinimized() && im_container->getVisible();
 	}
 	else
-- 
cgit v1.2.3


From 8c9c30116878eb5034531b44c87fd9309e36ec13 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 3 Feb 2010 15:10:03 +0200
Subject: Fixed normal bug EXT-4873 - Homepage field in My Profile (edit) no
 longer appears

--HG--
branch : product-engine
---
 indra/newview/llpanelavatar.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 48dd5513bd..0423cf75fa 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -582,6 +582,9 @@ void LLPanelAvatarProfile::processProfileProperties(const LLAvatarData* avatar_d
 {
 	fillCommonData(avatar_data);
 
+	// Hide home page textbox if no page was set to fix "homepage URL appears clickable without URL - EXT-4734"
+	childSetVisible("homepage_edit", !avatar_data->profile_url.empty());
+
 	fillPartnerData(avatar_data);
 
 	fillAccountStatus(avatar_data);
@@ -635,9 +638,6 @@ void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data)
 	childSetValue("2nd_life_pic", avatar_data->image_id);
 	childSetValue("real_world_pic", avatar_data->fl_image_id);
 	childSetValue("homepage_edit", avatar_data->profile_url);
-
-	// Hide home page textbox if no page was set to fix "homepage URL appears clickable without URL - EXT-4734"
-	childSetVisible("homepage_edit", !avatar_data->profile_url.empty());
 }
 
 void LLPanelAvatarProfile::fillPartnerData(const LLAvatarData* avatar_data)
-- 
cgit v1.2.3


From a9aa9f41188c78b4025bea7657ead279a2877fd5 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 3 Feb 2010 15:21:08 +0200
Subject: Update for normal bug EXT-4873 - Homepage field in My Profile (edit)
 no longer appears

--HG--
branch : product-engine
---
 indra/newview/llpanelavatar.cpp | 6 +++---
 indra/newview/llpanelme.cpp     | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 0423cf75fa..48dd5513bd 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -582,9 +582,6 @@ void LLPanelAvatarProfile::processProfileProperties(const LLAvatarData* avatar_d
 {
 	fillCommonData(avatar_data);
 
-	// Hide home page textbox if no page was set to fix "homepage URL appears clickable without URL - EXT-4734"
-	childSetVisible("homepage_edit", !avatar_data->profile_url.empty());
-
 	fillPartnerData(avatar_data);
 
 	fillAccountStatus(avatar_data);
@@ -638,6 +635,9 @@ void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data)
 	childSetValue("2nd_life_pic", avatar_data->image_id);
 	childSetValue("real_world_pic", avatar_data->fl_image_id);
 	childSetValue("homepage_edit", avatar_data->profile_url);
+
+	// Hide home page textbox if no page was set to fix "homepage URL appears clickable without URL - EXT-4734"
+	childSetVisible("homepage_edit", !avatar_data->profile_url.empty());
 }
 
 void LLPanelAvatarProfile::fillPartnerData(const LLAvatarData* avatar_data)
diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index 0f0fb4b94e..ea66ef7d2c 100644
--- a/indra/newview/llpanelme.cpp
+++ b/indra/newview/llpanelme.cpp
@@ -198,6 +198,10 @@ void LLPanelMyProfileEdit::processProfileProperties(const LLAvatarData* avatar_d
 {
 	fillCommonData(avatar_data);
 
+	// 'Home page' was hidden in LLPanelAvatarProfile::fillCommonData() to fix  EXT-4734
+	// Show 'Home page' in Edit My Profile (EXT-4873)
+	childSetVisible("homepage_edit", true);
+
 	fillPartnerData(avatar_data);
 
 	fillAccountStatus(avatar_data);
-- 
cgit v1.2.3


From 6ebbc5edf6c95f68088577f82b2c1daf73b68205 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 3 Feb 2010 16:15:34 +0200
Subject: =?UTF-8?q?fixed=20EXT-4764=20=E2=80=9CForbid=20connecting=20to=20?=
 =?UTF-8?q?different=20voice=20channels=20at=20once=E2=80=9D,=20removed=20?=
 =?UTF-8?q?redundant=20call=20status=20notifications:=20ringing,=20connect?=
 =?UTF-8?q?ed,=20hang=5Fup,=20unavailable,=20answering;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/llimview.cpp           | 42 ------------------------------------
 indra/newview/llimview.h             | 10 ---------
 indra/newview/llviewerfloaterreg.cpp |  1 -
 indra/newview/llvoicechannel.cpp     | 18 ++++++++++------
 4 files changed, 12 insertions(+), 59 deletions(-)

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index db6b2041f8..9a3a4c0125 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -2985,48 +2985,6 @@ public:
 	}
 };
 
-LLCallInfoDialog::LLCallInfoDialog(const LLSD& payload) : LLCallDialog(payload)
-{
-}
-
-BOOL LLCallInfoDialog::postBuild()
-{
-	// init notification's lifetime
-	std::istringstream ss( getString("lifetime") );
-	if (!(ss >> mLifetime))
-	{
-		mLifetime = DEFAULT_LIFETIME;
-	}
-	return LLCallDialog::postBuild();
-}
-
-void LLCallInfoDialog::onOpen(const LLSD& key)
-{
-	if(key.has("msg"))
-	{
-		std::string msg = key["msg"];
-		getChild<LLTextBox>("msg")->setValue(msg);
-	}
-
-	mLifetimeTimer.start();
-}
-
-void LLCallInfoDialog::show(const std::string& status_name, const LLSD& args)
-{
-	LLUIString message = LLTrans::getString(status_name);
-	message.setArgs(args);
-
-	LLSD payload;
-	payload["msg"] = message;
-	LLFloater* inst = LLFloaterReg::findInstance("call_info");
-
-	// avoid recreate instance with the same message
-	if (inst == NULL || message.getString() != inst->getChild<LLTextBox>("msg")->getValue())
-	{
-		LLFloaterReg::showInstance("call_info", payload);
-	}
-}
-
 LLHTTPRegistration<LLViewerChatterBoxSessionStartReply>
    gHTTPRegistrationMessageChatterboxsessionstartreply(
 	   "/message/ChatterBoxSessionStartReply");
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index b573490fa3..1c7aaa3f1b 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -530,16 +530,6 @@ private:
 	void hideAllText();
 };
 
-class LLCallInfoDialog : public LLCallDialog
-{
-public:
-	LLCallInfoDialog(const LLSD& payload);
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);
-
-	static void show(const std::string& status_name, const LLSD& args);
-};
-
 // Globals
 extern LLIMMgr *gIMMgr;
 
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 658d1c9ddd..29114c33c5 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -200,7 +200,6 @@ void LLViewerFloaterReg::registerFloaters()
 
 	LLFloaterReg::add("openobject", "floater_openobject.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterOpenObject>);
 	LLFloaterReg::add("outgoing_call", "floater_outgoing_call.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLOutgoingCallDialog>);
-	LLFloaterReg::add("call_info", "floater_call_info.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLCallInfoDialog>);
 	LLFloaterReg::add("parcel_info", "floater_preview_url.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterParcelInfo>);
 	LLFloaterPayUtil::registerFloater();
 
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index 9d49fb69d6..bb09a18cc3 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -389,13 +389,16 @@ void LLVoiceChannel::setState(EState state)
 	switch(state)
 	{
 	case STATE_RINGING:
-		LLCallInfoDialog::show("ringing", mNotifyArgs);
+		//TODO: remove or redirect this call status notification
+//		LLCallInfoDialog::show("ringing", mNotifyArgs);
 		break;
 	case STATE_CONNECTED:
-		LLCallInfoDialog::show("connected", mNotifyArgs);
+		//TODO: remove or redirect this call status notification
+//		LLCallInfoDialog::show("connected", mNotifyArgs);
 		break;
 	case STATE_HUNG_UP:
-		LLCallInfoDialog::show("hang_up", mNotifyArgs);
+		//TODO: remove or redirect this call status notification
+//		LLCallInfoDialog::show("hang_up", mNotifyArgs);
 		break;
 	default:
 		break;
@@ -635,7 +638,8 @@ void LLVoiceChannelGroup::setState(EState state)
 	case STATE_RINGING:
 		if ( !mIsRetrying )
 		{
-			LLCallInfoDialog::show("ringing", mNotifyArgs);
+			//TODO: remove or redirect this call status notification
+//			LLCallInfoDialog::show("ringing", mNotifyArgs);
 		}
 
 		doSetState(state);
@@ -701,7 +705,8 @@ void LLVoiceChannelProximal::handleStatusChange(EStatusType status)
 		//skip showing "Voice not available at your current location" when agent voice is disabled (EXT-4749)
 		if(LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking())
 		{
-			LLCallInfoDialog::show("unavailable", mNotifyArgs);
+			//TODO: remove or redirect this call status notification
+//			LLCallInfoDialog::show("unavailable", mNotifyArgs);
 		}
 		return;
 	default:
@@ -901,7 +906,8 @@ void LLVoiceChannelP2P::setState(EState state)
 		// so provide a special purpose message here
 		if (mReceivedCall && state == STATE_RINGING)
 		{
-			LLCallInfoDialog::show("answering", mNotifyArgs);
+			//TODO: remove or redirect this call status notification
+//			LLCallInfoDialog::show("answering", mNotifyArgs);
 			doSetState(state);
 			return;
 		}
-- 
cgit v1.2.3


From cb03e6f92a5d89056ef83e97fe436a165bb3ae78 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 3 Feb 2010 16:25:32 +0200
Subject: fixed EXT-4776 Make avatars in nearby chat inspectable

--HG--
branch : product-engine
---
 indra/newview/llchathistory.cpp                    | 30 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_chat_header.xml     |  7 ++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 64226ac52b..a351c52ce2 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -53,7 +53,9 @@
 #include "llagent.h"
 #include "llnotificationsutil.h"
 #include "lltoastnotifypanel.h"
+#include "lltooltip.h"
 #include "llviewerregion.h"
+#include "llviewertexteditor.h"
 #include "llworld.h"
 #include "lluiconstants.h"
 
@@ -111,6 +113,34 @@ public:
 		return LLPanel::handleMouseUp(x,y,mask);
 	}
 
+	//*TODO remake it using mouse enter/leave and static LLHandle<LLIconCtrl> to add/remove as a child
+	BOOL handleToolTip(S32 x, S32 y, MASK mask)
+	{
+		LLViewerTextEditor* name = getChild<LLViewerTextEditor>("user_name");
+		if (name && name->parentPointInView(x, y) && mAvatarID.notNull() && SYSTEM_FROM != mFrom)
+		{
+
+			// Spawn at right side of the name textbox.
+			LLRect sticky_rect = name->calcScreenRect();
+			S32 icon_x = llmin(sticky_rect.mLeft + name->getTextBoundingRect().getWidth() + 7, sticky_rect.mRight - 3);
+
+			LLToolTip::Params params;
+			params.background_visible(false);
+			params.click_callback(boost::bind(&LLChatHistoryHeader::onHeaderPanelClick, this, 0, 0, 0));
+			params.delay_time(0.0f);		// spawn instantly on hover
+			params.image(LLUI::getUIImage("Info_Small"));
+			params.message("");
+			params.padding(0);
+			params.pos(LLCoordGL(icon_x, sticky_rect.mTop - 2));
+			params.sticky_rect(sticky_rect);
+
+			LLToolTipMgr::getInstance()->show(params);
+			return TRUE;
+		}
+
+		return LLPanel::handleToolTip(x, y, mask);
+	}
+
 	void onObjectIconContextMenuItemClicked(const LLSD& userdata)
 	{
 		std::string level = userdata.asString();
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index 39c4923f12..89d632c4c6 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -21,19 +21,20 @@
          width="18" />
     <text_editor
       allow_scroll="false"
-      v_pad = "0"
+      v_pad = "7"
       read_only = "true"
       follows="left|right"
       font.style="BOLD"
-      height="12"
+      height="24"
       layout="topleft"
       left_pad="5"
       right="-120"
       name="user_name"
       text_color="white"
       bg_readonly_color="black"
-      top="8"
+      top="0"
       use_ellipses="true"
+      valign="bottom" 
       value="Ericag Vader" />
     <text
             font="SansSerifSmall"
-- 
cgit v1.2.3


From 11f732bbbe910c2a63efaeb9044d206142d69e2f Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 3 Feb 2010 16:37:32 +0200
Subject: No ticket. Added comments regarding EXT-4758 and
 LLVoiceClient::voiceWorking() in general to clear things up a bit.

--HG--
branch : product-engine
---
 indra/newview/llvoiceclient.cpp | 2 ++
 indra/newview/llvoiceclient.h   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 7c6ba33553..431e9625c4 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -5979,8 +5979,10 @@ bool LLVoiceClient::voiceEnabled()
 	return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice");
 }
 
+//AD *TODO: investigate possible merge of voiceWorking() and voiceEnabled() into one non-static method
 bool LLVoiceClient::voiceWorking()
 {
+	//Added stateSessionTerminated state to avoid problems with call in parcels with disabled voice (EXT-4758)
 	return (stateLoggedIn <= mState) && (mState <= stateSessionTerminated);
 }
 
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 8f668dff19..a96cf18e27 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -192,6 +192,7 @@ static	void updatePosition(void);
 		void setVoiceEnabled(bool enabled);
 		static bool voiceEnabled();
 		// Checks is voice working judging from mState
+		// Returns true if vivox has successfully logged in and is not in error state
 		bool voiceWorking();
 		void setUsePTT(bool usePTT);
 		void setPTTIsToggle(bool PTTIsToggle);
-- 
cgit v1.2.3


From 57234d2744cd55a513a885a0b5e78e0b33ceebbf Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 3 Feb 2010 16:42:06 +0200
Subject: fix CRASH in roles tab in group info panel. no ticket...

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_roles.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index f19057cae3..25a0213bde 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -493,6 +493,10 @@ things in this group. There&apos;s a broad variety of Abilities.
          tool_tip="For details of each allowed ability see the abilities tab"
          top_pad="0"
          width="300">
+            <scroll_list.columns
+             label=""
+             name="icon"
+             width="2" />
             <scroll_list.columns
              label=""
              name="checkbox"
-- 
cgit v1.2.3


From 5bcf9661c5d9724191030896d4db61c57146a062 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 3 Feb 2010 16:48:15 +0200
Subject: Fixed normal bug EXT-4796 (Linux only: Call Group button blinks while
 Group Chat).

- Removed updateCallButton() call from draw() and added it to LLIMFloater::sessionInitReplyReceived() to enable "Call" button when session is initialized.

--HG--
branch : product-engine
---
 indra/newview/llimfloater.cpp           | 6 ++++++
 indra/newview/llpanelimcontrolpanel.cpp | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 36f7304074..1eac90371d 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -572,6 +572,12 @@ void LLIMFloater::sessionInitReplyReceived(const LLUUID& im_session_id)
 		setKey(im_session_id);
 		mControlPanel->setSessionId(im_session_id);
 	}
+
+	// updating "Call" button from group control panel here to enable it without placing into draw() (EXT-4796)
+	if(gAgent.isInGroup(im_session_id))
+	{
+		mControlPanel->updateCallButton();
+	}
 	
 	//*TODO here we should remove "starting session..." warning message if we added it in postBuild() (IB)
 
diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index ff1e43b526..d491583b56 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -280,8 +280,6 @@ void LLPanelGroupControlPanel::draw()
 	// Need to resort the participant list if it's in sort by recent speaker order.
 	if (mParticipantList)
 		mParticipantList->updateRecentSpeakersOrder();
-	//* TODO: find better way to properly enable call button for group and remove this call from draw()
-	updateCallButton();
 	LLPanelChatControlPanel::draw();
 }
 
-- 
cgit v1.2.3


From 5ec6cc4fe1ff4c042b31285e62683eb3f4e9c73d Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Wed, 3 Feb 2010 16:52:29 +0200
Subject: fixed critical  Bug  EXT-4831 [NUX] Parcel property icons are off by
 default Default value of 'NavBarShowParcelProperties' has been changed

--HG--
branch : product-engine
---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 62197406b6..793d7b6207 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7802,7 +7802,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>ShowCrosshairs</key>
     <map>
-- 
cgit v1.2.3


From 906ee0cc6348fc3cce70f971f3009924550c24be Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 3 Feb 2010 16:57:24 +0200
Subject: fix for reopened EXT-4578  Noninteractive voice notifications should
 have close affordance

--HG--
branch : product-engine
---
 indra/newview/llimview.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 9a3a4c0125..0c64c2b032 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1709,6 +1709,8 @@ BOOL LLOutgoingCallDialog::postBuild()
 
 	childSetAction("Cancel", onCancel, this);
 
+	setCanDrag(FALSE);
+
 	return success;
 }
 
@@ -1808,6 +1810,8 @@ BOOL LLIncomingCallDialog::postBuild()
 		mLifetimeTimer.stop();
 	}
 
+	setCanDrag(FALSE);
+
 	return TRUE;
 }
 
-- 
cgit v1.2.3


From cabf4f5d58410e9c1fb8c06b0f40900119d37fa7 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 3 Feb 2010 17:06:57 +0200
Subject: Fixed critical bug EXT-4836 ([NUX] Add text to empty Friends tab in
 People Panel) - added an appropriate message into My Friends tab when avatar
 has no friends. - "global search" & "try the Map" are made as url to
 appropriate floaters

--HG--
branch : product-engine
---
 indra/newview/llpanelpeople.cpp                     |  5 +++++
 indra/newview/skins/default/xui/en/panel_people.xml | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index fb6f36d4da..423ee61e25 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -667,6 +667,11 @@ void LLPanelPeople::updateFriendList()
 		lldebugs << "Friends Cards were not found" << llendl;
 	}
 
+	// show special help text for just created account to help found friends. EXT-4836
+	static LLTextBox* no_friends_text = getChild<LLTextBox>("no_friends_msg");
+	no_friends_text->setVisible(all_friendsp.size() == 0);
+
+
 	LLAvatarTracker::buddy_map_t::const_iterator buddy_it = all_buddies.begin();
 	for (; buddy_it != all_buddies.end(); ++buddy_it)
 	{
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 9b83e0c68e..3b5add33a8 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -160,6 +160,17 @@ background_visible="true"
                          width="313" />
                 </accordion_tab>
             </accordion>
+            <text
+             follows="all"
+             height="450"
+             left="10"
+             name="no_friends_msg"
+             top="10"
+             width="293"
+             wrap="true">
+                To add friends try [secondlife:///app/search/people global search] or click on a user to add them as a friend.
+If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
+             </text>
             <panel
              follows="left|right|bottom"
              height="30"
-- 
cgit v1.2.3


From 3689b28bf7066a750d24dbb34a809a6d2fa953ed Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 3 Feb 2010 17:14:04 +0200
Subject: merge

--HG--
branch : product-engine
---
 indra/newview/llgroupmgr.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 8bd0e520c3..72a52ba13b 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1714,6 +1714,8 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 	for (std::vector<LLUUID>::iterator it = member_ids.begin();
 		 it != member_ids.end(); ++it)
 	{
+		LLUUID& ejected_member_id = (*it);
+		
 		// Can't use 'eject' to leave a group.
 		if ((*it) == gAgent.getID()) continue;
 
@@ -1734,7 +1736,7 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 			}
 			
 			msg->nextBlock("EjectData");
-			msg->addUUID("EjecteeID",(*it));
+			msg->addUUID("EjecteeID",ejected_member_id);
 
 			if (msg->isSendFull())
 			{
@@ -1746,13 +1748,15 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 			for (LLGroupMemberData::role_list_t::iterator rit = (*mit).second->roleBegin();
 				 rit != (*mit).second->roleEnd(); ++rit)
 			{
-				if ((*rit).first.notNull())
+				if ((*rit).first.notNull() && (*rit).second!=0)
 				{
-					(*rit).second->removeMember(*it);
+					(*rit).second->removeMember(ejected_member_id);
 				}
 			}
-			delete (*mit).second;
+			
 			group_datap->mMembers.erase(*it);
+			
+			delete (*mit).second;
 		}
 	}
 
-- 
cgit v1.2.3


From 005ec1479021e698714dcdc4bab189af6fcf5ff4 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 3 Feb 2010 17:18:59 +0200
Subject: implemented EXT-4889 Please add Pay button to IM window

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_im_control_panel.xml     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 9279d1e686..3fd75d5755 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -112,6 +112,23 @@
              name="share_btn"
              width="100" />
         </layout_panel>
+        <layout_panel
+         auto_resize="false"
+         follows="top|left|right"
+         height="25"
+         layout="topleft"
+         min_height="25"
+         width="100"
+         name="share_btn_panel"
+         user_resize="false">
+           <button
+             auto_resize="true"
+             follows="left|top|right"
+             height="23"
+             label="Pay"
+             name="pay_btn"
+             width="100" />
+        </layout_panel>
         <layout_panel
          auto_resize="false"
          follows="top|left|right"
-- 
cgit v1.2.3


From f7594c713d93f397440c4af2f566a33f1b6af099 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Wed, 3 Feb 2010 17:42:23 +0200
Subject: fixed EXT-4737 Nearby chat edit field doesn't get focus after pasting

--HG--
branch : product-engine
---
 indra/newview/llbottomtray.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index a2d594cfa2..0102e9488e 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -474,6 +474,7 @@ void LLBottomTray::onContextMenuItemClicked(const LLSD& userdata)
 	else if (item == "paste")
 	{
 		edit_box->paste();
+		edit_box->setFocus(TRUE);
 	}
 	else if (item == "delete")
 	{
-- 
cgit v1.2.3


From 594b1ac679a502f92db477e3f09441e361f72c93 Mon Sep 17 00:00:00 2001
From: "Eric M. Tulla (BigPapi)" <tulla@lindenlab.com>
Date: Wed, 3 Feb 2010 11:42:03 -0500
Subject: EXT-4868: Callback was getting triggered at shutdown, leading to
 crash. Now test isExiting() first. -Reviewed by vir

---
 indra/newview/llagentwearables.cpp | 2 +-
 indra/newview/llappearancemgr.cpp  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index b0ff3a5626..3249d0b31f 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -2300,7 +2300,7 @@ public:
 	
 	virtual ~LLLibraryOutfitsCopyDone()
 	{
-		if (mLibraryOutfitsFetcher)
+		if (!!LLApp::isExiting() && mLibraryOutfitsFetcher)
 		{
 			gInventory.addObserver(mLibraryOutfitsFetcher);
 			mLibraryOutfitsFetcher->done();
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 5088c65122..fa1bfdb5ab 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -279,7 +279,10 @@ public:
 
 	virtual ~LLUpdateAppearanceOnDestroy()
 	{
-		LLAppearanceManager::instance().updateAppearanceFromCOF();
+		if (!!LLApp::isExiting())
+		{
+			LLAppearanceManager::instance().updateAppearanceFromCOF();
+		}
 	}
 
 	/* virtual */ void fire(const LLUUID& inv_item)
-- 
cgit v1.2.3


From 677f51378e1afc338e92770e56905fe0ff184bc2 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 3 Feb 2010 19:11:44 +0200
Subject: Fixed normal bug EXT-2124 - [BSI] New notifications of group chat
 messages do not identify the destination group chat of message

--HG--
branch : product-engine
---
 indra/newview/lltoastimpanel.cpp                   | 89 ++++++++++++++++------
 indra/newview/lltoastimpanel.h                     |  3 +
 .../skins/default/xui/en/panel_instant_message.xml | 11 +++
 3 files changed, 78 insertions(+), 25 deletions(-)

diff --git a/indra/newview/lltoastimpanel.cpp b/indra/newview/lltoastimpanel.cpp
index a436dc0546..7ae2404203 100644
--- a/indra/newview/lltoastimpanel.cpp
+++ b/indra/newview/lltoastimpanel.cpp
@@ -37,6 +37,7 @@
 #include "llfloaterreg.h"
 #include "llgroupactions.h"
 #include "llgroupiconctrl.h"
+#include "llimview.h"
 #include "llnotifications.h"
 #include "llinstantmessage.h"
 #include "lltooltip.h"
@@ -52,9 +53,9 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) :	LLToastPanel(p.notif
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_instant_message.xml");
 
-	LLIconCtrl* sys_msg_icon = getChild<LLIconCtrl>("sys_msg_icon");
 	mGroupIcon = getChild<LLGroupIconCtrl>("group_icon");
 	mAvatarIcon = getChild<LLAvatarIconCtrl>("avatar_icon");
+	mAdhocIcon = getChild<LLAvatarIconCtrl>("adhoc_icon");
 	mAvatarName = getChild<LLTextBox>("user_name");
 	mTime = getChild<LLTextBox>("time_box");
 	mMessage = getChild<LLTextBox>("message");
@@ -90,27 +91,7 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) :	LLToastPanel(p.notif
 	mAvatarID = p.avatar_id;
 	mNotification = p.notification;
 
-	mAvatarIcon->setVisible(FALSE);
-	mGroupIcon->setVisible(FALSE);
-	sys_msg_icon->setVisible(FALSE);
-
-	if(p.from == SYSTEM_FROM)
-	{
-		sys_msg_icon->setVisible(TRUE);
-	}
-	else
-	{
-		if(LLGroupActions::isInGroup(mSessionID))
-		{
-			mGroupIcon->setVisible(TRUE);
-			mGroupIcon->setValue(p.session_id);
-		}
-		else
-		{
-			mAvatarIcon->setVisible(TRUE);
-			mAvatarIcon->setValue(p.avatar_id);
-		}
-	}
+	initIcon();
 
 	S32 maxLinesCount;
 	std::istringstream ss( getString("message_max_lines_count") );
@@ -162,13 +143,27 @@ BOOL LLToastIMPanel::handleToolTip(S32 x, S32 y, MASK mask)
 
 void LLToastIMPanel::showInspector()
 {
-	if(LLGroupActions::isInGroup(mSessionID))
+	LLIMModel::LLIMSession* im_session = LLIMModel::getInstance()->findIMSession(mSessionID);
+	if(!im_session)
 	{
-		LLFloaterReg::showInstance("inspect_group", LLSD().with("group_id", mSessionID));
+		llwarns << "Invalid IM session" << llendl;
+		return;
 	}
-	else
+
+	switch(im_session->mSessionType)
 	{
+	case LLIMModel::LLIMSession::P2P_SESSION:
 		LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", mAvatarID));
+		break;
+	case LLIMModel::LLIMSession::GROUP_SESSION:
+		LLFloaterReg::showInstance("inspect_group", LLSD().with("group_id", mSessionID));
+		break;
+	case LLIMModel::LLIMSession::ADHOC_SESSION:
+		LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", im_session->mOtherParticipantID));
+		break;
+	default:
+		llwarns << "Unknown IM session type" << llendl;
+		break;
 	}
 }
 
@@ -217,4 +212,48 @@ void LLToastIMPanel::spawnGroupIconToolTip()
 	LLToolTipMgr::getInstance()->show(params);
 }
 
+void LLToastIMPanel::initIcon()
+{
+	LLIconCtrl* sys_msg_icon = getChild<LLIconCtrl>("sys_msg_icon");
+
+	mAvatarIcon->setVisible(FALSE);
+	mGroupIcon->setVisible(FALSE);
+	sys_msg_icon->setVisible(FALSE);
+	mAdhocIcon->setVisible(FALSE);
+
+	if(mAvatarName->getValue().asString() == SYSTEM_FROM)
+	{
+		sys_msg_icon->setVisible(TRUE);
+	}
+	else
+	{
+		LLIMModel::LLIMSession* im_session = LLIMModel::getInstance()->findIMSession(mSessionID);
+		if(!im_session)
+		{
+			llwarns << "Invalid IM session" << llendl;
+			return;
+		}
+
+		switch(im_session->mSessionType)
+		{
+		case LLIMModel::LLIMSession::P2P_SESSION:
+			mAvatarIcon->setVisible(TRUE);
+			mAvatarIcon->setValue(mAvatarID);
+			break;
+		case LLIMModel::LLIMSession::GROUP_SESSION:
+			mGroupIcon->setVisible(TRUE);
+			mGroupIcon->setValue(mSessionID);
+			break;
+		case LLIMModel::LLIMSession::ADHOC_SESSION:
+			mAdhocIcon->setVisible(TRUE);
+			mAdhocIcon->setValue(im_session->mOtherParticipantID);
+			mAdhocIcon->setToolTip(im_session->mName);
+			break;
+		default:
+			llwarns << "Unknown IM session type" << llendl;
+			break;
+		}
+	}
+}
+
 // EOF
diff --git a/indra/newview/lltoastimpanel.h b/indra/newview/lltoastimpanel.h
index 444c0af144..cf4ad80637 100644
--- a/indra/newview/lltoastimpanel.h
+++ b/indra/newview/lltoastimpanel.h
@@ -66,6 +66,8 @@ private:
 	void spawnNameToolTip();
 	void spawnGroupIconToolTip();
 
+	void initIcon();
+
 	static const S32 DEFAULT_MESSAGE_MAX_LINE_COUNT;
 
 	LLNotificationPtr	mNotification;
@@ -73,6 +75,7 @@ private:
 	LLUUID				mAvatarID;
 	LLAvatarIconCtrl*	mAvatarIcon;
 	LLGroupIconCtrl*	mGroupIcon;
+	LLAvatarIconCtrl*	mAdhocIcon;
 	LLTextBox*			mAvatarName;
 	LLTextBox*			mTime;
 	LLTextBox*			mMessage;
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 5a1bc32db0..a0ad38cf76 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -45,6 +45,17 @@
          name="group_icon"
          top="3"
          width="18" />
+        <avatar_icon
+         color="Green"
+         follows="right"
+         height="18"
+         image_name="Generic_Person"
+         layout="topleft"
+         left="3"
+         mouse_opaque="false"
+         name="adhoc_icon"
+         top="3"
+         width="18" />
         <!--<icon
          follows="right"
          height="20"
-- 
cgit v1.2.3


From 7e1911baa23c2c7491c5089015d8f9b30df5ce01 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 3 Feb 2010 19:38:12 +0200
Subject: Fixed normal bug EXT-4229 ("This object costs L$ XXX" truncates
 price)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_buy_currency.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 703a02d995..961bd6b5e4 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -178,8 +178,8 @@
      follows="top|left"
      height="16"
      halign="right"
-     left="150"
-     width="170"
+     left="140"
+     width="180"
      layout="topleft"
      name="buy_action">
         [NAME] L$ [PRICE]
-- 
cgit v1.2.3


From 8c1618ca5ae81eec0a5fa6229e89cd0f1a072a27 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 3 Feb 2010 19:38:12 +0200
Subject: Fixed major bug EXT-4876 (Switch from slurl.com to
 maps.secondlife.com)

--HG--
branch : product-engine
---
 indra/llui/llurlentry.cpp         |  2 +-
 indra/newview/llslurl.cpp         | 12 ++++++++++--
 indra/newview/llslurl.h           |  1 +
 indra/newview/llviewermessage.cpp |  5 +++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index b20de914a0..92b7816bdd 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -232,7 +232,7 @@ std::string LLUrlEntryHTTPNoProtocol::getUrl(const std::string &string) const
 LLUrlEntrySLURL::LLUrlEntrySLURL()
 {
 	// see http://slurl.com/about.php for details on the SLURL format
-	mPattern = boost::regex("http://slurl.com/secondlife/\\S+/?(\\d+)?/?(\\d+)?/?(\\d+)?/?\\S*",
+	mPattern = boost::regex("http://(maps.secondlife.com|slurl.com)/secondlife/\\S+/?(\\d+)?/?(\\d+)?/?(\\d+)?/?\\S*",
 							boost::regex::perl|boost::regex::icase);
 	mMenuName = "menu_url_slurl.xml";
 	mTooltip = LLTrans::getString("TooltipSLURL");
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index 37e268ad34..3343ee88bd 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -39,7 +39,8 @@
 const std::string LLSLURL::PREFIX_SL_HELP		= "secondlife://app.";
 const std::string LLSLURL::PREFIX_SL			= "sl://";
 const std::string LLSLURL::PREFIX_SECONDLIFE	= "secondlife://";
-const std::string LLSLURL::PREFIX_SLURL			= "http://slurl.com/secondlife/";
+const std::string LLSLURL::PREFIX_SLURL_OLD		= "http://slurl.com/secondlife/";
+const std::string LLSLURL::PREFIX_SLURL			= "http://maps.secondlife.com/secondlife/";
 
 const std::string LLSLURL::APP_TOKEN = "app/";
 
@@ -63,6 +64,11 @@ std::string LLSLURL::stripProtocol(const std::string& url)
 	{
 		stripped.erase(0, PREFIX_SLURL.length());
 	}
+	else if (matchPrefix(stripped, PREFIX_SLURL_OLD))
+	{
+		stripped.erase(0, PREFIX_SLURL_OLD.length());
+	}
+
 	
 	return stripped;
 }
@@ -74,6 +80,7 @@ bool LLSLURL::isSLURL(const std::string& url)
 	if (matchPrefix(url, PREFIX_SL))			return true;
 	if (matchPrefix(url, PREFIX_SECONDLIFE))	return true;
 	if (matchPrefix(url, PREFIX_SLURL))			return true;
+	if (matchPrefix(url, PREFIX_SLURL_OLD))		return true;
 	
 	return false;
 }
@@ -83,7 +90,8 @@ bool LLSLURL::isSLURLCommand(const std::string& url)
 { 
 	if (matchPrefix(url, PREFIX_SL + APP_TOKEN) ||
 		matchPrefix(url, PREFIX_SECONDLIFE + "/" + APP_TOKEN) ||
-		matchPrefix(url, PREFIX_SLURL + APP_TOKEN) )
+		matchPrefix(url, PREFIX_SLURL + APP_TOKEN) ||
+		matchPrefix(url, PREFIX_SLURL_OLD + APP_TOKEN) )
 	{
 		return true;
 	}
diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h
index 05b0143e72..21b32ce409 100644
--- a/indra/newview/llslurl.h
+++ b/indra/newview/llslurl.h
@@ -50,6 +50,7 @@ public:
 	static const std::string PREFIX_SL;
 	static const std::string PREFIX_SECONDLIFE;
 	static const std::string PREFIX_SLURL;
+	static const std::string PREFIX_SLURL_OLD;
 
 	static const std::string APP_TOKEN;
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e525561b7d..143d95d27e 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1478,6 +1478,11 @@ void inventory_offer_handler(LLOfferInfo* info)
 	// Strip any SLURL from the message display. (DEV-2754)
 	std::string msg = info->mDesc;
 	int indx = msg.find(" ( http://slurl.com/secondlife/");
+	if(indx == std::string::npos)
+	{
+		// try to find new slurl host
+		indx = msg.find(" ( http://maps.secondlife.com/secondlife/");
+	}
 	if(indx >= 0)
 	{
 		LLStringUtil::truncate(msg, indx);
-- 
cgit v1.2.3


From fb4adc1898f45ffc8311706a9b3430d5d0df1893 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 3 Feb 2010 19:38:12 +0200
Subject: Fixed normal bug EXT-4866 (There is no overflow menu for favorites
 bar)

--HG--
branch : product-engine
---
 indra/newview/llfavoritesbar.cpp                   |  7 +++++-
 indra/newview/llfavoritesbar.h                     |  3 +++
 .../skins/default/xui/en/panel_navigation_bar.xml  | 26 ++++++++++++----------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index f5bb777419..a5b62439f4 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -370,7 +370,8 @@ struct LLFavoritesSort
 
 LLFavoritesBarCtrl::Params::Params()
 : image_drag_indication("image_drag_indication"),
-  chevron_button("chevron_button")
+  chevron_button("chevron_button"),
+  label("label")
 {
 }
 
@@ -401,6 +402,10 @@ LLFavoritesBarCtrl::LLFavoritesBarCtrl(const LLFavoritesBarCtrl::Params& p)
 	chevron_button_params.click_callback.function(boost::bind(&LLFavoritesBarCtrl::showDropDownMenu, this));     
 	mChevronButton = LLUICtrlFactory::create<LLButton> (chevron_button_params);
 	addChild(mChevronButton); 
+
+	LLTextBox::Params label_param(p.label);
+	mBarLabel = LLUICtrlFactory::create<LLTextBox> (label_param);
+	addChild(mBarLabel);
 }
 
 LLFavoritesBarCtrl::~LLFavoritesBarCtrl()
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h
index 40dd551eef..2c6d8d1580 100644
--- a/indra/newview/llfavoritesbar.h
+++ b/indra/newview/llfavoritesbar.h
@@ -35,6 +35,7 @@
 
 #include "llbutton.h"
 #include "lluictrl.h"
+#include "lltextbox.h"
 
 #include "llinventoryobserver.h"
 #include "llinventorymodel.h"
@@ -46,6 +47,7 @@ public:
 	{
 		Optional<LLUIImage*> image_drag_indication;
 		Optional<LLButton::Params> chevron_button;
+		Optional<LLTextBox::Params> label;
 		Params();
 	};
 
@@ -139,6 +141,7 @@ private:
 	LLUICtrl* mLandingTab;
 	LLUICtrl* mLastTab;
 	LLButton* mChevronButton;
+	LLTextBox* mBarLabel;
 
 	LLUUID mDragItemId;
 	BOOL mStartDrag;
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 02eddc9212..b2ed51abf3 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -141,12 +141,25 @@
      font="SansSerifSmall"
      height="15"
      layout="topleft"
-     left="102"
+     left="0"
      name="favorite"
      image_drag_indication="Accordion_ArrowOpened_Off"
      bottom="55"
      tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
                width="590">
+        <label
+         follows="left|top"
+         font.style="BOLD"
+         height="15"
+         layout="topleft"
+         left="10"
+         name="favorites_bar_label"
+         text_color="LtGray"
+         tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+         top="12"
+         width="102">
+          Favorites Bar
+        </label>
     <chevron_button name=">>"
                      image_unselected="TabIcon_Close_Off"
                      image_selected="TabIcon_Close_Off"
@@ -157,15 +170,4 @@
 		     top="15"
                      height="15"/>
   </favorites_bar>
-     <text
-               follows="left|top"
-         font.style="BOLD"
-               height="15"
-               layout="topleft"
-               left="10"
-               top_pad="-12"
-               name="favorites_bar_label"
-               text_color="LtGray"
-               tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-               width="102">Favorites Bar</text>
 </panel>
-- 
cgit v1.2.3


From 18af41157d64962fff10b0697c632a5d2a38539e Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 17:54:59 +0000
Subject: CID-342  	UNINIT_CTOR

--HG--
branch : product-engine
---
 indra/llui/llnotifications.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index d55e0f4043..8d993b71d7 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -371,7 +371,7 @@ private:
 
 	// this is just for making it easy to look things up in a set organized by UUID -- DON'T USE IT
 	// for anything real!
- LLNotification(LLUUID uuid) : mId(uuid), mCancelled(false), mRespondedTo(false), mIgnored(false), mTemporaryResponder(false) {}
+ LLNotification(LLUUID uuid) : mId(uuid), mCancelled(false), mRespondedTo(false), mIgnored(false), mPriority(NOTIFICATION_PRIORITY_UNSPECIFIED), mTemporaryResponder(false) {}
 
 	void cancel();
 
-- 
cgit v1.2.3


From 22ccfab764ed5cdeacffa0530b6fbc30f06e0992 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 17:57:47 +0000
Subject: CID-295

Checker: UNINIT_CTOR
Function: LLGLSLShader::LLGLSLShader()
File: /indra/llrender/llglslshader.cpp

--HG--
branch : product-engine
---
 indra/llrender/llglslshader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 830617063b..ca92cb6580 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -70,7 +70,7 @@ hasGamma(false), hasLighting(false), calculatesAtmospherics(false)
 // LLGLSL Shader implementation
 //===============================
 LLGLSLShader::LLGLSLShader()
-: mProgramObject(0), mShaderLevel(0), mShaderGroup(SG_DEFAULT)
+	: mProgramObject(0), mActiveTextureChannels(0), mShaderLevel(0), mShaderGroup(SG_DEFAULT), mUniformsDirty(FALSE)
 {
 }
 
-- 
cgit v1.2.3


From 92fc25b83058133d43170364608560cc15249cc9 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 18:00:50 +0000
Subject: CID-294 Checker: UNINIT_CTOR Function: LLPostProcess::LLPostProcess()
 File: /indra/llrender/llpostprocess.cpp

--HG--
branch : product-engine
---
 indra/llrender/llpostprocess.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp
index 7f4be6a866..bc7f30cdef 100644
--- a/indra/llrender/llpostprocess.cpp
+++ b/indra/llrender/llpostprocess.cpp
@@ -59,6 +59,8 @@ LLPostProcess::LLPostProcess(void) :
 	mSceneRenderTexture = NULL ; 
 	mNoiseTexture = NULL ;
 	mTempBloomTexture = NULL ;
+
+	noiseTextureScale = 1.0f;
 					
 	/*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.
 	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
-- 
cgit v1.2.3


From 8b9492a68567fe5b7949f42330514730848331c7 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 18:18:13 +0000
Subject: CID-293 Defect Checker: UNINIT_CTOR Function:
 LLGLManager::LLGLManager() File: /indra/llrender/llgl.cpp

--HG--
branch : product-engine
---
 indra/llrender/llgl.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 187a9a984e..a3f7a946ec 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -332,6 +332,8 @@ LLGLManager::LLGLManager() :
 	mHasFragmentShader(FALSE),
 	mHasOcclusionQuery(FALSE),
 	mHasPointParameters(FALSE),
+	mHasDrawBuffers(FALSE),
+	mHasTextureRectangle(FALSE),
 
 	mHasAnisotropic(FALSE),
 	mHasARBEnvCombine(FALSE),
@@ -671,7 +673,7 @@ void LLGLManager::initExtensions()
 	llinfos << "initExtensions() checking shell variables to adjust features..." << llendl;
 	// Our extension support for the Linux Client is very young with some
 	// potential driver gotchas, so offer a semi-secret way to turn it off.
-	if (getenv("LL_GL_NOEXT"))	/* Flawfinder: ignore */
+	if (getenv("LL_GL_NOEXT"))
 	{
 		//mHasMultitexture = FALSE; // NEEDED!
 		mHasARBEnvCombine = FALSE;
-- 
cgit v1.2.3


From 221954f04203968e65325de69c73c961b5e60c56 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 3 Feb 2010 13:22:08 -0500
Subject:  For EXT-4173: New accounts sometimes appear half-naked.  Removed
 duplicate code block.

---
 indra/newview/llstartup.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 4d814169cb..f665635547 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1849,22 +1849,6 @@ bool idle_startup()
 			LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender );
 		}
 
-#if 0 // WHY 2x? BAP
-		// We now have an inventory skeleton, so if this is a user's first
-		// login, we can start setting up their clothing and avatar 
-		// appearance.  This helps to avoid the generic "Ruth" avatar in
-		// the orientation island tutorial experience. JC
-		if (gAgent.isFirstLogin()
-			&& !sInitialOutfit.empty()    // registration set up an outfit
-			&& !sInitialOutfitGender.empty() // and a gender
-			&& gAgent.getAvatarObject()	  // can't wear clothes without object
-			&& !gAgent.isGenderChosen() ) // nothing already loading
-		{
-			// Start loading the wearables, textures, gestures
-			LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender );
-		}
-#endif
-
 		// wait precache-delay and for agent's avatar or a lot longer.
 		if(((timeout_frac > 1.f) && gAgent.getAvatarObject())
 		   || (timeout_frac > 3.f))
-- 
cgit v1.2.3


From 011673de5a73eefbd59e29056851e160338be714 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 18:22:25 +0000
Subject: CID-419

Checker: RESOURCE_LEAK
File: /indra/llui/llstyle.h

--HG--
branch : product-engine
---
 indra/llui/lltexteditor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index e76fee9f17..a4c802bd26 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2574,7 +2574,7 @@ void LLTextEditor::updateLinkSegments()
 			// then update the link's HREF to be the same as the label text.
 			// This lets users edit Urls in-place.
 			LLStyleConstSP style = segment->getStyle();
-			LLStyle* new_style = new LLStyle(*style);
+			LLStyleSP new_style(new LLStyle(*style));
 			LLWString url_label = wtext.substr(segment->getStart(), segment->getEnd()-segment->getStart());
 			if (LLUrlRegistry::instance().hasUrl(url_label))
 			{
-- 
cgit v1.2.3


From 36be134aee952cd35bb1ecbf6d2d2c2490a3fe5b Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 18:38:52 +0000
Subject: CID-292

Checker: UNINIT_CTOR
Function: LLRender::LLRender()
File: /indra/llrender/llrender.cpp
---
 indra/llrender/llrender.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index f97d81126e..595b8577ff 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -733,8 +733,11 @@ void LLTexUnit::debugTextureUnit(void)
 
 
 LLRender::LLRender()
-: mDirty(false), mCount(0), mMode(LLRender::TRIANGLES),
-	mMaxAnisotropy(0.f) 
+  : mDirty(false),
+    mCount(0),
+    mMode(LLRender::TRIANGLES),
+    mCurrTextureUnitIndex(0),
+    mMaxAnisotropy(0.f) 
 {
 	mBuffer = new LLVertexBuffer(immediate_mask, 0);
 	mBuffer->allocateBuffer(4096, 0, TRUE);
-- 
cgit v1.2.3


From 48a3e84937607055606baee0dd2eb69ba8bbf0ce Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 18:52:20 +0000
Subject: CID-291

Checker: UNINIT_CTOR
Function: LLVertexBuffer::LLVertexBuffer(unsigned int, int)
File: /indra/llrender/llvertexbuffer.cpp

also added some sanity-checking around this.
---
 indra/llrender/llvertexbuffer.cpp | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index ecfe845b34..bf5eda21eb 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -215,14 +215,18 @@ void LLVertexBuffer::setupClientArrays(U32 data_mask)
 
 void LLVertexBuffer::drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indices_offset) const
 {
+	llassert(mRequestedNumVerts >= 0);
+
 	if (start >= (U32) mRequestedNumVerts ||
-		end >= (U32) mRequestedNumVerts)
+	    end >= (U32) mRequestedNumVerts)
 	{
 		llerrs << "Bad vertex buffer draw range: [" << start << ", " << end << "]" << llendl;
 	}
 
+	llassert(mRequestedNumIndices >= 0);
+
 	if (indices_offset >= (U32) mRequestedNumIndices ||
-		indices_offset + count > (U32) mRequestedNumIndices)
+	    indices_offset + count > (U32) mRequestedNumIndices)
 	{
 		llerrs << "Bad index buffer draw range: [" << indices_offset << ", " << indices_offset+count << "]" << llendl;
 	}
@@ -251,8 +255,9 @@ void LLVertexBuffer::drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indi
 
 void LLVertexBuffer::draw(U32 mode, U32 count, U32 indices_offset) const
 {
+	llassert(mRequestedNumIndices >= 0);
 	if (indices_offset >= (U32) mRequestedNumIndices ||
-		indices_offset + count > (U32) mRequestedNumIndices)
+	    indices_offset + count > (U32) mRequestedNumIndices)
 	{
 		llerrs << "Bad index buffer draw range: [" << indices_offset << ", " << indices_offset+count << "]" << llendl;
 	}
@@ -281,8 +286,9 @@ void LLVertexBuffer::draw(U32 mode, U32 count, U32 indices_offset) const
 
 void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const
 {
+	llassert(mRequestedNumVerts >= 0);
 	if (first >= (U32) mRequestedNumVerts ||
-		first + count > (U32) mRequestedNumVerts)
+	    first + count > (U32) mRequestedNumVerts)
 	{
 		llerrs << "Bad vertex buffer draw range: [" << first << ", " << first+count << "]" << llendl;
 	}
@@ -354,7 +360,14 @@ void LLVertexBuffer::clientCopy(F64 max_time)
 
 LLVertexBuffer::LLVertexBuffer(U32 typemask, S32 usage) :
 	LLRefCount(),
-	mNumVerts(0), mNumIndices(0), mUsage(usage), mGLBuffer(0), mGLIndices(0), 
+
+	mNumVerts(0),
+	mNumIndices(0),
+	mRequestedNumVerts(-1),
+	mRequestedNumIndices(-1),
+	mUsage(usage),
+	mGLBuffer(0),
+	mGLIndices(0), 
 	mMappedData(NULL),
 	mMappedIndexData(NULL), mLocked(FALSE),
 	mFinal(FALSE),
@@ -600,6 +613,8 @@ void LLVertexBuffer::updateNumVerts(S32 nverts)
 {
 	LLMemType mt2(LLMemType::MTYPE_VERTEX_UPDATE_VERTS);
 
+	llassert(nverts >= 0);
+
 	if (nverts >= 65535)
 	{
 		llwarns << "Vertex buffer overflow!" << llendl;
@@ -628,6 +643,9 @@ void LLVertexBuffer::updateNumVerts(S32 nverts)
 void LLVertexBuffer::updateNumIndices(S32 nindices)
 {
 	LLMemType mt2(LLMemType::MTYPE_VERTEX_UPDATE_INDICES);
+
+	llassert(nindices >= 0);
+
 	mRequestedNumIndices = nindices;
 	if (!mDynamicSize)
 	{
@@ -668,6 +686,9 @@ void LLVertexBuffer::allocateBuffer(S32 nverts, S32 nindices, bool create)
 
 void LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices)
 {
+	llassert(newnverts >= 0);
+	llassert(newnindices >= 0);
+
 	mRequestedNumVerts = newnverts;
 	mRequestedNumIndices = newnindices;
 
-- 
cgit v1.2.3


From 3495954cd63977e7434e74addae15466955b1f89 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 18:54:18 +0000
Subject: CID-290

Checker: UNINIT_CTOR
Function: LLCubeMap::LLCubeMap()
File: /indra/llrender/llcubemap.cpp
---
 indra/llrender/llcubemap.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp
index 08a96b4e31..036714e5cb 100644
--- a/indra/llrender/llcubemap.cpp
+++ b/indra/llrender/llcubemap.cpp
@@ -63,6 +63,12 @@ LLCubeMap::LLCubeMap()
 	  mTextureCoordStage(0),
 	  mMatrixStage(0)
 {
+	mTargets[0] = GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB;
+	mTargets[1] = GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB;
+	mTargets[2] = GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB;
+	mTargets[3] = GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB;
+	mTargets[4] = GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB;
+	mTargets[5] = GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB;
 }
 
 LLCubeMap::~LLCubeMap()
@@ -75,13 +81,6 @@ void LLCubeMap::initGL()
 
 	if (gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps)
 	{
-		mTargets[0] = GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB;
-		mTargets[1] = GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB;
-		mTargets[2] = GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB;
-		mTargets[3] = GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB;
-		mTargets[4] = GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB;
-		mTargets[5] = GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB;
-		
 		// Not initialized, do stuff.
 		if (mImages[0].isNull())
 		{
-- 
cgit v1.2.3


From df0d43054c504a3bd7b18298b1d339e95965a9fb Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 18:56:37 +0000
Subject: CID-289 Checker: UNINIT_CTOR Function: LLCamera::LLCamera() File:
 /indra/llmath/llcamera.cpp

---
 indra/llmath/llcamera.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp
index 21ea4b2e7c..89c32be8cd 100644
--- a/indra/llmath/llcamera.cpp
+++ b/indra/llmath/llcamera.cpp
@@ -45,7 +45,8 @@ LLCamera::LLCamera() :
 	mNearPlane(DEFAULT_NEAR_PLANE),
 	mFarPlane(DEFAULT_FAR_PLANE),
 	mFixedDistance(-1.f),
-	mPlaneCount(6)
+	mPlaneCount(6),
+	mFrustumCornerDist(0.f)
 {
 	calculateFrustumPlanes();
 } 
@@ -648,7 +649,6 @@ void LLCamera::ignoreAgentFrustumPlane(S32 idx)
 
 void LLCamera::calcAgentFrustumPlanes(LLVector3* frust)
 {
-
 	for (int i = 0; i < 8; i++)
 	{
 		mAgentFrustum[i] = frust[i];
-- 
cgit v1.2.3


From a4aca0ba1c3efc4ddb9e01a332d3a9c1f16e49d0 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 19:00:30 +0000
Subject: CID-288

Checker: UNINIT_CTOR
Function: LLCamera::LLCamera(float, float, int, float, float)
File: /indra/llmath/llcamera.cpp
---
 indra/llmath/llcamera.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp
index 89c32be8cd..487ed6451f 100644
--- a/indra/llmath/llcamera.cpp
+++ b/indra/llmath/llcamera.cpp
@@ -56,7 +56,8 @@ LLCamera::LLCamera(F32 vertical_fov_rads, F32 aspect_ratio, S32 view_height_in_p
 	LLCoordFrame(),
 	mViewHeightInPixels(view_height_in_pixels),
 	mFixedDistance(-1.f),
-	mPlaneCount(6)
+	mPlaneCount(6),
+	mFrustumCornerDist(0.f)
 {
 	mAspect = llclamp(aspect_ratio, MIN_ASPECT_RATIO, MAX_ASPECT_RATIO);
 	mNearPlane = llclamp(near_plane, MIN_NEAR_PLANE, MAX_NEAR_PLANE);
-- 
cgit v1.2.3


From 9df8583ea8fd242e8f71710a62841d265d090d4c Mon Sep 17 00:00:00 2001
From: "Eric M. Tulla (BigPapi)" <tulla@lindenlab.com>
Date: Wed, 3 Feb 2010 14:01:36 -0500
Subject: Moss rocks!  Thanks for noticeing the paste error that resulted in a
 double \'\!\' bool op.

---
 indra/newview/llagentwearables.cpp | 2 +-
 indra/newview/llappearancemgr.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 3249d0b31f..41f2ff29e6 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -2300,7 +2300,7 @@ public:
 	
 	virtual ~LLLibraryOutfitsCopyDone()
 	{
-		if (!!LLApp::isExiting() && mLibraryOutfitsFetcher)
+		if (!LLApp::isExiting() && mLibraryOutfitsFetcher)
 		{
 			gInventory.addObserver(mLibraryOutfitsFetcher);
 			mLibraryOutfitsFetcher->done();
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index fa1bfdb5ab..585d42f66d 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -279,7 +279,7 @@ public:
 
 	virtual ~LLUpdateAppearanceOnDestroy()
 	{
-		if (!!LLApp::isExiting())
+		if (!LLApp::isExiting())
 		{
 			LLAppearanceManager::instance().updateAppearanceFromCOF();
 		}
-- 
cgit v1.2.3


From c0422e1c6c44c65c8844631430747d798be16879 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 19:06:06 +0000
Subject: CID-284

Checker: UNINIT_CTOR
Function: MediaPluginWebKit::MediaPluginWebKit(void (*)(const char *, void **), void *)
File: /indra/media_plugins/webkit/media_plugin_webkit.cpp
---
 indra/media_plugins/webkit/media_plugin_webkit.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 42d680ade6..3c24b4ed22 100644
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -608,6 +608,9 @@ MediaPluginWebKit::MediaPluginWebKit(LLPluginInstance::sendMessageFunction host_
 	mLastMouseX = 0;
 	mLastMouseY = 0;
 	mFirstFocus = true;
+	mBackgroundR = 0.0f;
+	mBackgroundG = 0.0f;
+	mBackgroundB = 0.0f;
 }
 
 MediaPluginWebKit::~MediaPluginWebKit()
-- 
cgit v1.2.3


From 4020f13fc93426108c761f8519e2dc3af6772d7e Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 3 Feb 2010 11:08:53 -0800
Subject: EXT-4656 	 [crashhunters] Crash in
 LLFloaterAnimPreview::postBuild() reviewed by Richard

---
 indra/newview/llfloateranimpreview.cpp                           | 1 +
 indra/newview/skins/default/xui/en/floater_animation_preview.xml | 4 ++++
 indra/newview/skins/default/xui/en/floater_test_widgets.xml      | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp
index 60f150bd96..3549e2b6bf 100644
--- a/indra/newview/llfloateranimpreview.cpp
+++ b/indra/newview/llfloateranimpreview.cpp
@@ -117,6 +117,7 @@ std::string STATUS[] =
 "E_ST_NO_XLT_EASEOUT",
 "E_ST_NO_XLT_HAND",
 "E_ST_NO_XLT_EMOTE",
+"E_ST_BAD_ROOT"
 };
 //-----------------------------------------------------------------------------
 // LLFloaterAnimPreview()
diff --git a/indra/newview/skins/default/xui/en/floater_animation_preview.xml b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
index 4f4288b654..9eb0af31f9 100644
--- a/indra/newview/skins/default/xui/en/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_animation_preview.xml
@@ -147,6 +147,10 @@ Maximum animation length is [MAX_LENGTH] seconds.
      name="E_ST_NO_XLT_EMOTE">
         Cannot read emote name.
     </floater.string>
+    <floater.string
+     name="E_ST_BAD_ROOT">
+      Invalid ROOT joint.
+    </floater.string>
     <text
      type="string"
      length="1"
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 447bd7f599..8353dab24f 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -254,7 +254,7 @@
      name="first_column"
      label="Column A"/>
     <scroll_list.columns
-     dynamic_width="true"
+     width="-1"
      name="second_column"
      label="Column B"/>
     <row>
-- 
cgit v1.2.3


From 66bc04339ccc0bf73005ae0cd1e7b04259c4944c Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Wed, 3 Feb 2010 11:13:17 -0800
Subject: accidental commit revert

---
 indra/newview/skins/default/xui/en/floater_test_widgets.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 8353dab24f..447bd7f599 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -254,7 +254,7 @@
      name="first_column"
      label="Column A"/>
     <scroll_list.columns
-     width="-1"
+     dynamic_width="true"
      name="second_column"
      label="Column B"/>
     <row>
-- 
cgit v1.2.3


From 917841120f8932af112896344c7f25be7bc32773 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 3 Feb 2010 21:20:37 +0200
Subject: Backed out changeset 83d2ec4d4a5e, a hack that forces you to fall
 when entering a parcel with no rights to fly in it.

--HG--
branch : product-engine
---
 indra/newview/llviewerparcelmgr.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 7ec650629d..a075a706e1 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1597,14 +1597,6 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 				instance->mTeleportInProgress = FALSE;
 				instance->mTeleportFinishedSignal(gAgent.getPositionGlobal());
 			}
-
-			// HACK: This makes agents drop from the sky if they enter a parcel
-			// which is set to no fly.
-			BOOL was_flying = gAgent.getFlying();
-			if (was_flying && !parcel->getAllowFly())
-			{
-				gAgent.setFlying(gAgent.canFly());
-			}
 		}
 	}
 
-- 
cgit v1.2.3


From 78553cce481e0f05485033ff9a64d53d13893d97 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 19:24:25 +0000
Subject: CID-283

Checker: UNINIT_CTOR
Function: LLVorbisDecodeState::LLVorbisDecodeState(const LLUUID &, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/llaudio/llaudiodecodemgr.cpp
---
 indra/llaudio/llaudiodecodemgr.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 6bbaad9cef..290206ee22 100644
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -181,6 +181,8 @@ LLVorbisDecodeState::LLVorbisDecodeState(const LLUUID &uuid, const std::string &
 	mFileHandle = LLLFSThread::nullHandle();
 #endif
 	// No default value for mVF, it's an ogg structure?
+	// Hey, let's zero it anyway, for predictability.
+	memset(&mVF, 0, sizeof(mVF));
 }
 
 LLVorbisDecodeState::~LLVorbisDecodeState()
-- 
cgit v1.2.3


From 5dbd37f50bbefe8552f910d5079b48cd3f648c5e Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 3 Feb 2010 21:28:58 +0200
Subject: a bit log for  major Bug EXT-4778 - may help to find problem.

--HG--
branch : product-engine
---
 indra/newview/llgroupmgr.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 72a52ba13b..4c1019a882 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1708,6 +1708,8 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 	bool start_message = true;
 	LLMessageSystem* msg = gMessageSystem;
 
+	
+
 	LLGroupMgrGroupData* group_datap = LLGroupMgr::getInstance()->getGroupData(group_id);
 	if (!group_datap) return;
 
@@ -1715,6 +1717,8 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 		 it != member_ids.end(); ++it)
 	{
 		LLUUID& ejected_member_id = (*it);
+
+		llwarns << "LLGroupMgr::sendGroupMemberEjects -- ejecting member" << ejected_member_id << llendl;
 		
 		// Can't use 'eject' to leave a group.
 		if ((*it) == gAgent.getID()) continue;
@@ -1751,11 +1755,14 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 				if ((*rit).first.notNull() && (*rit).second!=0)
 				{
 					(*rit).second->removeMember(ejected_member_id);
+
+					llwarns << "LLGroupMgr::sendGroupMemberEjects - removing member from role " << llendl;
 				}
 			}
 			
 			group_datap->mMembers.erase(*it);
 			
+			llwarns << "LLGroupMgr::sendGroupMemberEjects - deleting memnber data " << llendl;
 			delete (*mit).second;
 		}
 	}
@@ -1764,6 +1771,8 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 	{
 		gAgent.sendReliableMessage();
 	}
+
+	llwarns << "LLGroupMgr::sendGroupMemberEjects - done " << llendl;
 }
 
 void LLGroupMgr::sendGroupRoleChanges(const LLUUID& group_id)
-- 
cgit v1.2.3


From a1c3d608199a888584ce8d2172905175fcbd1796 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 3 Feb 2010 21:48:30 +0200
Subject: No ticket. Removed unrelevant comment and added disabling call button
 if session doesn't exist in LLPanelChatControlPanel::updateCallButton().

--HG--
branch : product-engine
---
 indra/newview/llpanelimcontrolpanel.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp
index d491583b56..cbd6f64a48 100644
--- a/indra/newview/llpanelimcontrolpanel.cpp
+++ b/indra/newview/llpanelimcontrolpanel.cpp
@@ -81,11 +81,15 @@ void LLPanelChatControlPanel::onVoiceChannelStateChanged(const LLVoiceChannel::E
 
 void LLPanelChatControlPanel::updateCallButton()
 {
-	// hide/show call button
 	bool voice_enabled = LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking();
 
 	LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(mSessionId);
-	if (!session) return;
+	
+	if (!session) 
+	{
+		childSetEnabled("call_btn", false);
+		return;
+	}
 
 	bool session_initialized = session->mSessionInitialized;
 	bool callback_enabled = session->mCallBackEnabled;
-- 
cgit v1.2.3


From f117db5798062d3f0d389a07ca5a75bac0d5cf72 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:03:17 +0000
Subject: CID-281

Checker: UNINIT_CTOR
Function: LLTransferSourceParamsAsset::LLTransferSourceParamsAsset()
File: /indra/llmessage/lltransfersourceasset.cpp
---
 indra/llmessage/lltransfersourceasset.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp
index 7332f5c954..8f36d516d7 100644
--- a/indra/llmessage/lltransfersourceasset.cpp
+++ b/indra/llmessage/lltransfersourceasset.cpp
@@ -226,7 +226,10 @@ void LLTransferSourceAsset::responderCallback(LLVFS *vfs, const LLUUID& uuid, LL
 
 
 
-LLTransferSourceParamsAsset::LLTransferSourceParamsAsset() : LLTransferSourceParams(LLTST_ASSET)
+LLTransferSourceParamsAsset::LLTransferSourceParamsAsset()
+	: LLTransferSourceParams(LLTST_ASSET),
+
+	  mAssetType(LLAssetType::AT_NONE)
 {
 }
 
-- 
cgit v1.2.3


From 428eb8555ee9bcd2476e3e5d61ee1cd844a0d621 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:12:31 +0000
Subject: CID-280

Checker: UNINIT_CTOR
Function: LLTransferTargetParamsVFile::LLTransferTargetParamsVFile()
File: /indra/llmessage/lltransfertargetvfile.cpp

dead field.
---
 indra/llmessage/lltransfertargetvfile.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/llmessage/lltransfertargetvfile.h b/indra/llmessage/lltransfertargetvfile.h
index 8c2bc7e8bb..cd18d8ce3f 100644
--- a/indra/llmessage/lltransfertargetvfile.h
+++ b/indra/llmessage/lltransfertargetvfile.h
@@ -68,7 +68,6 @@ protected:
 	LLTTVFCompleteCallback	mCompleteCallback;
 	void*					mUserDatap;
 	S32						mErrCode;
-	LLVFSThread::handle_t	mHandle;
 };
 
 
-- 
cgit v1.2.3


From 4e73292e2ce7dcbce17e5edaa4ff10beeea01a51 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:14:57 +0000
Subject: CID-279

Checker: UNINIT_CTOR
Function: LLTransferTarget::LLTransferTarget(e_transfer_target_type, const LLUUID &, e_transfer_source_type)
File: /indra/llmessage/lltransfermanager.cpp
---
 indra/llmessage/lltransfermanager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/llmessage/lltransfermanager.cpp b/indra/llmessage/lltransfermanager.cpp
index 0a71ad95f2..d64b666ede 100644
--- a/indra/llmessage/lltransfermanager.cpp
+++ b/indra/llmessage/lltransfermanager.cpp
@@ -1196,6 +1196,7 @@ LLTransferTarget::LLTransferTarget(
 	mType(type),
 	mSourceType(source_type),
 	mID(transfer_id),
+	mChannelp(NULL),
 	mGotInfo(FALSE),
 	mSize(0),
 	mLastPacketID(-1)
-- 
cgit v1.2.3


From b52d2a2f1b0406becb80862686be7b6f2444006d Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 3 Feb 2010 22:16:18 +0200
Subject: Fixed normal bug EXT-4648 (Right segment of Speak button is disabled
 if nearby voice chat is disabled in estate).

- Added methods for separate enabling of left and right parts of speak button and used them instead of simply enabling/disabling LLSpeakButton in bottomtray.

- Made changes to reset() in LLCallFloater to show "no one near..." instead of "loading" in vcp for nearby chat in regions with disabled voice.

--HG--
branch : product-engine
---
 indra/newview/llbottomtray.cpp  | 13 ++++++++++---
 indra/newview/llcallfloater.cpp | 19 +++++++++++++++----
 indra/newview/llcallfloater.h   |  2 +-
 indra/newview/llspeakbutton.cpp | 10 ++++++++++
 indra/newview/llspeakbutton.h   |  4 ++++
 5 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 0102e9488e..4c8cec3d30 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -280,7 +280,13 @@ void LLBottomTray::onChange(EStatusType status, const std::string &channelURI, b
 		break;
 	}
 
-	mSpeakBtn->setEnabled(enable);
+	// We have to enable/disable right and left parts of speak button separately (EXT-4648)
+	mSpeakBtn->setSpeakBtnEnabled(enable);
+	// skipped to avoid button blinking
+	if (status != STATUS_JOINING && status!= STATUS_LEFT_CHANNEL)
+	{
+		mSpeakBtn->setFlyoutBtnEnabled(LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking());
+	}
 }
 
 void LLBottomTray::onMouselookModeOut()
@@ -410,9 +416,10 @@ BOOL LLBottomTray::postBuild()
 	mSpeakPanel = getChild<LLPanel>("speak_panel");
 	mSpeakBtn = getChild<LLSpeakButton>("talk");
 
-	// Speak button should be initially disabled because
+	// Both parts of speak button should be initially disabled because
 	// it takes some time between logging in to world and connecting to voice channel.
-	mSpeakBtn->setEnabled(FALSE);
+	mSpeakBtn->setSpeakBtnEnabled(false);
+	mSpeakBtn->setFlyoutBtnEnabled(false);
 
 	// Localization tool doesn't understand custom buttons like <talk_button>
 	mSpeakBtn->setSpeakToolTip( getString("SpeakBtnToolTip") );
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index f62fd44bc0..8cb240c7c2 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -52,6 +52,7 @@
 #include "lltransientfloatermgr.h"
 #include "llviewerwindow.h"
 #include "llvoicechannel.h"
+#include "llviewerparcelmgr.h"
 
 static void get_voice_participants_uuids(std::vector<LLUUID>& speakers_uuids);
 void reshape_floater(LLCallFloater* floater, S32 delta_height);
@@ -731,11 +732,11 @@ void LLCallFloater::updateState(const LLVoiceChannel::EState& new_state)
 	}
 	else
 	{
-		reset();
+		reset(new_state);
 	}
 }
 
-void LLCallFloater::reset()
+void LLCallFloater::reset(const LLVoiceChannel::EState& new_state)
 {
 	// lets forget states from the previous session
 	// for timers...
@@ -748,8 +749,18 @@ void LLCallFloater::reset()
 	mParticipants = NULL;
 	mAvatarList->clear();
 
-	// update floater to show Loading while waiting for data.
-	mAvatarList->setNoItemsCommentText(LLTrans::getString("LoadingData"));
+	// "loading" is shown in parcel with disabled voice only when state is "ringing"
+	// to avoid showing it in nearby chat vcp all the time- "no_one_near" is now shown there (EXT-4648)
+	bool show_loading = LLVoiceChannel::STATE_RINGING == new_state;
+	if(!show_loading && !LLViewerParcelMgr::getInstance()->allowAgentVoice() && mVoiceType ==  VC_LOCAL_CHAT)
+	{
+		mAvatarList->setNoItemsCommentText(getString("no_one_near"));
+	}
+	else
+	{
+		// update floater to show Loading while waiting for data.
+		mAvatarList->setNoItemsCommentText(LLTrans::getString("LoadingData"));
+	}
 	mAvatarList->setVisible(TRUE);
 	mNonAvatarCaller->setVisible(FALSE);
 
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index 766191379b..dac4390fa7 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -220,7 +220,7 @@ private:
 	 *
 	 * Clears all data from the latest voice session.
 	 */
-	void reset();
+	void reset(const LLVoiceChannel::EState& new_state);
 
 private:
 	speaker_state_map_t mSpeakerStateMap;
diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp
index 8f2c877c7a..c5c311ed33 100644
--- a/indra/newview/llspeakbutton.cpp
+++ b/indra/newview/llspeakbutton.cpp
@@ -66,6 +66,16 @@ void LLSpeakButton::draw()
 	mOutputMonitor->setIsMuted(!voiceenabled);
 	LLUICtrl::draw();
 }
+void LLSpeakButton::setSpeakBtnEnabled(bool enabled)
+{
+	LLButton* speak_btn = getChild<LLButton>("speak_btn");
+	speak_btn->setEnabled(enabled);
+}
+void LLSpeakButton::setFlyoutBtnEnabled(bool enabled)
+{
+	LLButton* show_btn = getChild<LLButton>("speak_flyout_btn");
+	show_btn->setEnabled(enabled);
+}
 
 LLSpeakButton::LLSpeakButton(const Params& p)
 : LLUICtrl(p)
diff --git a/indra/newview/llspeakbutton.h b/indra/newview/llspeakbutton.h
index 6660b50240..85c97f1a2c 100644
--- a/indra/newview/llspeakbutton.h
+++ b/indra/newview/llspeakbutton.h
@@ -61,6 +61,10 @@ public:
 
 	/*virtual*/ ~LLSpeakButton();
 	/*virtual*/ void draw();
+	
+	// methods for enabling/disabling right and left parts of speak button separately(EXT-4648)
+	void setSpeakBtnEnabled(bool enabled);
+	void setFlyoutBtnEnabled(bool enabled);
 
 	// *HACK: Need to put tooltips in a translatable location,
 	// the panel that contains this button.
-- 
cgit v1.2.3


From eab2f01b19b3a2ce46b2d44935097747a3eefadb Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:18:22 +0000
Subject: CID-278

Checker: UNINIT_CTOR
Function: LLTransferTargetParamsFile::LLTransferTargetParamsFile()
File: /indra/llmessage/lltransfertargetfile.h
---
 indra/llmessage/lltransfertargetfile.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/indra/llmessage/lltransfertargetfile.h b/indra/llmessage/lltransfertargetfile.h
index 18b9b52062..92fb8f807c 100644
--- a/indra/llmessage/lltransfertargetfile.h
+++ b/indra/llmessage/lltransfertargetfile.h
@@ -40,7 +40,12 @@ typedef void (*LLTTFCompleteCallback)(const LLTSCode status, void *user_data);
 class LLTransferTargetParamsFile : public LLTransferTargetParams
 {
 public:
-	LLTransferTargetParamsFile() : LLTransferTargetParams(LLTTT_FILE) {}
+	LLTransferTargetParamsFile()
+		: LLTransferTargetParams(LLTTT_FILE),
+
+		mCompleteCallback(NULL),
+		mUserData(NULL)
+	{}
 	void setFilename(const std::string& filename)	{ mFilename = filename; }
 	void setCallback(LLTTFCompleteCallback cb, void *user_data)		{ mCompleteCallback = cb; mUserData = user_data; }
 
-- 
cgit v1.2.3


From 2879692aa2696af80a1f12daaf88b886412dacb5 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:25:04 +0000
Subject: CID-277

Checker: UNINIT_CTOR
Function: LLPacketBuffer::LLPacketBuffer(const LLHost &, const char *, int)
File: /indra/llmessage/llpacketbuffer.cpp
---
 indra/llmessage/llpacketbuffer.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/llmessage/llpacketbuffer.cpp b/indra/llmessage/llpacketbuffer.cpp
index 027d35cf89..60ced66318 100644
--- a/indra/llmessage/llpacketbuffer.cpp
+++ b/indra/llmessage/llpacketbuffer.cpp
@@ -44,6 +44,8 @@ LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32
 {
 	if (size > NET_BUFFER_SIZE)
 	{
+		mSize = 0;
+		mData[0] = 0;
 		llerrs << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << llendl;
 	}
 	else // we previously relied on llerrs being fatal to not get here...
-- 
cgit v1.2.3


From 08b93d95ef9d21e39d633ada19a6cbad23c25b91 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:26:42 +0000
Subject: CID-277

Checker: UNINIT_CTOR
Function: LLPacketBuffer::LLPacketBuffer(const LLHost &, const char *, int)
File: /indra/llmessage/llpacketbuffer.cpp

a fix I like better.
---
 indra/llmessage/llpacketbuffer.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/indra/llmessage/llpacketbuffer.cpp b/indra/llmessage/llpacketbuffer.cpp
index 60ced66318..441e8ddd27 100644
--- a/indra/llmessage/llpacketbuffer.cpp
+++ b/indra/llmessage/llpacketbuffer.cpp
@@ -42,13 +42,14 @@
 
 LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32 size) : mHost(host)
 {
+	mSize = 0;
+	mData[0] = '!';
+
 	if (size > NET_BUFFER_SIZE)
 	{
-		mSize = 0;
-		mData[0] = 0;
 		llerrs << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << llendl;
 	}
-	else // we previously relied on llerrs being fatal to not get here...
+	else
 	{
 		if (datap != NULL)
 		{
-- 
cgit v1.2.3


From 930035ebdc308960bdb1a51ae622dd06f93a7255 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:29:57 +0000
Subject: CID-273

Checker: UNINIT_CTOR
Function: NamedTimerFactory::NamedTimerFactory()
File: /indra/llcommon/llfasttimer_class.cpp
---
 indra/llcommon/llfasttimer_class.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp
index fae0a66873..6d8d81e114 100644
--- a/indra/llcommon/llfasttimer_class.cpp
+++ b/indra/llcommon/llfasttimer_class.cpp
@@ -114,7 +114,11 @@ static timer_tree_dfs_iterator_t end_timer_tree()
 class NamedTimerFactory : public LLSingleton<NamedTimerFactory>
 {
 public:
-	NamedTimerFactory() 
+	NamedTimerFactory()
+		: mActiveTimerRoot(NULL),
+		  mTimerRoot(NULL),
+		  mAppTimer(NULL),
+		  mRootFrameState(NULL)
 	{}
 
 	/*virtual */ void initSingleton()
-- 
cgit v1.2.3


From 8b4823acfb1907f936c7a9f27e5138724f54faa7 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:33:47 +0000
Subject: CID-272

Checker: UNINIT_CTOR
Function: LLTreeDFSPostIter<LLView, std::list<LLView *, std::allocator<LLView *>>::_Const_iterator<(bool)0>>::LLTreeDFSPostIter()
File: /indra/llcommon/lltreeiterators.h
---
 indra/llcommon/lltreeiterators.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/llcommon/lltreeiterators.h b/indra/llcommon/lltreeiterators.h
index c946566e84..034eeba65d 100644
--- a/indra/llcommon/lltreeiterators.h
+++ b/indra/llcommon/lltreeiterators.h
@@ -451,10 +451,10 @@ public:
     /// Instantiate an LLTreeDFSPostIter to start a depth-first walk. Pass
     /// functors to extract the 'child begin' and 'child end' iterators from
     /// each node.
-    LLTreeDFSPostIter(const ptr_type& node, const func_type& beginfunc, const func_type& endfunc):
-        mBeginFunc(beginfunc),
-        mEndFunc(endfunc),
-		mSkipAncestors(false)
+    LLTreeDFSPostIter(const ptr_type& node, const func_type& beginfunc, const func_type& endfunc)
+	    : mBeginFunc(beginfunc),
+	    mEndFunc(endfunc),
+	    mSkipAncestors(false)
     {
         if (! node)
             return;
@@ -462,7 +462,7 @@ public:
         makeCurrent();
     }
     /// Instantiate an LLTreeDFSPostIter to mark the end of the walk
-    LLTreeDFSPostIter() {}
+     LLTreeDFSPostIter() : mSkipAncestors(false) {}
 
 	/// flags iterator logic to skip traversing ancestors of current node on next increment
 	void skipAncestors(bool skip = true) { mSkipAncestors = skip; }
-- 
cgit v1.2.3


From 193f2e2edc1ade7a211c57a60bc42687aab036d4 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:36:56 +0000
Subject: CID-271

Checker: UNINIT_CTOR
Function: LLTreeDFSIter<LLView, std::list<LLView *, std::allocator<LLView *>>::_Const_iterator<(bool)0>>::LLTreeDFSIter()
File: /indra/llcommon/lltreeiterators.h
---
 indra/llcommon/lltreeiterators.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/indra/llcommon/lltreeiterators.h b/indra/llcommon/lltreeiterators.h
index 034eeba65d..cb1304c54e 100644
--- a/indra/llcommon/lltreeiterators.h
+++ b/indra/llcommon/lltreeiterators.h
@@ -343,20 +343,20 @@ public:
     /// Instantiate an LLTreeDFSIter to start a depth-first walk. Pass
     /// functors to extract the 'child begin' and 'child end' iterators from
     /// each node.
-    LLTreeDFSIter(const ptr_type& node, const func_type& beginfunc, const func_type& endfunc):
-        mBeginFunc(beginfunc),
-        mEndFunc(endfunc),
-		mSkipChildren(false)
+    LLTreeDFSIter(const ptr_type& node, const func_type& beginfunc, const func_type& endfunc)
+	    : mBeginFunc(beginfunc),
+	    mEndFunc(endfunc),
+	    mSkipChildren(false)
     {
         // Only push back this node if it's non-NULL!
         if (node)
             mPending.push_back(node);
     }
     /// Instantiate an LLTreeDFSIter to mark the end of the walk
-    LLTreeDFSIter() {}
+    LLTreeDFSIter() : mSkipChildren(false) {}
 
-	/// flags iterator logic to skip traversing children of current node on next increment
-	void skipDescendants(bool skip = true) { mSkipChildren = skip; }
+    /// flags iterator logic to skip traversing children of current node on next increment
+    void skipDescendants(bool skip = true) { mSkipChildren = skip; }
 
 private:
     /// leverage boost::iterator_facade
@@ -405,8 +405,8 @@ private:
     func_type mBeginFunc;
     /// functor to extract end() child iterator
     func_type mEndFunc;
-	/// flag which controls traversal of children (skip children of current node if true)
-	bool	mSkipChildren;
+    /// flag which controls traversal of children (skip children of current node if true)
+    bool	mSkipChildren;
 };
 
 /**
@@ -455,17 +455,17 @@ public:
 	    : mBeginFunc(beginfunc),
 	    mEndFunc(endfunc),
 	    mSkipAncestors(false)
-    {
+	    {
         if (! node)
             return;
         mPending.push_back(typename list_type::value_type(node, false));
         makeCurrent();
     }
     /// Instantiate an LLTreeDFSPostIter to mark the end of the walk
-     LLTreeDFSPostIter() : mSkipAncestors(false) {}
+    LLTreeDFSPostIter() : mSkipAncestors(false) {}
 
-	/// flags iterator logic to skip traversing ancestors of current node on next increment
-	void skipAncestors(bool skip = true) { mSkipAncestors = skip; }
+    /// flags iterator logic to skip traversing ancestors of current node on next increment
+    void skipAncestors(bool skip = true) { mSkipAncestors = skip; }
 
 private:
     /// leverage boost::iterator_facade
-- 
cgit v1.2.3


From 33a92be286e2b63f76b9a032e5912806d717959f Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:39:52 +0000
Subject: CID-269

Checker: UNINIT_CTOR
Function: LLWorkerClass::LLWorkerClass(LLWorkerThread *, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/llcommon/llworkerthread.cpp
---
 indra/llcommon/llworkerthread.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/llcommon/llworkerthread.cpp b/indra/llcommon/llworkerthread.cpp
index 82c736266d..1b0e03cb2a 100644
--- a/indra/llcommon/llworkerthread.cpp
+++ b/indra/llcommon/llworkerthread.cpp
@@ -188,6 +188,7 @@ LLWorkerClass::LLWorkerClass(LLWorkerThread* workerthread, const std::string& na
 	: mWorkerThread(workerthread),
 	  mWorkerClassName(name),
 	  mRequestHandle(LLWorkerThread::nullHandle()),
+	  mRequestPriority(LLWorkerThread::PRIORITY_NORMAL),
 	  mMutex(NULL),
 	  mWorkFlags(0)
 {
-- 
cgit v1.2.3


From e5bd3b8a4846ee21cfaf726cfbf3e943b277e7c1 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Wed, 3 Feb 2010 22:42:10 +0200
Subject: Fixed bug EXT-2915 ([BSI] Pay Button is hard to find on small
 resolutions). Added a "Block/Unblock" item to the profile view panel overflow
 menu to make the menu more visible.

--HG--
branch : product-engine
---
 indra/newview/llavataractions.cpp                  | 10 ++++++++
 indra/newview/llavataractions.h                    |  5 ++++
 indra/newview/llpanelavatar.cpp                    | 28 ++++++++++++++++++++++
 indra/newview/llpanelavatar.h                      |  8 ++++++-
 indra/newview/llpanelpeoplemenus.cpp               |  6 +----
 .../skins/default/xui/en/menu_profile_overflow.xml | 13 ++++++++++
 6 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 7eed2e7b9a..bd987eac77 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -612,3 +612,13 @@ bool LLAvatarActions::isBlocked(const LLUUID& id)
 	gCacheName->getFullName(id, name);
 	return LLMuteList::getInstance()->isMuted(id, name);
 }
+
+// static
+bool LLAvatarActions::canBlock(const LLUUID& id)
+{
+	std::string firstname, lastname;
+	gCacheName->getName(id, firstname, lastname);
+	bool is_linden = !LLStringUtil::compareStrings(lastname, "Linden");
+	bool is_self = id == gAgentID;
+	return !is_self && !is_linden;
+}
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
index c751661acf..16a58718a2 100644
--- a/indra/newview/llavataractions.h
+++ b/indra/newview/llavataractions.h
@@ -123,6 +123,11 @@ public:
 	 */
 	static bool isBlocked(const LLUUID& id);
 
+	/**
+	 * @return true if you can block the avatar
+	 */
+	static bool canBlock(const LLUUID& id);
+
 	/**
 	 * Return true if the avatar is in a P2P voice call with a given user
 	 */
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 48dd5513bd..4a7cdfc856 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -483,6 +483,7 @@ BOOL LLPanelAvatarProfile::postBuild()
 	LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
 	registrar.add("Profile.Pay",  boost::bind(&LLPanelAvatarProfile::pay, this));
 	registrar.add("Profile.Share", boost::bind(&LLPanelAvatarProfile::share, this));
+	registrar.add("Profile.BlockUnblock", boost::bind(&LLPanelAvatarProfile::toggleBlock, this));
 	registrar.add("Profile.Kick", boost::bind(&LLPanelAvatarProfile::kick, this));
 	registrar.add("Profile.Freeze", boost::bind(&LLPanelAvatarProfile::freeze, this));
 	registrar.add("Profile.Unfreeze", boost::bind(&LLPanelAvatarProfile::unfreeze, this));
@@ -490,6 +491,8 @@ BOOL LLPanelAvatarProfile::postBuild()
 
 	LLUICtrl::EnableCallbackRegistry::ScopedRegistrar enable;
 	enable.add("Profile.EnableGod", boost::bind(&enable_god));
+	enable.add("Profile.CheckItem", boost::bind(&LLPanelAvatarProfile::checkOverflowMenuItem, this, _2));
+	enable.add("Profile.EnableItem", boost::bind(&LLPanelAvatarProfile::enableOverflowMenuItem, this, _2));
 
 	mProfileMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_profile_overflow.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
 
@@ -666,6 +669,26 @@ void LLPanelAvatarProfile::fillAccountStatus(const LLAvatarData* avatar_data)
 	childSetValue("acc_status_text", caption_text);
 }
 
+bool LLPanelAvatarProfile::checkOverflowMenuItem(const LLSD& param)
+{
+    std::string item = param.asString();
+
+    if (item == "is_blocked")
+        return LLAvatarActions::isBlocked(getAvatarId());
+
+    return false;
+}
+
+bool LLPanelAvatarProfile::enableOverflowMenuItem(const LLSD& param)
+{
+    std::string item = param.asString();
+
+    if (item == "can_block")
+        return LLAvatarActions::canBlock(getAvatarId());
+
+    return false;
+}
+
 void LLPanelAvatarProfile::pay()
 {
 	LLAvatarActions::pay(getAvatarId());
@@ -676,6 +699,11 @@ void LLPanelAvatarProfile::share()
 	LLAvatarActions::share(getAvatarId());
 }
 
+void LLPanelAvatarProfile::toggleBlock()
+{
+	LLAvatarActions::toggleBlock(getAvatarId());
+}
+
 void LLPanelAvatarProfile::kick()
 {
 	LLAvatarActions::kick(getAvatarId());
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index ce59f1e93d..632590aa27 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -192,12 +192,18 @@ protected:
 	 */
 	void share();
 
+	/**
+	 * Add/remove resident to/from your block list.
+	 */
+	void toggleBlock();
+
 	void kick();
 	void freeze();
 	void unfreeze();
 	void csr();
 	
-
+	bool checkOverflowMenuItem(const LLSD& param);
+	bool enableOverflowMenuItem(const LLSD& param);
 	bool enableGod();
 
 
diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp
index 470cfca8fe..7e184c78a8 100644
--- a/indra/newview/llpanelpeoplemenus.cpp
+++ b/indra/newview/llpanelpeoplemenus.cpp
@@ -164,11 +164,7 @@ bool NearbyMenu::enableContextMenuItem(const LLSD& userdata)
 	if (item == std::string("can_block"))
 	{
 		const LLUUID& id = mUUIDs.front();
-		std::string firstname, lastname;
-		gCacheName->getName(id, firstname, lastname);
-		bool is_linden = !LLStringUtil::compareStrings(lastname, "Linden");
-		bool is_self = id == gAgentID;
-		return !is_self && !is_linden;
+		return LLAvatarActions::canBlock(id);
 	}
 	else if (item == std::string("can_add"))
 	{
diff --git a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
index 1dc1c610cf..407ce14e81 100644
--- a/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
+++ b/indra/newview/skins/default/xui/en/menu_profile_overflow.xml
@@ -19,6 +19,19 @@
         <menu_item_call.on_click
          function="Profile.Share" />
     </menu_item_call>
+    <menu_item_check
+     label="Block/Unblock"
+     layout="topleft"
+     name="block_unblock">
+        <menu_item_check.on_click
+         function="Profile.BlockUnblock" />
+        <menu_item_check.on_check
+         function="Profile.CheckItem"
+         parameter="is_blocked" />
+        <menu_item_check.on_enable
+         function="Profile.EnableItem"
+         parameter="can_block" />
+    </menu_item_check>
   <menu_item_call
    label="Kick"
    layout="topleft"
-- 
cgit v1.2.3


From a788f758e44ef506a82af8a9dccb71578334cefb Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:44:32 +0000
Subject: CID-267

Checker: UNINIT_CTOR
Function: LLXMLNode::LLXMLNode(const LLXMLNode&)
File: /indra/llxml/llxmlnode.cpp
---
 indra/llxml/llxmlnode.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index 07cc612a0a..e4f6482fae 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -131,6 +131,8 @@ LLXMLNode::LLXMLNode(const LLXMLNode& rhs) :
 	mPrecision(rhs.mPrecision),
 	mType(rhs.mType),
 	mEncoding(rhs.mEncoding),
+	mLineNumber(0),
+	mParser(NULL),
 	mParent(NULL),
 	mChildren(NULL),
 	mAttributes(),
-- 
cgit v1.2.3


From b7405a144ec88943a3781d41cc0768fdb323df6c Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:45:53 +0000
Subject: CID-266

Checker: UNINIT_CTOR
Function: LLXmlTreeParser::LLXmlTreeParser(LLXmlTree *)
File: /indra/llxml/llxmltree.cpp
---
 indra/llxml/llxmltree.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/llxml/llxmltree.cpp b/indra/llxml/llxmltree.cpp
index 1bce5d29f7..bc2690deff 100644
--- a/indra/llxml/llxmltree.cpp
+++ b/indra/llxml/llxmltree.cpp
@@ -510,7 +510,8 @@ LLXmlTreeParser::LLXmlTreeParser(LLXmlTree* tree)
 	: mTree(tree),
 	  mRoot( NULL ),
 	  mCurrent( NULL ),
-	  mDump( FALSE )
+	  mDump( FALSE ),
+	  mKeepContents(FALSE)
 {
 }
 
-- 
cgit v1.2.3


From 81bc33f042fb1574e0119b0f46739a3f32849883 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:48:10 +0000
Subject: CID-264

Checker: UNINIT_CTOR
Function: LLPluginProcessChild::LLPluginProcessChild()
File: /indra/llplugin/llpluginprocesschild.cpp
---
 indra/llplugin/llpluginprocesschild.cpp | 1 +
 indra/llplugin/llpluginprocesschild.h   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp
index 11c924cadf..0f3254d78d 100644
--- a/indra/llplugin/llpluginprocesschild.cpp
+++ b/indra/llplugin/llpluginprocesschild.cpp
@@ -43,6 +43,7 @@ static const F32 PLUGIN_IDLE_SECONDS = 1.0f / 100.0f;  // Each call to idle will
 
 LLPluginProcessChild::LLPluginProcessChild()
 {
+	mState = STATE_UNINITIALIZED;
 	mInstance = NULL;
 	mSocket = LLSocket::create(gAPRPoolp, LLSocket::STREAM_TCP);
 	mSleepTime = PLUGIN_IDLE_SECONDS;	// default: send idle messages at 100Hz
diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h
index 1cfd9dcaf9..58f8935ed1 100644
--- a/indra/llplugin/llpluginprocesschild.h
+++ b/indra/llplugin/llpluginprocesschild.h
@@ -89,8 +89,9 @@ private:
 		STATE_ERROR,				// generic bailout state
 		STATE_DONE					// state machine will sit in this state after either error or normal termination.
 	};
-	EState mState;
 	void setState(EState state);
+
+	EState mState;
 	
 	LLHost mLauncherHost;
 	LLSocket::ptr_t mSocket;
-- 
cgit v1.2.3


From d98df93ce28be57a7759a3e321ba5f3ebaf8617a Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:50:01 +0000
Subject: CID-263

Checker: UNINIT_CTOR
Function: LLPluginClassMedia::LLPluginClassMedia(LLPluginClassMediaOwner *)
File: /indra/llplugin/llpluginclassmedia.cpp
---
 indra/llplugin/llpluginclassmedia.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 3d2eaed5c5..91c796a9e6 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -104,6 +104,8 @@ void LLPluginClassMedia::reset()
 	mSetMediaHeight = -1;
 	mRequestedMediaWidth = 0;
 	mRequestedMediaHeight = 0;
+	mRequestedTextureWidth = 0;
+	mRequestedTextureHeight = 0;
 	mFullMediaWidth = 0;
 	mFullMediaHeight = 0;
 	mTextureWidth = 0;
-- 
cgit v1.2.3


From 429fa5a494910c43e2a4cfd0f695146fbfb57dbb Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 3 Feb 2010 15:50:57 -0500
Subject: Skip fragile (local ISP dependent) llhttpclient integration test.

---
 indra/test/llhttpclient_tut.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp
index c541997e89..2b1496e912 100644
--- a/indra/test/llhttpclient_tut.cpp
+++ b/indra/test/llhttpclient_tut.cpp
@@ -269,6 +269,7 @@ namespace tut
 	template<> template<>
 	void HTTPClientTestObject::test<2>()
 	{
+		skip("error test depends on dev's local ISP not supplying \"helpful\" search page");
 		LLHTTPClient::get("http://www.invalid", newResult());
 		runThePump();
 		ensureStatusError();
-- 
cgit v1.2.3


From f1606535e121aff163b5499ab487dcfb04d524b7 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:52:06 +0000
Subject: CID-262

Checker: UNINIT_CTOR
Function: LLPluginProcessParent::LLPluginProcessParent(LLPluginProcessParentOwner *)
File: /indra/llplugin/llpluginprocessparent.cpp
---
 indra/llplugin/llpluginprocessparent.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index 49f9783824..efd5df687e 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -50,6 +50,8 @@ LLPluginProcessParent::LLPluginProcessParent(LLPluginProcessParentOwner *owner)
 	mOwner = owner;
 	mBoundPort = 0;
 	mState = STATE_UNINITIALIZED;
+	mSleepTime = 0.0;
+	mCPUUsage = 0.0;
 	mDisableTimeout = false;
 	mDebug = false;
 
-- 
cgit v1.2.3


From d182b4f19ab14e07b5d43ad605545fb04686e870 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:54:16 +0000
Subject: CID-261

Checker: UNINIT_CTOR
Function: LLImageJ2COJ::LLImageJ2COJ()
File: /indra/llimagej2coj/llimagej2coj.cpp
---
 indra/llimagej2coj/llimagej2coj.cpp | 3 ++-
 indra/llimagej2coj/llimagej2coj.h   | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index e71429b18d..3af31da083 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -97,7 +97,8 @@ void info_callback(const char* msg, void*)
 }
 
 
-LLImageJ2COJ::LLImageJ2COJ() : LLImageJ2CImpl()
+LLImageJ2COJ::LLImageJ2COJ()
+	: LLImageJ2CImpl()
 {
 }
 
diff --git a/indra/llimagej2coj/llimagej2coj.h b/indra/llimagej2coj/llimagej2coj.h
index 73cb074f1f..8255d5225f 100644
--- a/indra/llimagej2coj/llimagej2coj.h
+++ b/indra/llimagej2coj/llimagej2coj.h
@@ -51,9 +51,6 @@ protected:
 		// Divide a by b to the power of 2 and round upwards.
 		return (a + (1 << b) - 1) >> b;
 	}
-
-	// Temporary variables for in-progress decodes...
-	LLImageRaw *mRawImagep;
 };
 
 #endif
-- 
cgit v1.2.3


From 940041992ac429c7d67642f82b64ebc8bc01730f Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 20:57:29 +0000
Subject: CID-260

Checker: UNINIT_CTOR
Function: LLPidLockFile::LLPidLockFile()
File: /indra/llvfs/llpidlock.cpp
---
 indra/llvfs/llpidlock.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp
index 95e3692e10..28cee29405 100755
--- a/indra/llvfs/llpidlock.cpp
+++ b/indra/llvfs/llpidlock.cpp
@@ -68,8 +68,12 @@ class LLPidLockFile
 {
 	public:
 		LLPidLockFile( ) :
-			mSaving(FALSE), mWaiting(FALSE), 
-			mClean(TRUE), mPID(getpid())
+			mAutosave(false),
+			mSaving(false),
+			mWaiting(false),
+			mPID(getpid()),
+			mNameTable(NULL),
+			mClean(true)
 		{
 			mLockName = gDirUtilp->getTempDir() + gDirUtilp->getDirDelimiter() + "savelock";
 		}
-- 
cgit v1.2.3


From 1e6d2c9cd3d8e3a7ee48601ca0ecf0cf8dc4f809 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 21:00:12 +0000
Subject: CID-259

Checker: UNINIT_CTOR
Function: LLVFile::LLVFile(LLVFS *, const LLUUID &, LLAssetType::EType, int)
File: /indra/llvfs/llvfile.cpp

dead field.
---
 indra/llvfs/llvfile.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/llvfs/llvfile.h b/indra/llvfs/llvfile.h
index 5f69a41040..c3bca8c737 100644
--- a/indra/llvfs/llvfile.h
+++ b/indra/llvfs/llvfile.h
@@ -88,7 +88,6 @@ protected:
 	S32		mMode;
 	LLVFS	*mVFS;
 	F32		mPriority;
-	BOOL	mOnReadQueue;
 
 	S32		mBytesRead;
 	LLVFSThread::handle_t mHandle;
-- 
cgit v1.2.3


From bf18e798c5ca2e238bb5f4affec7182c8e30dcd4 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 3 Feb 2010 21:13:37 +0000
Subject: CID-405

Checker: UNUSED_VALUE
Function: LLNormalTextSegment::drawClippedSegment(int, int, int, int, LLRectBase<int>)
File: /indra/llui/lltextbase.cpp
---
 indra/llui/lltextbase.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 75ca6d8895..2b1e2b8226 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2333,8 +2333,6 @@ F32 LLNormalTextSegment::drawClippedSegment(S32 seg_start, S32 seg_end, S32 sele
 
 	LLColor4 color = (mEditor.getReadOnly() ? mStyle->getReadOnlyColor() : mStyle->getColor())  % alpha;
 
-	font = mStyle->getFont();
-
   	if( selection_start > seg_start )
 	{
 		// Draw normally
-- 
cgit v1.2.3


From 46b2826d653a7e59e89bcffb591567d3ee4c67dd Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 3 Feb 2010 16:52:23 -0500
Subject: EXT-4923 : Texture Preview "Copy to Inventory" button too small

---
 indra/newview/skins/default/xui/en/floater_preview_texture.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index 0d155fb01e..fc6f06ffd4 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -114,7 +114,7 @@
      left="6"
      name="Keep"
      top_pad="5"
-     width="100" />
+     width="110" />
     <button
      follows="right|bottom"
      height="22"
@@ -123,7 +123,7 @@
      left_pad="5"
      name="Discard"
      top_delta="0"
-     width="100" />
+     width="110" />
     <button
      follows="right|bottom"
      height="22"
@@ -132,5 +132,5 @@
      left_pad="5"
      name="save_tex_btn"
      top_delta="0"
-     width="100" />
+     width="110" />
 </floater>
-- 
cgit v1.2.3


From f5ade203cb0a714ac8a1f468765838a1d30b0eb6 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 3 Feb 2010 16:56:25 -0500
Subject: EXT-4930 : Remove ability to change folder type in release viewer2.0

You should not be able to change folder type in viewer2.0; this was meant as a debug option and I swear it was removed some time ago and crept back in...
---
 indra/newview/llinventorybridge.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index f68550d8fd..4f02812cc6 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2617,14 +2617,17 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			mItems.push_back(std::string("New Gesture"));
 			mItems.push_back(std::string("New Clothes"));
 			mItems.push_back(std::string("New Body Parts"));
-			mItems.push_back(std::string("Change Type"));
 
-			LLViewerInventoryCategory *cat = getCategory();
+			// Changing folder types is just a debug feature; this is fairly unsupported
+			// and can lead to unexpected behavior if enabled.
+#if !LL_RELEASE_FOR_DOWNLOAD
+			mItems.push_back(std::string("Change Type"));
+			const LLViewerInventoryCategory *cat = getCategory();
 			if (cat && LLFolderType::lookupIsProtectedType(cat->getPreferredType()))
 			{
 				mDisabledItems.push_back(std::string("Change Type"));
 			}
-
+#endif
 			getClipboardEntries(false, mItems, mDisabledItems, flags);
 		}
 		else
-- 
cgit v1.2.3


From b510bfd88e6b290930d9f19b3d16e7b58d7967be Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Wed, 3 Feb 2010 14:08:19 -0800
Subject: EXT-3648 New message indicator on IM chiclets should be orange

---
 .../default/textures/bottomtray/Unread_Chiclet.png      | Bin 328 -> 334 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png
index 6343ddf035..e8fe243dc7 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png and b/indra/newview/skins/default/textures/bottomtray/Unread_Chiclet.png differ
-- 
cgit v1.2.3


From 4f98a16736a44d2eeceab4a18160015054345858 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Wed, 3 Feb 2010 17:29:10 -0500
Subject: Changed the "inspect" highlight color to teal to differentiate it
 from the "edit" color (and make it less obnoxious).
 https://jira.secondlife.com/browse/EXT-2578

---
 indra/newview/skins/default/colors.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index ec196245a1..ca579616d8 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -290,7 +290,7 @@
      reference="Black" />
     <color
      name="ContextSilhouetteColor"
-     value="0.94 0.61 0 1" />
+     reference="EmphasisColor" />
     <color
      name="DefaultHighlightDark"
      reference="White_10" />
@@ -602,7 +602,7 @@
      value="0.39 0.39 0.39 1" />
     <color
      name="ScriptErrorColor"
-     value="Red" />
+     reference="Red" />
     <color
      name="ScrollBGStripeColor"
      reference="Transparent" />
-- 
cgit v1.2.3


From 1e47e5b42d352d5d838eeb96984dbf6497020e32 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 3 Feb 2010 17:42:04 -0500
Subject: EXT-4022 : Texture previews don't work in object contents

This was broken long ago in viewer-2.0.0-2 when someone made the decision to stop passing in ObjectID to the texture preview floater.
---
 indra/newview/llpreview.h          |  2 +-
 indra/newview/llpreviewtexture.cpp | 58 +++++++++++++++++++++++++++-----------
 indra/newview/llpreviewtexture.h   |  3 ++
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/indra/newview/llpreview.h b/indra/newview/llpreview.h
index 3b9f7f9882..551e247d8c 100644
--- a/indra/newview/llpreview.h
+++ b/indra/newview/llpreview.h
@@ -74,7 +74,7 @@ public:
 		
 	/*virtual*/ BOOL postBuild();
 	
-	void setObjectID(const LLUUID& object_id);
+	virtual void setObjectID(const LLUUID& object_id);
 	void setItem( LLInventoryItem* item );
 	
 	void setAssetId(const LLUUID& asset_id);
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 028807a6bd..dfc67d0126 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -74,22 +74,10 @@ LLPreviewTexture::LLPreviewTexture(const LLSD& key)
 	  mLastHeight(0),
 	  mLastWidth(0),
 	  mAspectRatio(0.f),
-	  mPreviewToSave(FALSE)
+	  mPreviewToSave(FALSE),
+	  mImage(NULL)
 {
-	const LLViewerInventoryItem *item = static_cast<const LLViewerInventoryItem*>(getItem());
-	if(item)
-	{
-		mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID();
-		mImageID = item->getAssetUUID();
-		mIsCopyable = item->checkPermissionsSet(PERM_ITEM_UNRESTRICTED);
-	}
-	else // not an item, assume it's an asset id
-	{
-		mImageID = mItemUUID;
-		mCopyToInv = TRUE;
-		mIsCopyable = TRUE;
-	}
-
+	updateImageID();
 	if (key.has("save_as"))
 	{
 		mPreviewToSave = TRUE;
@@ -97,7 +85,6 @@ LLPreviewTexture::LLPreviewTexture(const LLSD& key)
 	//Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_texture.xml", FALSE);
 }
 
-
 LLPreviewTexture::~LLPreviewTexture()
 {
 	if( mLoadingFullImage )
@@ -493,3 +480,42 @@ LLPreview::EAssetStatus LLPreviewTexture::getAssetStatus()
 	}
 	return mAssetStatus;
 }
+
+void LLPreviewTexture::updateImageID()
+{
+	const LLViewerInventoryItem *item = static_cast<const LLViewerInventoryItem*>(getItem());
+	if(item)
+	{
+		mImageID = item->getAssetUUID();
+		mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID();
+		mCopyToInv = FALSE;
+		mIsCopyable = item->checkPermissionsSet(PERM_ITEM_UNRESTRICTED);
+	}
+	else // not an item, assume it's an asset id
+	{
+		mImageID = mItemUUID;
+		mShowKeepDiscard = FALSE;
+		mCopyToInv = TRUE;
+		mIsCopyable = TRUE;
+	}
+
+}
+
+/* virtual */
+void LLPreviewTexture::setObjectID(const LLUUID& object_id)
+{
+	mObjectUUID = object_id;
+
+	const LLUUID old_image_id = mImageID;
+
+	// Update what image we're pointing to, such as if we just specified the mObjectID
+	// that this mItemID is part of.
+	updateImageID();
+
+	// If the imageID has changed, start over and reload the new image.
+	if (mImageID != old_image_id)
+	{
+		mAssetStatus = PREVIEW_ASSET_UNLOADED;
+		loadAsset();
+	}
+}
diff --git a/indra/newview/llpreviewtexture.h b/indra/newview/llpreviewtexture.h
index 980aecee6d..7cd2adad56 100644
--- a/indra/newview/llpreviewtexture.h
+++ b/indra/newview/llpreviewtexture.h
@@ -69,6 +69,8 @@ public:
 	void 				openToSave();
 	
 	static void			onSaveAsBtn(void* data);
+
+	/*virtual*/ void setObjectID(const LLUUID& object_id);
 protected:
 	void				init();
 	/* virtual */ BOOL	postBuild();
@@ -76,6 +78,7 @@ protected:
 	static void			onAspectRatioCommit(LLUICtrl*,void* userdata);
 	
 private:
+	void				updateImageID(); // set what image is being uploaded.
 	void				updateDimensions();
 	LLUUID				mImageID;
 	LLPointer<LLViewerFetchedTexture>		mImage;
-- 
cgit v1.2.3


From 554c163baf5bee0d62082338e854468ecb2fc5f1 Mon Sep 17 00:00:00 2001
From: Lis Linden <lis@lindenlab.com>
Date: Wed, 3 Feb 2010 17:51:33 -0500
Subject: EXT-1268 'Remember me' is misleading

---
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index c04414abbb..627e616af5 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -118,7 +118,7 @@ control_name="RememberPassword"
 follows="left|bottom"
 font="SansSerifSmall"
 height="16"
-label="Remember"
+label="Remember password"
   top_pad="3"
   name="remember_check"
  width="135" />
-- 
cgit v1.2.3


From da19bed9a816a396fbc359803bd6a7f88bf8b6ae Mon Sep 17 00:00:00 2001
From: Soft Linden <soft@lindenlab.com>
Date: Wed, 3 Feb 2010 17:04:44 -0600
Subject: EXT-1560 VWR-11118 DEV-27362 Ctrl+Alt+Shift+H doesn't say hippos!
 anymore

---
 indra/newview/llviewermenu.cpp                     |  8 ++++++++
 indra/newview/llviewerwindow.cpp                   |  6 ++++++
 indra/newview/llviewerwindow.h                     |  1 +
 indra/newview/skins/default/xui/en/menu_viewer.xml | 12 ++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  3 ---
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index f7f30a5136..0d6e490faa 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -603,6 +603,10 @@ class LLAdvancedToggleHUDInfo : public view_listener_t
 		{
 			gDisplayFOV = !(gDisplayFOV);
 		}
+		else if ("badge" == info_type)
+		{
+			gDisplayBadge = !(gDisplayBadge);
+		}
 		return true;
 	}
 };
@@ -625,6 +629,10 @@ class LLAdvancedCheckHUDInfo : public view_listener_t
 		{
 			new_value = gDisplayFOV;
 		}
+		else if ("badge" == info_type)
+		{
+			new_value = gDisplayBadge;
+		}
 		return new_value;
 	}
 };
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index fdc6675db1..315b7c52cf 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -233,6 +233,7 @@ S32				gDebugRaycastFaceHit;
 BOOL				gDisplayWindInfo = FALSE;
 BOOL				gDisplayCameraPos = FALSE;
 BOOL				gDisplayFOV = FALSE;
+BOOL				gDisplayBadge = FALSE;
 
 S32 CHAT_BAR_HEIGHT = 28; 
 S32 OVERLAY_BAR_HEIGHT = 20;
@@ -422,6 +423,11 @@ public:
 			addText(xpos, ypos, llformat("FOV: %2.1f deg", RAD_TO_DEG * LLViewerCamera::getInstance()->getView()));
 			ypos += y_inc;
 		}
+		if (gDisplayBadge)
+		{
+			addText(xpos, ypos+(y_inc/2), llformat("Hippos!", RAD_TO_DEG * LLViewerCamera::getInstance()->getView()));
+			ypos += y_inc * 2;
+		}
 		
 		/*if (LLViewerJoystick::getInstance()->getOverrideCamera())
 		{
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index 98d2958d9a..bfce65f2ba 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -506,5 +506,6 @@ extern S32 CHAT_BAR_HEIGHT;
 extern BOOL			gDisplayCameraPos;
 extern BOOL			gDisplayWindInfo;
 extern BOOL			gDisplayFOV;
+extern BOOL			gDisplayBadge;
 
 #endif
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7a4f63bfe4..22f4d277a4 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1998,6 +1998,18 @@
                  function="Advanced.ToggleHUDInfo"
                  parameter="fov" />
             </menu_item_check>
+            <menu_item_check
+             label="Badge"
+             layout="topleft"
+             name="Badge"
+			 shortcut="alt|control|shift|h">
+                <menu_item_check.on_check
+                 function="Advanced.CheckHUDInfo"
+                 parameter="badge" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleHUDInfo"
+                 parameter="badge" />
+            </menu_item_check>
         </menu>
         <menu
          create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b4a12cfb32..d6db451286 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -115,9 +115,6 @@
   <!-- Avatar name: More than one avatar is selected/used here -->
   <string name="AvatarNameMultiple">(multiple)</string>
 
-  <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
-	<string name="AvatarNameHippos">(hippos)</string>
-
 	<!-- Group name: text shown for LLUUID::null -->
 	<string name="GroupNameNone">(none)</string>
 
-- 
cgit v1.2.3


From fea3e5ea7659bcefb6715bd87affdece2b4407fb Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 3 Feb 2010 15:13:19 -0800
Subject: Fix for DEV-45609 "CID-47 and CID-154 - bogus allocation/memset in
 Quicktime plugin" Reviewed by Rick.

---
 indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index dbc44c8334..26690f64a6 100644
--- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -724,8 +724,8 @@ private:
 			return false;
 
 		// allocate some space and grab it
-		UInt8* item_data = new UInt8( size + 1 );
-		memset( item_data, 0, ( size + 1 ) * sizeof( UInt8* ) );
+		UInt8* item_data = new UInt8[ size + 1 ];
+		memset( item_data, 0, ( size + 1 ) * sizeof( UInt8 ) );
 		result = QTMetaDataGetItemValue( media_data_ref, item, item_data, size, NULL );
 		if ( noErr != result ) 
 		{
-- 
cgit v1.2.3


From 9c608d4db5909ffe2a89556996f93d4b54b50782 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Wed, 3 Feb 2010 15:16:57 -0800
Subject: Fix for DEV-45609 "CID-47 and CID-154 - bogus allocation/memset in
 Quicktime plugin" (Fixed line endings for commit hook) Reviewed by Rick.

---
 indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index 26690f64a6..e230fcc280 100644
--- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -724,7 +724,7 @@ private:
 			return false;
 
 		// allocate some space and grab it
-		UInt8* item_data = new UInt8[ size + 1 ];
+		UInt8* item_data = new UInt8[ size + 1 ];
 		memset( item_data, 0, ( size + 1 ) * sizeof( UInt8 ) );
 		result = QTMetaDataGetItemValue( media_data_ref, item, item_data, size, NULL );
 		if ( noErr != result ) 
-- 
cgit v1.2.3


From 3119c0bdcef3bdb503d2fae736528fabd7e9e0f9 Mon Sep 17 00:00:00 2001
From: "Eric M. Tulla (BigPapi)" <tulla@lindenlab.com>
Date: Wed, 3 Feb 2010 18:39:13 -0500
Subject: EXT-4824 - NUX Close My Inventory and open Library for a new user's
 first login. -Reviewed by Vir

---
 indra/newview/llinventorypanel.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 12a2c370d2..a6d63e58f5 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -432,7 +432,26 @@ void LLInventoryPanel::initializeViews()
 	rebuildViewsFor(mStartFolderID);
 
 	mViewsInitialized = true;
+	
 	openStartFolderOrMyInventory();
+	
+	// Special case for new user login
+	if (gAgent.isFirstLogin())
+	{
+		// Auto open the user's library
+		LLFolderViewFolder* lib_folder = mFolders->getFolderByID(gInventory.getLibraryRootFolderID());
+		if (lib_folder)
+		{
+			lib_folder->setOpen(TRUE);
+		}
+		
+		// Auto close the user's my inventory folder
+		LLFolderViewFolder* my_inv_folder = mFolders->getFolderByID(gInventory.getRootFolderID());
+		if (my_inv_folder)
+		{
+			my_inv_folder->setOpenArrangeRecursively(FALSE, LLFolderViewFolder::RECURSE_DOWN);
+		}
+	}
 }
 
 void LLInventoryPanel::rebuildViewsFor(const LLUUID& id)
-- 
cgit v1.2.3


From 97d24fe89fa4677cada315805edfa27d95d4ed8f Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Thu, 4 Feb 2010 00:37:01 +0000
Subject: EXT-4898: Reverting English.lproj change until I get a review

But I want to be able to check in other commits...
---
 indra/newview/English.lproj/language.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/English.lproj/language.txt b/indra/newview/English.lproj/language.txt
index 2c4c454fdd..bc0aa577f9 100644
--- a/indra/newview/English.lproj/language.txt
+++ b/indra/newview/English.lproj/language.txt
@@ -1 +1 @@
-en
\ No newline at end of file
+en-us
\ No newline at end of file
-- 
cgit v1.2.3


From bc882419492def6b4f822643c0cf6d4d84327d55 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Thu, 4 Feb 2010 00:41:03 +0000
Subject: EXT-4898: Trying to subvert the coding policy hooks....

.lproj/language.txt MUST NOT have a newline at the end, but the coding
policy hooks won't let me do this. Making a trivial change so that I can
undo it again with the relevant just-do-it flag.
---
 indra/newview/English.lproj/language.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/English.lproj/language.txt b/indra/newview/English.lproj/language.txt
index bc0aa577f9..7eda695fea 100644
--- a/indra/newview/English.lproj/language.txt
+++ b/indra/newview/English.lproj/language.txt
@@ -1 +1 @@
-en-us
\ No newline at end of file
+en-us
-- 
cgit v1.2.3


From c788986c9ed282f5e8afc8b5352e61986cdbc209 Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Thu, 4 Feb 2010 00:42:23 +0000
Subject: EXT-4898: Turn off policy hooks so I can check in this file.

English.lproj/language.txt must not have a newline in it.

warn-on-failure:eol-at-eof
---
 indra/newview/English.lproj/language.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/English.lproj/language.txt b/indra/newview/English.lproj/language.txt
index 7eda695fea..bc0aa577f9 100644
--- a/indra/newview/English.lproj/language.txt
+++ b/indra/newview/English.lproj/language.txt
@@ -1 +1 @@
-en-us
+en-us
\ No newline at end of file
-- 
cgit v1.2.3


From 46bcfc4bb4efb99ed58d700b3c462d776bb52559 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Wed, 3 Feb 2010 19:46:24 -0500
Subject: Fixed paths to artwork. https://jira.secondlife.com/browse/EXT-4935

---
 indra/newview/skins/default/textures/textures.xml             | 3 ++-
 indra/newview/skins/default/xui/en/widgets/location_input.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index ea66897b35..ccf49f6a9f 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -368,7 +368,7 @@ with the same filename but different name
 
  <texture name="Parcel_Build_Dark" file_name="icons/Parcel_Build_Dark.png" preload="false" />
  <texture name="Parcel_BuildNo_Dark" file_name="icons/Parcel_BuildNo_Dark.png" preload="false" />
- <texture name="Parcel_Damage_Dark" file_name="icons/Parcel_Health_Dark.png" preload="false" />
+ <texture name="Parcel_Damage_Dark" file_name="icons/Parcel_Damage_Dark.png" preload="false" />
  <texture name="Parcel_DamageNo_Dark" file_name="icons/Parcel_DamageNo_Dark.png" preload="false" />
  <texture name="Parcel_Evry_Dark" file_name="icons/Parcel_Evry_Dark.png" preload="false" />
  <texture name="Parcel_Exp_Dark" file_name="icons/Parcel_Exp_Dark.png" preload="false" />
@@ -376,6 +376,7 @@ with the same filename but different name
  <texture name="Parcel_FlyNo_Dark" file_name="icons/Parcel_FlyNo_Dark.png" preload="false" />
  <texture name="Parcel_ForSale_Dark" file_name="icons/Parcel_ForSale_Dark.png" preload="false" />
  <texture name="Parcel_ForSaleNo_Dark" file_name="icons/Parcel_ForSaleNo_Dark.png" preload="false" />
+ <texture name="Parcel_Health_Dark" file_name="icons/Parcel_Health_Dark.png" preload="false" />
  <texture name="Parcel_M_Dark" file_name="icons/Parcel_M_Dark.png" preload="false" />
  <texture name="Parcel_PG_Dark" file_name="icons/Parcel_PG_Dark.png" preload="false" />
  <texture name="Parcel_Push_Dark" file_name="icons/Parcel_Push_Dark.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 2163660206..626135642b 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -99,7 +99,7 @@
     top="19"
     left="2"
     follows="right|top"
-    image_name="Parcel_Damage_Dark"
+    image_name="Parcel_Health_Dark"
     />
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text
-- 
cgit v1.2.3


From 13aa8f8faaaefea59531a970bd0b6fe1d947b756 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 3 Feb 2010 21:27:02 -0500
Subject: EXT-4344 : Object Inspector has "Sorry, not implemented yet"

Added sidetray object inspector code.
---
 indra/newview/llinspectobject.cpp                    | 6 ++++--
 indra/newview/skins/default/xui/en/notifications.xml | 8 --------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llinspectobject.cpp b/indra/newview/llinspectobject.cpp
index 1a5795a2ae..91cbbbf430 100644
--- a/indra/newview/llinspectobject.cpp
+++ b/indra/newview/llinspectobject.cpp
@@ -51,6 +51,7 @@
 #include "llmenubutton.h"
 #include "llresmgr.h"			// getMonetaryString
 #include "llsafehandle.h"
+#include "llsidetray.h"
 #include "lltextbox.h"			// for description truncation
 #include "lltrans.h"
 #include "llui.h"				// positionViewNearMouse()
@@ -643,8 +644,9 @@ void LLInspectObject::onClickOpen()
 
 void LLInspectObject::onClickMoreInfo()
 {
-	// *TODO: Show object info side panel, once that is implemented.
-	LLNotificationsUtil::add("ClickUnimplemented");
+	LLSD key;
+	key["task"] = "task";
+	LLSideTray::getInstance()->showPanel("sidepanel_inventory", key);	
 	closeFloater();
 }
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 636db2b59b..5c37ef75b5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -391,14 +391,6 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
      notext="No"
      yestext="Yes"/>
   </notification>
-
-  <notification
-    icon="alertmodal.tga"
-    name="ClickUnimplemented"
-    type="alertmodal">
-Sorry, not implemented yet.
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="JoinGroupCanAfford"
-- 
cgit v1.2.3


From f700be39e7dc9b9e6e56031818b94c329383a097 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Wed, 3 Feb 2010 21:55:18 -0500
Subject: EXT-4901 : Context menu missing on Scripts and Notecards in Trash

Simple string naming error.
---
 indra/newview/llinventorybridge.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 4f02812cc6..ab178b4007 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -607,12 +607,12 @@ void LLInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	std::vector<std::string> disabled_items;
 	if(isInTrash())
 	{
-		items.push_back(std::string("PurgeItem"));
+		items.push_back(std::string("Purge Item"));
 		if (!isItemRemovable())
 		{
-			disabled_items.push_back(std::string("PurgeItem"));
+			disabled_items.push_back(std::string("Purge Item"));
 		}
-		items.push_back(std::string("RestoreItem"));
+		items.push_back(std::string("Restore Item"));
 	}
 	else
 	{
-- 
cgit v1.2.3


From f7120956f50afb3ffae269819ffbd7f07b1ac85b Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Thu, 4 Feb 2010 09:21:02 +0000
Subject: EXT-4898: Convert "en-us" to "en" for url substitutions.

The correct and general fix is to change English.lproj/language.txt.
This fix here is a more targeted and less risky fix at this stage
of the release cycle.
---
 indra/newview/llweb.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 7866f735c5..3def17f33c 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -145,11 +145,20 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url,
 	substitution["VERSION_PATCH"] = LLVersionInfo::getPatch();
 	substitution["VERSION_BUILD"] = LLVersionInfo::getBuild();
 	substitution["CHANNEL"] = LLVersionInfo::getChannel();
-	substitution["LANGUAGE"] = LLUI::getLanguage();
 	substitution["GRID"] = LLViewerLogin::getInstance()->getGridLabel();
 	substitution["OS"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
 	substitution["SESSION_ID"] = gAgent.getSessionID();
 
+	// work out the current language
+	std::string lang = LLUI::getLanguage();
+	if (lang == "en-us")
+	{
+		// *HACK: the correct fix is to change English.lproj/language.txt,
+		// but we're late in the release cycle and this is a less risky fix
+		lang = "en";
+	}
+	substitution["LANGUAGE"] = lang;
+
 	// find the region ID
 	LLUUID region_id;
 	LLViewerRegion *region = gAgent.getRegion();
-- 
cgit v1.2.3


From 6c992c95a98ec69e77455129098338dce2f092aa Mon Sep 17 00:00:00 2001
From: Lynx Linden <lynx@lindenlab.com>
Date: Thu, 4 Feb 2010 10:23:24 +0000
Subject: EXT-3681: Send Parcel "Local ID" (S32) to web pages.

This is instead of sending the Parcel ID (LLUUID), which it turns out
the server never sends to the viewer (LLParcel::getID() always returns
NULL).
---
 indra/newview/llweb.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 3def17f33c..100ec0bb69 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -168,14 +168,14 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url,
 	}
 	substitution["REGION_ID"] = region_id;
 
-	// find the parcel ID
-	LLUUID parcel_id;
+	// find the parcel local ID
+	S32 parcel_id = 0;
 	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 	if (parcel)
 	{
-		parcel_id = parcel->getID();
+		parcel_id = parcel->getLocalID();
 	}
-	substitution["PARCEL_ID"] = parcel_id;
+	substitution["PARCEL_ID"] = llformat("%d", parcel_id);
 
 	// expand all of the substitution strings and escape the url
 	std::string expanded_url = url;
-- 
cgit v1.2.3


From 482eefcba94dac0e6a0e6f9985f582e724b02523 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Thu, 4 Feb 2010 12:39:13 +0200
Subject: fix for task EXT-4750 Disable "Join" dialog for free groups also add
 group name to notification - more informative...

--HG--
branch : product-engine
---
 indra/newview/llgroupactions.cpp                     |  7 ++++++-
 indra/newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 3653371d76..00e2365ffd 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -161,12 +161,17 @@ void LLGroupActions::join(const LLUUID& group_id)
 		S32 cost = gdatap->mMembershipFee;
 		LLSD args;
 		args["COST"] = llformat("%d", cost);
+		args["NAME"] = gdatap->mName;
 		LLSD payload;
 		payload["group_id"] = group_id;
 
 		if (can_afford_transaction(cost))
 		{
-			LLNotificationsUtil::add("JoinGroupCanAfford", args, payload, onJoinGroup);
+			if(cost > 0)
+				LLNotificationsUtil::add("JoinGroupCanAfford", args, payload, onJoinGroup);
+			else
+				LLNotificationsUtil::add("JoinGroupNoCost", args, payload, onJoinGroup);
+				
 		}
 		else
 		{
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 636db2b59b..7cc4af53f8 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -411,6 +411,19 @@ Do you wish to proceed?
      yestext="Join"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="JoinGroupNoCost"
+   type="alertmodal">
+You are Joining group [NAME].
+Do you wish to proceed?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Join"/>
+  </notification>
+
+
   <notification
    icon="alertmodal.tga"
    name="JoinGroupCannotAfford"
-- 
cgit v1.2.3


From 879675d986e8167db880586598358e6a80147108 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Feb 2010 12:55:52 +0200
Subject: Fixed critical bug EXT-4823 - [NUX] Default My Profile to Edit Mode

--HG--
branch : product-engine
---
 indra/newview/llpanelme.cpp      | 14 ++++++++++++++
 indra/newview/llpanelprofile.cpp | 16 +++++++++++-----
 indra/newview/llpanelprofile.h   |  2 ++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp
index ea66ef7d2c..a68552a91e 100644
--- a/indra/newview/llpanelme.cpp
+++ b/indra/newview/llpanelme.cpp
@@ -69,6 +69,20 @@ BOOL LLPanelMe::postBuild()
 void LLPanelMe::onOpen(const LLSD& key)
 {
 	LLPanelProfile::onOpen(key);
+
+	if(key.isUndefined() || key.has("edit_my_profile"))
+	{
+		// Open Edit My Profile panel by default (through Side Tray -> My Profile) (EXT-4823)
+		buildEditPanel();
+		openPanel(mEditPanel, getAvatarId());
+	}
+	else if(mEditPanel)
+	{
+		// When opening Me Panel through Side Tray LLPanelMe::onOpen() is called twice.
+		// First time key can be undefined and second time - key may contain some data.
+		// Lets close Edit Panel if key does contain some data on second call.
+		closePanel(mEditPanel);
+	}
 }
 
 bool LLPanelMe::notifyChildren(const LLSD& info)
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index c73ade53c8..b5d85dfd4b 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -197,11 +197,7 @@ void LLPanelProfile::togglePanel(LLPanel* panel, const LLSD& key)
 	}
 	else 
 	{
-		panel->setVisible(FALSE);
-		if (panel->getParent() == this) 
-		{
-			removeChild(panel);
-		}
+		closePanel(panel);
 
 		getTabCtrl()->getCurrentPanel()->onOpen(getAvatarId());
 	}
@@ -248,6 +244,16 @@ void LLPanelProfile::openPanel(LLPanel* panel, const LLSD& params)
 	panel->setRect(new_rect);
 }
 
+void LLPanelProfile::closePanel(LLPanel* panel)
+{
+	panel->setVisible(FALSE);
+
+	if (panel->getParent() == this) 
+	{
+		removeChild(panel);
+	}
+}
+
 S32 LLPanelProfile::notifyParent(const LLSD& info)
 {
 	std::string action = info["action"];
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h
index bcf4bdd0ec..f1aa3f10f8 100644
--- a/indra/newview/llpanelprofile.h
+++ b/indra/newview/llpanelprofile.h
@@ -55,6 +55,8 @@ public:
 
 	virtual void openPanel(LLPanel* panel, const LLSD& params);
 
+	virtual void closePanel(LLPanel* panel);
+
 	S32 notifyParent(const LLSD& info);
 
 protected:
-- 
cgit v1.2.3


From 14d942f16b284ca5180b29f3c912d158c0d0cdd0 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 4 Feb 2010 11:08:49 +0000
Subject: A flag+assert to help track bad behaviour in LLEventTimer, especially
 EXT-4754

---
 indra/llcommon/lltimer.cpp | 6 ++++++
 indra/llcommon/lltimer.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index ef3e8dbc94..63634117b5 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -565,19 +565,23 @@ LLEventTimer::LLEventTimer(F32 period)
 : mEventTimer()
 {
 	mPeriod = period;
+	mBusy = false;
 }
 
 LLEventTimer::LLEventTimer(const LLDate& time)
 : mEventTimer()
 {
 	mPeriod = (F32)(time.secondsSinceEpoch() - LLDate::now().secondsSinceEpoch());
+	mBusy = false;
 }
 
 
 LLEventTimer::~LLEventTimer()
 {
+	llassert(!mBusy); // this LLEventTimer was destroyed from its own tick() function - bad.
 }
 
+//static
 void LLEventTimer::updateClass() 
 {
 	std::list<LLEventTimer*> completed_timers;
@@ -587,10 +591,12 @@ void LLEventTimer::updateClass()
 		F32 et = timer.mEventTimer.getElapsedTimeF32();
 		if (timer.mEventTimer.getStarted() && et > timer.mPeriod) {
 			timer.mEventTimer.reset();
+			timer.mBusy = true;
 			if ( timer.tick() )
 			{
 				completed_timers.push_back( &timer );
 			}
+			timer.mBusy = false;
 		}
 	}
 
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h
index d009c0f5f7..4d995d5bba 100644
--- a/indra/llcommon/lltimer.h
+++ b/indra/llcommon/lltimer.h
@@ -188,6 +188,7 @@ public:
 protected:
 	LLTimer mEventTimer;
 	F32 mPeriod;
+	bool mBusy;
 };
 
 U64 LL_COMMON_API totalTime();					// Returns current system time in microseconds
-- 
cgit v1.2.3


From 2c30ccf34d518ccedd0b3ffdeb2ba1da8d140a1d Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 4 Feb 2010 11:24:14 +0000
Subject: EXT-4754 Crash in LLEventTimer::updateClass

---
 indra/llcommon/lltimer.cpp      |  2 +-
 indra/newview/llcallfloater.cpp |  3 ++-
 indra/newview/llspeakers.cpp    | 17 ++++++++++-------
 indra/newview/llspeakers.h      |  4 ++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index 63634117b5..21e165ebc9 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -578,7 +578,7 @@ LLEventTimer::LLEventTimer(const LLDate& time)
 
 LLEventTimer::~LLEventTimer()
 {
-	llassert(!mBusy); // this LLEventTimer was destroyed from its own tick() function - bad.
+	llassert(!mBusy); // this LLEventTimer was destroyed from within its own tick() function - bad.  if you want tick() to cause destruction of its own timer, make it return true.
 }
 
 //static
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 8cb240c7c2..bd4fae6ab6 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -678,7 +678,8 @@ void LLCallFloater::resetVoiceRemoveTimers()
 
 void LLCallFloater::removeVoiceRemoveTimer(const LLUUID& voice_speaker_id)
 {
-	mSpeakerDelayRemover->unsetActionTimer(voice_speaker_id);
+	bool delete_it = true;
+	mSpeakerDelayRemover->unsetActionTimer(voice_speaker_id, delete_it);
 }
 
 bool LLCallFloater::validateSpeaker(const LLUUID& speaker_id)
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 6f9a1ccdbe..786fa24e65 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -205,7 +205,7 @@ void LLSpeakersDelayActionsStorage::setActionTimer(const LLUUID& speaker_id)
 	}
 }
 
-void LLSpeakersDelayActionsStorage::unsetActionTimer(const LLUUID& speaker_id)
+void LLSpeakersDelayActionsStorage::unsetActionTimer(const LLUUID& speaker_id, bool delete_it)
 {
 	if (mActionTimersMap.size() == 0) return;
 
@@ -213,7 +213,10 @@ void LLSpeakersDelayActionsStorage::unsetActionTimer(const LLUUID& speaker_id)
 
 	if (it_speaker != mActionTimersMap.end())
 	{
-		delete it_speaker->second;
+		if (delete_it)
+		{
+			delete it_speaker->second;
+		}
 		mActionTimersMap.erase(it_speaker);
 	}
 }
@@ -230,16 +233,15 @@ void LLSpeakersDelayActionsStorage::removeAllTimers()
 
 bool LLSpeakersDelayActionsStorage::onTimerActionCallback(const LLUUID& speaker_id)
 {
-	unsetActionTimer(speaker_id);
+	bool delete_it = false; // we're *in* this timer, return true to delete it, don't manually delete it
+	unsetActionTimer(speaker_id, delete_it);
 
 	if (mActionCallback)
 	{
 		mActionCallback(speaker_id);
 	}
 
-	// do not return true to avoid deleting of an timer twice:
-	// in LLSpeakersDelayActionsStorage::unsetActionTimer() & LLEventTimer::updateClass()
-	return false;
+	return true;
 }
 
 
@@ -291,7 +293,8 @@ LLPointer<LLSpeaker> LLSpeakerMgr::setSpeaker(const LLUUID& id, const std::strin
 		}
 	}
 
-	mSpeakerDelayRemover->unsetActionTimer(speakerp->mID);
+	bool delete_it = true;
+	mSpeakerDelayRemover->unsetActionTimer(speakerp->mID, delete_it);
 
 	return speakerp;
 }
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h
index 63237204c8..ddc3632f07 100644
--- a/indra/newview/llspeakers.h
+++ b/indra/newview/llspeakers.h
@@ -176,11 +176,11 @@ public:
 	void setActionTimer(const LLUUID& speaker_id);
 
 	/**
-	 * Removes stored LLSpeakerActionTimer for passed speaker UUID from internal map and deletes it.
+	 * Removes stored LLSpeakerActionTimer for passed speaker UUID from internal map and optionally deletes it.
 	 *
 	 * @see onTimerActionCallback()
 	 */
-	void unsetActionTimer(const LLUUID& speaker_id);
+	void unsetActionTimer(const LLUUID& speaker_id, bool delete_it);
 
 	void removeAllTimers();
 private:
-- 
cgit v1.2.3


From 56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 4 Feb 2010 11:40:33 +0000
Subject: remove linux linking stats from build process - I added them to help
 optimize linking time, but they're noisy and inaccurate in reality.

---
 indra/cmake/00-Common.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 1f578eec5f..592e9fc901 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -171,8 +171,8 @@ if (LINUX)
     if (NOT STANDALONE)
       # this stops us requiring a really recent glibc at runtime
       add_definitions(-fno-stack-protector)
-      # linking can be so slow - give us a chance to figure out why
-      set(CMAKE_CXX_LINK_FLAGS "-Wl,--stats,--no-keep-memory")
+      # linking can be very memory-hungry, especially the final viewer link
+      set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
     endif (NOT STANDALONE)
   endif (VIEWER)
 
-- 
cgit v1.2.3


From 667ae0b9a31318d43d36cb6c8cb73a83e1470009 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 4 Feb 2010 15:54:56 +0200
Subject: Fixed critical bug EXT-4845 (Create padding around text messages in
 the side tray panels) - moved "No Items" textbox params to widget
 (flat_list_view.xml) - set default vertical/horizontal padding to 10 px -
 they can be overridden in panel's xml if necessary.

--HG--
branch : product-engine
---
 indra/llui/llflatlistview.cpp                      | 47 ++++++++++++++--------
 indra/llui/llflatlistview.h                        |  5 ++-
 .../newview/skins/default/xui/en/panel_people.xml  |  2 +
 .../default/xui/en/widgets/flat_list_view.xml      | 10 ++++-
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index 92993650a7..2481249f91 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -42,8 +42,6 @@ static const LLDefaultChildRegistry::Register<LLFlatListView> flat_list_view("fl
 const LLSD SELECTED_EVENT	= LLSD().with("selected", true);
 const LLSD UNSELECTED_EVENT	= LLSD().with("selected", false);
 
-static const std::string COMMENT_TEXTBOX = "comment_text";
-
 //forward declaration
 bool llsds_are_equal(const LLSD& llsd_1, const LLSD& llsd_2);
 
@@ -51,7 +49,8 @@ LLFlatListView::Params::Params()
 :	item_pad("item_pad"),
 	allow_select("allow_select"),
 	multi_select("multi_select"),
-	keep_one_selected("keep_one_selected")
+	keep_one_selected("keep_one_selected"),
+	no_items_text("no_items_text")
 {};
 
 void LLFlatListView::reshape(S32 width, S32 height, BOOL called_from_parent /* = TRUE */)
@@ -295,19 +294,6 @@ void LLFlatListView::resetSelection(bool no_commit_on_deselection /*= false*/)
 
 void LLFlatListView::setNoItemsCommentText(const std::string& comment_text)
 {
-	if (NULL == mNoItemsCommentTextbox)
-	{
-		LLRect comment_rect = getRect();
-		comment_rect.setOriginAndSize(0, 0, comment_rect.getWidth(), comment_rect.getHeight());
-		comment_rect.stretch(-getBorderWidth());
-		LLTextBox::Params text_p;
-		text_p.name(COMMENT_TEXTBOX);
-		text_p.border_visible(false);
-		text_p.rect(comment_rect);
-		text_p.follows.flags(FOLLOWS_ALL);
-		mNoItemsCommentTextbox = LLUICtrlFactory::create<LLTextBox>(text_p, this);
-	}
-
 	mNoItemsCommentTextbox->setValue(comment_text);
 }
 
@@ -361,7 +347,6 @@ bool LLFlatListView::updateValue(const LLSD& old_value, const LLSD& new_value)
 // PROTECTED STUFF
 //////////////////////////////////////////////////////////////////////////
 
-
 LLFlatListView::LLFlatListView(const LLFlatListView::Params& p)
 :	LLScrollContainer(p)
   , mItemComparator(NULL)
@@ -398,6 +383,25 @@ LLFlatListView::LLFlatListView(const LLFlatListView::Params& p)
 	params.bevel_style(LLViewBorder::BEVEL_IN);
 	mSelectedItemsBorder = LLUICtrlFactory::create<LLViewBorder> (params);
 	mItemsPanel->addChild( mSelectedItemsBorder );
+
+	{
+		// create textbox for "No Items" comment text
+		LLTextBox::Params text_p = p.no_items_text;
+		if (!text_p.rect.isProvided())
+		{
+			LLRect comment_rect = getRect();
+			comment_rect.setOriginAndSize(0, 0, comment_rect.getWidth(), comment_rect.getHeight());
+			comment_rect.stretch(-getBorderWidth());
+			text_p.rect(comment_rect);
+		}
+		text_p.border_visible(false);
+
+		if (!text_p.follows.isProvided())
+		{
+			text_p.follows.flags(FOLLOWS_ALL);
+		}
+		mNoItemsCommentTextbox = LLUICtrlFactory::create<LLTextBox>(text_p, this);
+	}
 };
 
 // virtual
@@ -861,7 +865,11 @@ void LLFlatListView::notifyParentItemsRectChanged()
 	// take into account comment text height if exists
 	if (mNoItemsCommentTextbox && mNoItemsCommentTextbox->getVisible())
 	{
+		// top text padding inside the textbox is included into the height
 		comment_height = mNoItemsCommentTextbox->getTextPixelHeight();
+
+		// take into account a distance from parent's top border to textbox's top
+		comment_height += getRect().getHeight() - mNoItemsCommentTextbox->getRect().mTop;
 	}
 
 	LLRect req_rect =  getItemsRect();
@@ -892,6 +900,10 @@ void LLFlatListView::setNoItemsCommentVisible(bool visible) const
 	{
 		if (visible)
 		{
+/*
+// *NOTE: MA 2010-02-04
+// Deprecated after params of the comment text box were moved into widget (flat_list_view.xml)
+// can be removed later if nothing happened.
 			// We have to update child rect here because of issues with rect after reshaping while creating LLTextbox
 			// It is possible to have invalid LLRect if Flat List is in LLAccordionTab
 			LLRect comment_rect = getLocalRect();
@@ -903,6 +915,7 @@ void LLFlatListView::setNoItemsCommentVisible(bool visible) const
 			LLViewBorder* scroll_border = getChild<LLViewBorder>("scroll border");
 			comment_rect.stretch(-scroll_border->getBorderWidth());
 			mNoItemsCommentTextbox->setRect(comment_rect);
+*/
 		}
 		mNoItemsCommentTextbox->setVisible(visible);
 	}
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index 949a731507..92cb40332e 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -35,8 +35,8 @@
 
 #include "llpanel.h"
 #include "llscrollcontainer.h"
+#include "lltextbox.h"
 
-class LLTextBox;
 
 /**
  * LLFlatListView represents a flat list ui control that operates on items in a form of LLPanel's.
@@ -108,6 +108,9 @@ public:
 		/** padding between items */
 		Optional<U32> item_pad; 
 
+		/** textbox with info message when list is empty*/
+		Optional<LLTextBox::Params> no_items_text;
+
 		Params();
 	};
 	
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 3b5add33a8..447ac1b123 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -137,6 +137,7 @@ background_visible="true"
                         <avatar_list
                          allow_select="true"
                          follows="all"
+                         height="235"
                          layout="topleft"
                          left="0"
                          multi_select="true"
@@ -152,6 +153,7 @@ background_visible="true"
                         <avatar_list
                          allow_select="true"
                          follows="all"
+                         height="235"
                          layout="topleft"
                          left="0"
                          multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
index 888b4eaf7c..a71b293f31 100644
--- a/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flat_list_view.xml
@@ -5,4 +5,12 @@
  item_pad="0"
  keep_one_selected="true"
  multi_select="false"
- opaque="true" />
\ No newline at end of file
+ opaque="true">
+    <flat_list_view.no_items_text
+     follows="all"
+     name="no_items_msg"
+     v_pad="10"
+     h_pad="10"
+     value="There are no any items in the list"
+     wrap="true" />
+</flat_list_view>
\ No newline at end of file
-- 
cgit v1.2.3


From 7b62c80060184690ac28d34e4653472179f0cf13 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Thu, 4 Feb 2010 15:58:49 +0200
Subject: Additional commit for low  Bug  EXT-4242 . No logic had been
 affected. code cleaning up.

--HG--
branch : product-engine
---
 indra/newview/llnavigationbar.cpp | 57 ++++++++++++++++++++++-----------------
 indra/newview/llnavigationbar.h   | 37 +++++++++++--------------
 2 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
index 59708fcfb5..46cab0d868 100644
--- a/indra/newview/llnavigationbar.cpp
+++ b/indra/newview/llnavigationbar.cpp
@@ -185,43 +185,46 @@ void LLTeleportHistoryMenuItem::onMouseLeave(S32 x, S32 y, MASK mask)
 
 static LLDefaultChildRegistry::Register<LLPullButton> menu_button("pull_button");
 
-LLPullButton::LLPullButton(const LLPullButton::Params& params):
-		LLButton(params)
-	,	mClickDraggingSignal(NULL)
+LLPullButton::LLPullButton(const LLPullButton::Params& params) :
+	LLButton(params)
 {
 	setDirectionFromName(params.direction);
 }
-boost::signals2::connection LLPullButton::setClickDraggingCallback( const commit_signal_t::slot_type& cb ) 
-{ 
-	if (!mClickDraggingSignal) mClickDraggingSignal = new commit_signal_t();
-	return mClickDraggingSignal->connect(cb); 
+boost::signals2::connection LLPullButton::setClickDraggingCallback(const commit_signal_t::slot_type& cb)
+{
+	return mClickDraggingSignal.connect(cb);
 }
 
 /*virtual*/
 void LLPullButton::onMouseLeave(S32 x, S32 y, MASK mask)
 {
 	LLButton::onMouseLeave(x, y, mask);
-	
-	if(mMouseDownTimer.getStarted() )
+
+	if (mMouseDownTimer.getStarted()) //an user have done a mouse down, if the timer started. see LLButton::handleMouseDown for details
 	{
-		const LLVector2 cursor_direction = LLVector2(F32(x),F32(y)) - mLastMouseDown;
-		if( angle_between(mDraggingDirection, cursor_direction) < 0.5 * F_PI_BY_TWO)//call if angle < pi/4 
-			{
-				if(mClickDraggingSignal)
-				{
-					(*mClickDraggingSignal)(this, LLSD());
-				}
-			}
+		const LLVector2 cursor_direction = LLVector2(F32(x), F32(y)) - mLastMouseDown;
+		/* For now cursor_direction points to the direction of mouse movement
+		 * Need to decide whether should we fire a signal. 
+		 * We fire if angle between mDraggingDirection and cursor_direction is less that 45 degree
+		 * Note:
+		 * 0.5 * F_PI_BY_TWO equals to PI/4 radian that equals to angle of 45 degrees
+		 */
+		if (angle_between(mDraggingDirection, cursor_direction) < 0.5 * F_PI_BY_TWO)//call if angle < pi/4 
+		{
+			mClickDraggingSignal(this, LLSD());
+		}
 	}
 
 }
 
 /*virtual*/
 BOOL LLPullButton::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	BOOL handled = LLButton::handleMouseDown(x, y, mask);
+	if (handled)
 	{
-	BOOL handled = LLButton::handleMouseDown(x,y, mask);
-	if(handled)
-	{
+		//if mouse down was handled by button, 
+		//capture mouse position to calculate the direction of  mouse move  after mouseLeave event 
 		mLastMouseDown.set(F32(x), F32(y));
 	}
 	return handled;
@@ -230,27 +233,31 @@ BOOL LLPullButton::handleMouseDown(S32 x, S32 y, MASK mask)
 /*virtual*/
 BOOL LLPullButton::handleMouseUp(S32 x, S32 y, MASK mask)
 {
+	// reset data to get ready for next circle 
 	mLastMouseDown.clear();
 	return LLButton::handleMouseUp(x, y, mask);
 }
-
+/**
+ * this function is setting up dragging direction vector. 
+ * Last one is just unit vector. It points to direction of mouse drag that we need to handle   
+ */
 void LLPullButton::setDirectionFromName(const std::string& name)
 {
 	if (name == "left")
 	{
-		mDraggingDirection.set(F32(-1), F32(0)); 
+		mDraggingDirection.set(F32(-1), F32(0));
 	}
 	else if (name == "right")
 	{
-		mDraggingDirection.set(F32(0), F32(1)); 
+		mDraggingDirection.set(F32(0), F32(1));
 	}
 	else if (name == "down")
 	{
-		 mDraggingDirection.set(F32(0), F32(-1)); 
+		mDraggingDirection.set(F32(0), F32(-1));
 	}
 	else if (name == "up")
 	{
-		 mDraggingDirection.set(F32(0), F32(1)); 
+		mDraggingDirection.set(F32(0), F32(1));
 	}
 }
 
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
index 9d0abc7a3a..b512f2a79c 100644
--- a/indra/newview/llnavigationbar.h
+++ b/indra/newview/llnavigationbar.h
@@ -44,46 +44,41 @@ class LLSearchComboBox;
 /**
  * This button is able to handle click-dragging mouse event.
  * It has appropriated signal for this event.
- * Dragging direction can be set from xml by attribute called 'direction'
+ * Dragging direction can be set from xml attribute called 'direction'
  * 
  * *TODO: move to llui?  
  */
 
-class LLPullButton : public LLButton
+class LLPullButton: public LLButton
 {
 	LOG_CLASS(LLPullButton);
-	
+
 public:
-	
-	struct Params : public LLInitParam::Block<Params, LLButton::Params>
+	struct Params: public LLInitParam::Block<Params, LLButton::Params>
 	{
-		Optional<std::string>	direction; // left, right, down, up
-		
-		Params()
-		:	direction("direction","down")
-		{}
+		Optional<std::string> direction; // left, right, down, up
+
+		Params() 
+		:	direction("direction", "down")
+		{
+		}
 	};
 	
 	/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-	
+
 	/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
-	
+
 	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
 
-	boost::signals2::connection setClickDraggingCallback( const commit_signal_t::slot_type& cb );
-	
-	/* virtual*/ ~LLPullButton()
-	{
-		delete mClickDraggingSignal;
-	}
-	
+	boost::signals2::connection setClickDraggingCallback(const commit_signal_t::slot_type& cb);
+
 protected:
 	friend class LLUICtrlFactory;
 	// convert string name into direction vector
 	void setDirectionFromName(const std::string& name);
 	LLPullButton(const LLPullButton::Params& params);
-	
-	commit_signal_t* mClickDraggingSignal;	
+
+	commit_signal_t mClickDraggingSignal;
 	LLVector2 mLastMouseDown;
 	LLVector2 mDraggingDirection;
 };
-- 
cgit v1.2.3


From 8693cf51e5f1645bcb99310700eb530cff5a0373 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Thu, 4 Feb 2010 16:04:28 +0200
Subject: fixed critical bug	 EXT-4887   	 The Label, \"Favorites Bar\"
 should only appear if you have no favorites Changes: Check for empty favbar
 has been added to change visibility of favbar label

--HG--
branch : product-engine
---
 indra/newview/llfavoritesbar.cpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index a5b62439f4..90f6438980 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -34,7 +34,6 @@
 
 #include "llfavoritesbar.h"
 
-#include "llbutton.h"
 #include "llfloaterreg.h"
 #include "llfocusmgr.h"
 #include "llinventory.h"
@@ -48,7 +47,6 @@
 #include "llclipboard.h"
 #include "llinventoryclipboard.h"
 #include "llinventorybridge.h"
-#include "llinventorymodel.h"
 #include "llfloaterworldmap.h"
 #include "lllandmarkactions.h"
 #include "llnotificationsutil.h"
@@ -674,7 +672,14 @@ void LLFavoritesBarCtrl::updateButtons()
 	{
 		return;
 	}
-
+	if(mItems.empty())
+	{
+		mBarLabel->setVisible(TRUE);
+	}
+	else
+	{
+		mBarLabel->setVisible(FALSE);
+	}
 	const child_list_t* childs = getChildList();
 	child_list_const_iter_t child_it = childs->begin();
 	int first_changed_item_index = 0;
@@ -720,14 +725,22 @@ void LLFavoritesBarCtrl::updateButtons()
 			}
 		}
 		// we have to remove ChevronButton to make sure that the last item will be LandmarkButton to get the right aligning
+		// keep in mind that we are cutting all buttons in space between the last visible child of favbar and ChevronButton
 		if (mChevronButton->getParent() == this)
 		{
 			removeChild(mChevronButton);
 		}
 		int last_right_edge = 0;
+		//calculate new buttons offset
 		if (getChildList()->size() > 0)
 		{
-			last_right_edge = getChildList()->back()->getRect().mRight;
+			//find last visible child to get the rightest button offset
+			child_list_const_reverse_iter_t last_visible_it = std::find_if(childs->rbegin(), childs->rend(), 
+					std::mem_fun(&LLView::getVisible));
+			if(last_visible_it != childs->rend())
+			{
+				last_right_edge = (*last_visible_it)->getRect().mRight;
+			}
 		}
 		//last_right_edge is saving coordinates
 		LLButton* last_new_button = NULL;
-- 
cgit v1.2.3


From 7453aae13e01bd0b055fed8056de8889e878942e Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Feb 2010 15:16:14 +0200
Subject: Fixed normal bug EXT-4862 - Nearby Chat pop-up toasts close
 affordance displays under prior toasts. Implemented same fix for notification
 toasts.

--HG--
branch : product-engine
---
 indra/newview/llnearbychathandler.cpp | 7 +++++++
 indra/newview/llscreenchannel.cpp     | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index c08ca30bab..be48770567 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -274,6 +274,13 @@ void LLNearbyChatScreenChannel::showToastsBottom()
 			toast->setRect(toast_rect);
 			toast->setIsHidden(false);
 			toast->setVisible(TRUE);
+
+			if(!toast->hasFocus())
+			{
+				// Fixing Z-order of toasts (EXT-4862)
+				// Next toast will be positioned under this one.
+				gFloaterView->sendChildToBack(toast);
+			}
 			
 			bottom = toast->getRect().mTop;
 		}		
diff --git a/indra/newview/llscreenchannel.cpp b/indra/newview/llscreenchannel.cpp
index 8f36c0e88a..7c2e7e3319 100644
--- a/indra/newview/llscreenchannel.cpp
+++ b/indra/newview/llscreenchannel.cpp
@@ -533,9 +533,13 @@ void LLScreenChannel::showToastsBottom()
 			// HACK
 			// EXT-2653: it is necessary to prevent overlapping for secondary showed toasts
 			(*it).toast->setVisible(TRUE);
-			// Show toast behind floaters. (EXT-3089)
-			gFloaterView->sendChildToBack((*it).toast);
 		}		
+		if(!(*it).toast->hasFocus())
+		{
+			// Fixing Z-order of toasts (EXT-4862)
+			// Next toast will be positioned under this one.
+			gFloaterView->sendChildToBack((*it).toast);
+		}
 	}
 
 	if(it != mToastList.rend())
-- 
cgit v1.2.3


From 36a44ba0e9133e78cc66f7d0b65d0890cfeb3db5 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Thu, 4 Feb 2010 15:37:25 +0200
Subject: fix for normal EXT-1888 Apply button remains active after Applying
 changes

--HG--
branch : product-engine
---
 indra/newview/llfloaterpreference.cpp              | 100 +++++++++++++++++++++
 indra/newview/llfloaterpreference.h                |  16 ++++
 .../skins/default/xui/en/floater_preferences.xml   |   2 +-
 3 files changed, 117 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index ef444c8ba4..9d9fbacee3 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -571,6 +571,16 @@ void LLFloaterPreference::setHardwareDefaults()
 {
 	LLFeatureManager::getInstance()->applyRecommendedSettings();
 	refreshEnabledGraphics();
+	LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
+	child_list_t::const_iterator iter = tabcontainer->getChildList()->begin();
+	child_list_t::const_iterator end = tabcontainer->getChildList()->end();
+	for ( ; iter != end; ++iter)
+	{
+		LLView* view = *iter;
+		LLPanelPreference* panel = dynamic_cast<LLPanelPreference*>(view);
+		if (panel)
+			panel->setHardwareDefaults();
+	}
 }
 
 //virtual
@@ -1525,3 +1535,93 @@ void LLPanelPreference::setControlFalse(const LLSD& user_data)
 	if (control)
 		control->set(LLSD(FALSE));
 }
+
+static LLRegisterPanelClassWrapper<LLPanelPreferenceGraphics> t_pref_graph("panel_preference_graphics");
+
+BOOL LLPanelPreferenceGraphics::postBuild()
+{
+	return LLPanelPreference::postBuild();
+}
+void LLPanelPreferenceGraphics::draw()
+{
+	LLPanelPreference::draw();
+	
+	LLButton* button_apply = findChild<LLButton>("Apply");
+	
+	if(button_apply && button_apply->getVisible())
+	{
+		bool enable = hasDirtyChilds();
+
+		button_apply->setEnabled(enable);
+
+	}
+}
+bool LLPanelPreferenceGraphics::hasDirtyChilds()
+{
+	std::list<LLView*> view_stack;
+	view_stack.push_back(this);
+	while(!view_stack.empty())
+	{
+		// Process view on top of the stack
+		LLView* curview = view_stack.front();
+		view_stack.pop_front();
+
+		LLUICtrl* ctrl = dynamic_cast<LLUICtrl*>(curview);
+		if (ctrl)
+		{
+			if(ctrl->isDirty())
+				return true;
+		}
+		// Push children onto the end of the work stack
+		for (child_list_t::const_iterator iter = curview->getChildList()->begin();
+			 iter != curview->getChildList()->end(); ++iter)
+		{
+			view_stack.push_back(*iter);
+		}
+	}	
+	return false;
+}
+
+void LLPanelPreferenceGraphics::resetDirtyChilds()
+{
+	std::list<LLView*> view_stack;
+	view_stack.push_back(this);
+	while(!view_stack.empty())
+	{
+		// Process view on top of the stack
+		LLView* curview = view_stack.front();
+		view_stack.pop_front();
+
+		LLUICtrl* ctrl = dynamic_cast<LLUICtrl*>(curview);
+		if (ctrl)
+		{
+			ctrl->resetDirty();
+		}
+		// Push children onto the end of the work stack
+		for (child_list_t::const_iterator iter = curview->getChildList()->begin();
+			 iter != curview->getChildList()->end(); ++iter)
+		{
+			view_stack.push_back(*iter);
+		}
+	}	
+}
+void LLPanelPreferenceGraphics::apply()
+{
+	resetDirtyChilds();
+	LLPanelPreference::apply();
+}
+void LLPanelPreferenceGraphics::cancel()
+{
+	resetDirtyChilds();
+	LLPanelPreference::cancel();
+}
+void LLPanelPreferenceGraphics::saveSettings()
+{
+	resetDirtyChilds();
+	LLPanelPreference::saveSettings();
+}
+void LLPanelPreferenceGraphics::setHardwareDefaults()
+{
+	resetDirtyChilds();
+	LLPanelPreference::setHardwareDefaults();
+}
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 8778d76a5a..0827c7c2b2 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -161,6 +161,7 @@ public:
 	virtual void apply();
 	virtual void cancel();
 	void setControlFalse(const LLSD& user_data);
+	virtual void setHardwareDefaults(){};
 
 	// This function squirrels away the current values of the controls so that
 	// cancel() can restore them.
@@ -177,4 +178,19 @@ private:
 	string_color_map_t mSavedColors;
 };
 
+class LLPanelPreferenceGraphics : public LLPanelPreference
+{
+public:
+	BOOL postBuild();
+	void draw();
+	void apply();
+	void cancel();
+	void saveSettings();
+	void setHardwareDefaults();
+protected:
+	bool hasDirtyChilds();
+	void resetDirtyChilds();
+	
+};
+
 #endif  // LL_LLPREFERENCEFLOATER_H
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 15655a920e..05deca705a 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -56,7 +56,7 @@
          help_topic="preferences_general_tab"
          name="general" />
         <panel
-	 class="panel_preference"
+	 class="panel_preference_graphics"
          filename="panel_preferences_graphics1.xml"
          label="Graphics"
          layout="topleft"
-- 
cgit v1.2.3


From 79bcb8dc723d093e92bb5897e42c48e26b0bbf4e Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Feb 2010 15:44:45 +0200
Subject: Fixed low bug EXT-4951 - Redundant edit box context menu in list
 items in Panel Picks/Classifieds

--HG--
branch : product-engine
---
 indra/llui/lltexteditor.cpp                                 | 5 ++++-
 indra/newview/skins/default/xui/en/panel_pick_list_item.xml | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 62aeb50011..3fdb48b3ca 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -720,7 +720,10 @@ BOOL LLTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask)
 	}
 	if (!LLTextBase::handleRightMouseDown(x, y, mask))
 	{
-		showContextMenu(x, y);
+		if(getMouseOpaque())
+		{
+			showContextMenu(x, y);
+		}
 	}
 	return TRUE;
 }
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 023b1fc81d..e62c1278f9 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="picture_descr"
+     textbox.mouse_opaque="false" 
      top_pad="0"
      width="178"
      word_wrap="true" />
-- 
cgit v1.2.3


From a7141017afb8b13fe9d4758dfe502cc28966310f Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 4 Feb 2010 16:27:22 +0200
Subject: =?UTF-8?q?fixed=20EXT-4905=20=E2=80=9CDuplicated=20text=20in=20te?=
 =?UTF-8?q?leport=20notification=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5d78cfc9ef..d16474873f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1532,7 +1532,7 @@ Your search terms were too short so no search was performed.
    icon="alertmodal.tga"
    name="CouldNotTeleportReason"
    type="alertmodal">
-Could not teleport.
+Teleport failed.
 [REASON]
   </notification>
 
-- 
cgit v1.2.3


From b1891e2982cc03ccd695eae82989d3e58695616c Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 4 Feb 2010 16:43:59 +0200
Subject: Fixed normal bug EXT-4925 (Please make user voice settings compatible
 with 1.23) - for now volume level is stored in external (vivox) format [0.0 -
 1.0] - this fix should be included into the Beta 2 release

--HG--
branch : product-engine
---
 indra/newview/llvoiceclient.cpp | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index b6e7e73b9d..f3bfc2e86c 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -1107,16 +1107,17 @@ public:
 	 * Sets internal voluem level for specified user.
 	 *
 	 * @param[in] speaker_id - LLUUID of user to store volume level for
-	 * @param[in] volume - internal volume level to be stored for user.
+	 * @param[in] volume - external (vivox) volume level to be stored for user.
 	 */
-	void storeSpeakerVolume(const LLUUID& speaker_id, S32 volume);
+	void storeSpeakerVolume(const LLUUID& speaker_id, F32 volume);
 
 	/**
-	 * Gets stored internal volume level for specified speaker.
+	 * Gets stored external (vivox) volume level for specified speaker and
+	 * transforms it into internal (viewer) level.
 	 *
 	 * If specified user is not found default level will be returned. It is equivalent of 
 	 * external level 0.5 from the 0.0..1.0 range.
-	 * Default internal level is calculated as: internal = 400 * external^2
+	 * Internal level is calculated as: internal = 400 * external^2
 	 * Maps 0.0 to 1.0 to internal values 0-400 with default 0.5 == 100
 	 *
 	 * @param[in] speaker_id - LLUUID of user to get his volume level
@@ -1133,7 +1134,7 @@ private:
 	void load();
 	void save();
 
-	typedef std::map<LLUUID, S32> speaker_data_map_t;
+	typedef std::map<LLUUID, F32> speaker_data_map_t;
 	speaker_data_map_t mSpeakersData;
 };
 
@@ -1149,7 +1150,7 @@ LLSpeakerVolumeStorage::~LLSpeakerVolumeStorage()
 	save();
 }
 
-void LLSpeakerVolumeStorage::storeSpeakerVolume(const LLUUID& speaker_id, S32 volume)
+void LLSpeakerVolumeStorage::storeSpeakerVolume(const LLUUID& speaker_id, F32 volume)
 {
 	mSpeakersData[speaker_id] = volume;
 }
@@ -1163,7 +1164,10 @@ S32 LLSpeakerVolumeStorage::getSpeakerVolume(const LLUUID& speaker_id)
 	
 	if (it != mSpeakersData.end())
 	{
-		ret_val = it->second;
+		F32 f_val = it->second;
+		// volume can amplify by as much as 4x!
+		S32 ivol = (S32)(400.f * f_val * f_val);
+		ret_val = llclamp(ivol, 0, 400);
 	}
 	return ret_val;
 }
@@ -1184,7 +1188,7 @@ void LLSpeakerVolumeStorage::load()
 	for (LLSD::map_const_iterator iter = settings_llsd.beginMap();
 		iter != settings_llsd.endMap(); ++iter)
 	{
-		mSpeakersData.insert(std::make_pair(LLUUID(iter->first), (S32)iter->second.asInteger()));
+		mSpeakersData.insert(std::make_pair(LLUUID(iter->first), (F32)iter->second.asReal()));
 	}
 }
 
@@ -6288,14 +6292,14 @@ void LLVoiceClient::setUserVolume(const LLUUID& id, F32 volume)
 		participantState *participant = findParticipantByID(id);
 		if (participant)
 		{
+			// store this volume setting for future sessions
+			LLSpeakerVolumeStorage::getInstance()->storeSpeakerVolume(id, volume);
+
 			// volume can amplify by as much as 4x!
 			S32 ivol = (S32)(400.f * volume * volume);
 			participant->mUserVolume = llclamp(ivol, 0, 400);
 			participant->mVolumeDirty = TRUE;
 			mAudioSession->mVolumeDirty = TRUE;
-
-			// store this volume setting for future sessions
-			LLSpeakerVolumeStorage::getInstance()->storeSpeakerVolume(id, participant->mUserVolume);
 		}
 	}
 }
-- 
cgit v1.2.3


From 32aa9d7deee735d86c88f038f8f6fb7199432ff1 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 4 Feb 2010 16:46:34 +0200
Subject: fixed shout/whisper representation for EXT-4777 Implement saving and
 loading chat history for Nearby Chat (both plain text and widgeted chat)

--HG--
branch : product-engine
---
 indra/newview/llchathistory.cpp | 13 ++++++++++---
 indra/newview/llnearbychat.cpp  |  9 +--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 1dc0e8c0a7..f046e08827 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -585,9 +585,16 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
 	bool irc_me = prefix == "/me " || prefix == "/me'";
 
 	// Delimiter after a name in header copy/past and in plain text mode
-	std::string delimiter = (chat.mChatType != CHAT_TYPE_SHOUT && chat.mChatType != CHAT_TYPE_WHISPER)
-		? ": "
-		: " ";
+	std::string delimiter = ": ";
+	std::string shout = LLTrans::getString("shout");
+	std::string whisper = LLTrans::getString("whisper");
+	if (chat.mChatType == CHAT_TYPE_SHOUT || 
+		chat.mChatType == CHAT_TYPE_WHISPER ||
+		chat.mText.compare(0, shout.length(), shout) == 0 ||
+		chat.mText.compare(0, whisper.length(), whisper) == 0)
+	{
+		delimiter = " ";
+	}
 
 	// Don't add any delimiter after name in irc styled messages
 	if (irc_me || chat.mChatStyle == CHAT_STYLE_IRC)
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index 6de47fccd2..acb28bd46f 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -203,14 +203,7 @@ void	LLNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD &args)
 
 		if (gSavedPerAccountSettings.getBOOL("LogChat")) 
 		{
-			if (chat.mChatType != CHAT_TYPE_WHISPER && chat.mChatType != CHAT_TYPE_SHOUT)
-			{
-				LLLogChat::saveHistory("chat", chat.mFromName, chat.mFromID, chat.mText);
-			}
-			else
-			{
-				LLLogChat::saveHistory("chat", "", chat.mFromID, chat.mFromName + " " + chat.mText);
-			}
+			LLLogChat::saveHistory("chat", chat.mFromName, chat.mFromID, chat.mText);
 		}
 	}
 }
-- 
cgit v1.2.3


From 9a15ee8a91a12020b22625873c280837739f946c Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Thu, 4 Feb 2010 10:00:33 -0500
Subject: Removed aspect ratio controls.
 http://jira.secondlife.com/browse/EXT-3908

---
 .../default/xui/en/panel_preferences_advanced.xml  | 57 ----------------------
 1 file changed, 57 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 4d14d46743..05a3771edf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -266,61 +266,4 @@ Automatic position for:
           <button.commit_callback
           function="Pref.VoiceSetMiddleMouse" />
     </button>
-       <text
-     follows="left|top"
-     type="string"
-     length="1"
-     height="13"
-     layout="topleft"
-     left="30"
-     top_pad="8"
-     name="AspectRatioLabel1"
-     tool_tip="width / height"
-     label_width="50"
-     width="120">
-        Aspect ratio
-    </text>
-    <combo_box
-     allow_text_entry="true"
-     height="23"
-     follows="left|top"
-     layout="topleft"
-     left="80"
-     max_chars="100"
-     name="aspect_ratio"
-     tool_tip="width / height"
-     width="150">
-        <combo_box.item
-         enabled="true"
-         label=" 4:3 (Standard CRT)"
-         name="item1"
-         value="1.333333" />
-        <combo_box.item
-         enabled="true"
-         label=" 5:4 (1280x1024 LCD)"
-         name="item2"
-         value="1.25" />
-        <combo_box.item
-         enabled="true"
-         label=" 8:5 (Widescreen)"
-         name="item3"
-         value="1.6" />
-        <combo_box.item
-         enabled="true"
-         label=" 16:9 (Widescreen)"
-         name="item4"
-         value="1.7777777" />
-    </combo_box>
-    <check_box
-     control_name="FullScreenAutoDetectAspectRatio"
-     follows="left|top"
-     height="25"
-     label="Automatic"
-     layout="topleft"
-     left_pad="10"
-     name="aspect_auto_detect"
-     width="256">
-        <check_box.commit_callback
-         function="Pref.AutoDetectAspect" />
-    </check_box>
 </panel>
-- 
cgit v1.2.3


From e918089f592da2094e6b23a146e0e30b711562dc Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Thu, 4 Feb 2010 17:04:27 +0200
Subject: Fixed critical bug (EXT-4827) [NUX] The Places Panel should default
 to the Landmarks tab with the Library expanded. - Added Library tab set open
 by default with Landmarks category fetch from Library.

--HG--
branch : product-engine
---
 indra/newview/llpanellandmarks.cpp | 22 ++++++++++++++--------
 indra/newview/llpanellandmarks.h   |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 47feef496a..7c1b0f6234 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -171,8 +171,6 @@ BOOL LLLandmarksPanel::postBuild()
 	initLandmarksInventoryPanel();
 	initMyInventoryPanel();
 	initLibraryInventoryPanel();
-	getChild<LLAccordionCtrlTab>("tab_favorites")->setDisplayChildren(true);
-	getChild<LLAccordionCtrlTab>("tab_landmarks")->setDisplayChildren(true);
 
 	return TRUE;
 }
@@ -462,7 +460,7 @@ void LLLandmarksPanel::initFavoritesInventoryPanel()
 	initLandmarksPanel(mFavoritesInventoryPanel);
 	mFavoritesInventoryPanel->getFilter()->setEmptyLookupMessage("FavoritesNoMatchingItems");
 
-	initAccordion("tab_favorites", mFavoritesInventoryPanel);
+	initAccordion("tab_favorites", mFavoritesInventoryPanel, true);
 }
 
 void LLLandmarksPanel::initLandmarksInventoryPanel()
@@ -481,7 +479,7 @@ void LLLandmarksPanel::initLandmarksInventoryPanel()
 	// subscribe to have auto-rename functionality while creating New Folder
 	mLandmarksInventoryPanel->setSelectCallback(boost::bind(&LLInventoryPanel::onSelectionChange, mLandmarksInventoryPanel, _1, _2));
 
-	initAccordion("tab_landmarks", mLandmarksInventoryPanel);
+	initAccordion("tab_landmarks", mLandmarksInventoryPanel, true);
 }
 
 void LLLandmarksPanel::initMyInventoryPanel()
@@ -490,7 +488,7 @@ void LLLandmarksPanel::initMyInventoryPanel()
 
 	initLandmarksPanel(mMyInventoryPanel);
 
-	initAccordion("tab_inventory", mMyInventoryPanel);
+	initAccordion("tab_inventory", mMyInventoryPanel, false);
 }
 
 void LLLandmarksPanel::initLibraryInventoryPanel()
@@ -499,7 +497,15 @@ void LLLandmarksPanel::initLibraryInventoryPanel()
 
 	initLandmarksPanel(mLibraryInventoryPanel);
 
-	initAccordion("tab_library", mLibraryInventoryPanel);
+	// We want to fetch only "Landmarks" category from the library.
+	const LLUUID &landmarks_cat = gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK, false, true);
+	if (landmarks_cat.notNull())
+	{
+		gInventory.startBackgroundFetch(landmarks_cat);
+	}
+
+	// Expanding "Library" tab for new users who have no landmarks in "My Inventory".
+	initAccordion("tab_library", mLibraryInventoryPanel, true);
 }
 
 void LLLandmarksPanel::initLandmarksPanel(LLPlacesInventoryPanel* inventory_list)
@@ -526,14 +532,14 @@ void LLLandmarksPanel::initLandmarksPanel(LLPlacesInventoryPanel* inventory_list
 	inventory_list->saveFolderState();
 }
 
-void LLLandmarksPanel::initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list)
+void LLLandmarksPanel::initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list,	bool expand_tab)
 {
 	LLAccordionCtrlTab* accordion_tab = getChild<LLAccordionCtrlTab>(accordion_tab_name);
 
 	mAccordionTabs.push_back(accordion_tab);
 	accordion_tab->setDropDownStateChangedCallback(
 		boost::bind(&LLLandmarksPanel::onAccordionExpandedCollapsed, this, _2, inventory_list));
-	accordion_tab->setDisplayChildren(false);
+	accordion_tab->setDisplayChildren(expand_tab);
 }
 
 void LLLandmarksPanel::onAccordionExpandedCollapsed(const LLSD& param, LLPlacesInventoryPanel* inventory_list)
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index 96b790844c..cbbd10ac26 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -110,7 +110,7 @@ private:
 	void initMyInventoryPanel();
 	void initLibraryInventoryPanel();
 	void initLandmarksPanel(LLPlacesInventoryPanel* inventory_list);
-	void initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list);
+	void initAccordion(const std::string& accordion_tab_name, LLPlacesInventoryPanel* inventory_list, bool expand_tab);
 	void onAccordionExpandedCollapsed(const LLSD& param, LLPlacesInventoryPanel* inventory_list);
 	void deselectOtherThan(const LLPlacesInventoryPanel* inventory_list);
 
-- 
cgit v1.2.3


From 41c6155f13dbb9ed8bc136bc3350bc8fc87e7f56 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Thu, 4 Feb 2010 17:11:08 +0200
Subject: fix for normal EXT-3807 ABOUT LAND/OBJECTS: (i) icon is badly
 positioned

--HG--
branch : product-engine
---
 indra/newview/llnamelistctrl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 8c875c9b63..d579058c32 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -152,6 +152,7 @@ BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask)
 		if (avatar_id.notNull())
 		{
 			// ...valid avatar id
+
 			LLScrollListCell* hit_cell = hit_item->getColumn(column_index);
 			if (hit_cell)
 			{
@@ -162,8 +163,8 @@ BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask)
 				localRectToScreen(cell_rect, &sticky_rect);
 
 				// Spawn at right side of cell
-				LLCoordGL pos( sticky_rect.mRight - 16, sticky_rect.mTop + (sticky_rect.getHeight()-16)/2 );
 				LLPointer<LLUIImage> icon = LLUI::getUIImage("Info_Small");
+				LLCoordGL pos( sticky_rect.mRight - 16, sticky_rect.mTop - (sticky_rect.getHeight() - icon->getHeight())/2 );
 
 				// Should we show a group or an avatar inspector?
 				bool is_group = hit_item->getValue()["is_group"].asBoolean();
-- 
cgit v1.2.3


From d2d192060993d938a2fd131f8872a60b678e4a04 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 4 Feb 2010 10:20:31 -0500
Subject: For EXT-4855: Crash on onWearableAssetFetch.  Prevent late-arriving
 wearables from touching a deleted object.

---
 indra/newview/llappearancemgr.cpp | 47 +++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 585d42f66d..0fe236c056 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -321,7 +321,7 @@ public:
 	~LLWearableHoldingPattern();
 
 	bool pollCompletion();
-	bool isDone();
+	bool isFetchCompleted();
 	bool isTimedOut();
 	
 	typedef std::list<LLFoundData> found_list_t;
@@ -330,10 +330,12 @@ public:
 	LLInventoryModel::item_array_t mGestItems;
 	S32 mResolved;
 	LLTimer mWaitTime;
+	bool mFired;
 };
 
 LLWearableHoldingPattern::LLWearableHoldingPattern():
-	mResolved(0)
+	mResolved(0),
+	mFired(false)
 {
 }
 
@@ -341,31 +343,34 @@ LLWearableHoldingPattern::~LLWearableHoldingPattern()
 {
 }
 
-bool LLWearableHoldingPattern::isDone()
+bool LLWearableHoldingPattern::isFetchCompleted()
 {
-	if (mResolved >= (S32)mFoundList.size())
-		return true; // have everything we were waiting for
-	else if (isTimedOut())
-	{
-		llwarns << "Exceeded max wait time, updating appearance based on what has arrived" << llendl;
-		return true;
-	}
-	return false;
-
+	return (mResolved >= (S32)mFoundList.size()); // have everything we were waiting for?
 }
 
 bool LLWearableHoldingPattern::isTimedOut()
 {
-	static F32 max_wait_time = 15.0;  // give up if wearable fetches haven't completed in max_wait_time seconds.
+	static F32 max_wait_time = 20.0;  // give up if wearable fetches haven't completed in max_wait_time seconds.
 	return mWaitTime.getElapsedTimeF32() > max_wait_time; 
 }
 
 bool LLWearableHoldingPattern::pollCompletion()
 {
-	bool done = isDone();
-	llinfos << "polling, done status: " << done << " elapsed " << mWaitTime.getElapsedTimeF32() << llendl;
+	bool completed = isFetchCompleted();
+	bool timed_out = isTimedOut();
+	bool done = completed || timed_out;
+	
+	llinfos << "polling, done status: " << completed << " timed out? " << timed_out << " elapsed " << mWaitTime.getElapsedTimeF32() << llendl;
+
 	if (done)
 	{
+		mFired = true;
+		
+		if (timed_out)
+		{
+			llwarns << "Exceeded max wait time for wearables, updating appearance based on what has arrived" << llendl;
+		}
+
 		// Activate all gestures in this folder
 		if (mGestItems.count() > 0)
 		{
@@ -397,7 +402,11 @@ bool LLWearableHoldingPattern::pollCompletion()
 			LLAgentWearables::userUpdateAttachments(mObjItems);
 		}
 
-		delete this;
+		if (completed)
+		{
+			// Only safe to delete if all wearable callbacks completed.
+			delete this;
+		}
 	}
 	return done;
 }
@@ -432,7 +441,11 @@ static void removeDuplicateItems(LLInventoryModel::item_array_t& items)
 static void onWearableAssetFetch(LLWearable* wearable, void* data)
 {
 	LLWearableHoldingPattern* holder = (LLWearableHoldingPattern*)data;
-	
+	if (holder->mFired)
+	{
+		llwarns << "called after holder fired" << llendl;
+	}
+
 	if(wearable)
 	{
 		for (LLWearableHoldingPattern::found_list_t::iterator iter = holder->mFoundList.begin();
-- 
cgit v1.2.3


From f2bb59300a0f17e10857b3fffebe669878f0fe50 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 4 Feb 2010 17:26:44 +0200
Subject: fixed duplicating of log records for EXT-4777 Implement saving and
 loading chat history for Nearby Chat (both plain text and widgeted chat)

--HG--
branch : product-engine
---
 indra/newview/llnearbychat.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp
index acb28bd46f..8fc11d3929 100644
--- a/indra/newview/llnearbychat.cpp
+++ b/indra/newview/llnearbychat.cpp
@@ -200,11 +200,16 @@ void	LLNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD &args)
 		mMessageArchive.push_back(chat);
 		if(mMessageArchive.size()>200)
 			mMessageArchive.erase(mMessageArchive.begin());
+	}
 
-		if (gSavedPerAccountSettings.getBOOL("LogChat")) 
-		{
-			LLLogChat::saveHistory("chat", chat.mFromName, chat.mFromID, chat.mText);
-		}
+	if (args["do_not_log"].asBoolean()) 
+	{
+		return;
+	}
+
+	if (gSavedPerAccountSettings.getBOOL("LogChat")) 
+	{
+		LLLogChat::saveHistory("chat", chat.mFromName, chat.mFromID, chat.mText);
 	}
 }
 
@@ -275,6 +280,9 @@ void LLNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue)
 
 void LLNearbyChat::loadHistory()
 {
+	LLSD do_not_log;
+	do_not_log["do_not_log"] = true;
+
 	std::list<LLSD> history;
 	LLLogChat::loadAllHistory("chat", history);
 
@@ -295,7 +303,7 @@ void LLNearbyChat::loadHistory()
 		chat.mFromID = from_id;
 		chat.mText = msg[IM_TEXT].asString();
 		chat.mTimeStr = msg[IM_TIME].asString();
-		addMessage(chat);
+		addMessage(chat, true, do_not_log);
 
 		it++;
 	}
-- 
cgit v1.2.3


From c99fb12b3d300705dbf6eb68b1a3f22927d4d221 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Thu, 4 Feb 2010 17:25:30 +0200
Subject: Update for low bug EXT-4951 - Redundant edit box context menu in list
 items in Panel Picks/Classifieds Disabled edit box context menu in classified
 list items.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
index b881719e3a..0c1418fc2d 100644
--- a/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml
@@ -64,6 +64,7 @@
      layout="topleft"
      left="103"
      name="description"
+     textbox.mouse_opaque="false" 
      top_pad="0"
      width="178"
      word_wrap="true" />
-- 
cgit v1.2.3


From 78200e2c1c1bc2e53f694b2ae086f486a7f0095c Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Thu, 4 Feb 2010 19:10:24 +0200
Subject: =?UTF-8?q?fixed=20EXT-4893=20=E2=80=9C'Add=20friend'=20available?=
 =?UTF-8?q?=20for=20friends=20in=20group/conference=20sessions=E2=80=9D,?=
 =?UTF-8?q?=20corrected=20condition=20for=20enable=20'add=20friend'=20menu?=
 =?UTF-8?q?=20item;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : product-engine
---
 indra/newview/llparticipantlist.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index ad47e351ee..1c4004c37a 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -584,7 +584,7 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD&
 {
 	std::string item = userdata.asString();
 	if (item == "can_mute_text" || "can_block" == item || "can_share" == item || "can_im" == item 
-		|| "can_pay" == item || "can_add" == item)
+		|| "can_pay" == item)
 	{
 		return mUUIDs.front() != gAgentID;
 	}
@@ -619,7 +619,7 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD&
 
 		for (;id != uuids_end; ++id)
 		{
-			if ( LLAvatarActions::isFriend(*id) )
+			if ( *id == gAgentID || LLAvatarActions::isFriend(*id) )
 			{
 				result = false;
 				break;
-- 
cgit v1.2.3


From 3fa2acc0df76b3dd81e295a28bfb463f863a9e49 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Thu, 4 Feb 2010 19:21:12 +0200
Subject: Fixed bug EXT-4806 (Snapshot floater has preview offset). Removed
 incorrect vertical offset modification in compact mode.

--HG--
branch : product-engine
---
 indra/newview/llfloatersnapshot.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index b6e9fb3f6c..a0031f0193 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -2084,10 +2084,6 @@ void LLFloaterSnapshot::draw()
 
 			S32 offset_x = (getRect().getWidth() - previewp->getThumbnailWidth()) / 2 ;
 			S32 offset_y = thumbnail_rect.mBottom + (thumbnail_rect.getHeight() - previewp->getThumbnailHeight()) / 2 ;
-			if (! gSavedSettings.getBOOL("AdvanceSnapshot"))
-			{
-				offset_y += getUIWinHeightShort() - getUIWinHeightLong();
-			}
 
 			glMatrixMode(GL_MODELVIEW);
 			gl_draw_scaled_image(offset_x, offset_y, 
-- 
cgit v1.2.3


From 1bc67a9d725b88a0ebdde77cef928abd33fa9cf6 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Thu, 4 Feb 2010 10:25:31 -0800
Subject: EXT-4625 - Chat bar doesn't display trailing character on some
 strings

reviewed by Leyla
---
 indra/llrender/llfontgl.cpp | 24 ++++++++++++++++++++----
 indra/llui/lllineeditor.cpp |  6 +++++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 1de1d6ded4..b6a6b448ee 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -601,14 +601,20 @@ S32	LLFontGL::firstDrawableChar(const llwchar* wchars, F32 max_pixels, S32 text_
 	{
 		llwchar wch = wchars[i];
 
-		F32 char_width = mFontFreetype->getXAdvance(wch);
+		const LLFontGlyphInfo* fgi= mFontFreetype->getGlyphInfo(wch);
+
+		// last character uses character width, since the whole character needs to be visible
+		// other characters just use advance
+		F32 width = (i == start) 
+			? (F32)(fgi->mWidth + fgi->mXBearing)  	// use actual width for last character
+			: fgi->mXAdvance;						// use advance for all other characters										
 
-		if( scaled_max_pixels < (total_width + char_width) )
+		if( scaled_max_pixels < (total_width + width) )
 		{
 			break;
 		}
 
-		total_width += char_width;
+		total_width += width;
 		drawable_chars++;
 
 		if( max_chars >= 0 && drawable_chars >= max_chars )
@@ -626,7 +632,17 @@ S32	LLFontGL::firstDrawableChar(const llwchar* wchars, F32 max_pixels, S32 text_
 		total_width = llround(total_width);
 	}
 
-	return start_pos - drawable_chars;
+	if (drawable_chars == 0)
+	{
+		return start_pos; // just draw last character
+	}
+	else
+	{
+		// if only 1 character is drawable, we want to return start_pos as the first character to draw
+		// if 2 are drawable, return start_pos and character before start_pos, etc.
+		return start_pos + 1 - drawable_chars;
+	}
+	
 }
 
 S32 LLFontGL::charFromPixelOffset(const llwchar* wchars, S32 begin_offset, F32 target_x, F32 max_pixels, S32 max_chars, BOOL round) const
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index cb5aea272d..2cdcd3345e 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -422,12 +422,16 @@ void LLLineEditor::setCursor( S32 pos )
 	S32 old_cursor_pos = getCursor();
 	mCursorPos = llclamp( pos, 0, mText.length());
 
+	// position of end of next character after cursor
 	S32 pixels_after_scroll = findPixelNearestPos();
 	if( pixels_after_scroll > mTextRightEdge )
 	{
 		S32 width_chars_to_left = mGLFont->getWidth(mText.getWString().c_str(), 0, mScrollHPos);
 		S32 last_visible_char = mGLFont->maxDrawableChars(mText.getWString().c_str(), llmax(0.f, (F32)(mTextRightEdge - mTextLeftEdge + width_chars_to_left))); 
-		S32 min_scroll = mGLFont->firstDrawableChar(mText.getWString().c_str(), (F32)(mTextRightEdge - mTextLeftEdge), mText.length(), getCursor());
+		// character immediately to left of cursor should be last one visible (SCROLL_INCREMENT_ADD will scroll in more characters)
+		// or first character if cursor is at beginning
+		S32 new_last_visible_char = llmax(0, getCursor() - 1);
+		S32 min_scroll = mGLFont->firstDrawableChar(mText.getWString().c_str(), (F32)(mTextRightEdge - mTextLeftEdge), mText.length(), new_last_visible_char);
 		if (old_cursor_pos == last_visible_char)
 		{
 			mScrollHPos = llmin(mText.length(), llmax(min_scroll, mScrollHPos + SCROLL_INCREMENT_ADD));
-- 
cgit v1.2.3