From db3c5d214addc8fe93f3b662fccb1354ef12e01b Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Tue, 16 Feb 2010 19:08:18 +0200
Subject: fixed Normal bug EXT-5380 'Place Profile' side panel opens instead
 'Search' floater after not-recognized SLURL was entered in Location Field
 Changes:Viewer will try to open search browser, if slurl has invalid region
 name

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

(limited to 'indra/newview')

diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index 0b6bd4b401..257afabdcc 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -223,6 +223,17 @@ void LLURLDispatcherImpl::regionNameCallback(U64 region_handle, const std::strin
 	S32 z = 0;
 	LLURLSimString::parse(sim_string, &region_name, &x, &y, &z);
 
+	// Invalid location? EXT-5380
+	if (!region_handle)
+	{
+		if(!region_name.empty() && !LLStringOps::isDigit(region_name.c_str()[0]))// it is no sense to search an empty region_name or when the  region_name  starts with digits
+		{
+			// may be an user types incorrect region name, let's help him to find a correct one 
+			LLFloaterReg::showInstance("search", LLSD().with("category", "places").with("id", LLSD(region_name)));
+		}
+		//*TODO: add notification about invalid region_name 
+		return;
+	}
 	LLVector3 local_pos;
 	local_pos.mV[VX] = (F32)x;
 	local_pos.mV[VY] = (F32)y;
-- 
cgit v1.2.3


From 76997db038057f6b18fff6e8721866159f89e958 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 16 Feb 2010 19:42:42 +0200
Subject: Fixed low priority bug EXT-5338 (Double quotes are used in text for
 'up/down' tooltips and not used for others them of 'Fly mode' controls).

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

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 0bdcbf30df..851a689d42 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -83,7 +83,7 @@
          left="10"
          name="move up btn"
          scale_image="false"
-         tool_tip="Fly up, press &quot;E&quot;"
+         tool_tip="Fly up, press E"
          top="14"
          width="25" />
         <button
@@ -96,7 +96,7 @@
          left_pad="45"
          name="move down btn"
          scale_image="false"
-         tool_tip="Fly down, press &quot;C&quot;"
+         tool_tip="Fly down, press C"
          top_delta="0"
          width="20" />
         <joystick_turn
-- 
cgit v1.2.3


From cf4da7e2238f2ee3d31928b9f598cbedee644876 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 16 Feb 2010 19:48:02 +0200
Subject: Fixed build.

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

(limited to 'indra/newview')

diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 888ddbcbc7..e21587a934 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -238,7 +238,7 @@ LLFolderView::LLFolderView(const Params& p)
 	LLRect new_r = LLRect(rect.mLeft + ICON_PAD,
 						  rect.mTop - TEXT_PAD,
 						  rect.mRight,
-						  rect.mTop - TEXT_PAD - font->getLineHeight());
+						  rect.mTop - TEXT_PAD - (S32)font->getLineHeight());
 	text_p.rect(new_r);
 	text_p.name(std::string(p.name));
 	text_p.font(font);
-- 
cgit v1.2.3


From cc8a0e0a9fbfc9069f8b090616369fa8cde0e895 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 16 Feb 2010 20:03:55 +0200
Subject: Added Share to avatar mini-inspector overflow menu (EXT-5151).

--HG--
branch : product-engine
---
 indra/newview/llinspectavatar.cpp                               | 8 ++++++++
 indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml | 6 ++++++
 2 files changed, 14 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index b2cdc0738f..83b99f1b27 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -120,6 +120,7 @@ private:
 	void onClickTeleport();
 	void onClickInviteToGroup();
 	void onClickPay();
+	void onClickShare();
 	void onToggleMute();
 	void onClickReport();
 	void onClickFreeze();
@@ -213,6 +214,7 @@ LLInspectAvatar::LLInspectAvatar(const LLSD& sd)
 	mCommitCallbackRegistrar.add("InspectAvatar.Teleport",	boost::bind(&LLInspectAvatar::onClickTeleport, this));	
 	mCommitCallbackRegistrar.add("InspectAvatar.InviteToGroup",	boost::bind(&LLInspectAvatar::onClickInviteToGroup, this));	
 	mCommitCallbackRegistrar.add("InspectAvatar.Pay",	boost::bind(&LLInspectAvatar::onClickPay, this));	
+	mCommitCallbackRegistrar.add("InspectAvatar.Share",	boost::bind(&LLInspectAvatar::onClickShare, this));
 	mCommitCallbackRegistrar.add("InspectAvatar.ToggleMute",	boost::bind(&LLInspectAvatar::onToggleMute, this));	
 	mCommitCallbackRegistrar.add("InspectAvatar.Freeze",
 		boost::bind(&LLInspectAvatar::onClickFreeze, this));	
@@ -678,6 +680,12 @@ void LLInspectAvatar::onClickPay()
 	closeFloater();
 }
 
+void LLInspectAvatar::onClickShare()
+{
+	LLAvatarActions::share(mAvatarID);
+	closeFloater();
+}
+
 void LLInspectAvatar::onToggleMute()
 {
 	LLMute mute(mAvatarID, mAvatarName, LLMute::AGENT);
diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
index 85ec174829..1b002b1c32 100644
--- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
+++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml
@@ -116,4 +116,10 @@
     <menu_item_call.on_click
      function="InspectAvatar.Pay"/>
   </menu_item_call>
+  <menu_item_call
+   label="Share"
+   name="share">
+    <menu_item_call.on_click
+     function="InspectAvatar.Share"/>
+  </menu_item_call>
 </menu>
-- 
cgit v1.2.3


From a0cab8fde8f9cfe8dacf8e8f7b40f28e76774526 Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 16 Feb 2010 21:17:20 +0200
Subject: Fixed low priority bug EXT-5425 (Undocked 'Movement Controls' floater
 became docked after opening from 'World' top menu).

--HG--
branch : product-engine
---
 indra/newview/llbottomtray.cpp                     | 12 ++++++++++++
 indra/newview/llbottomtray.h                       |  3 +++
 indra/newview/llviewermenu.cpp                     | 22 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  6 ++----
 4 files changed, 39 insertions(+), 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp
index 2958565fdf..48c0ec61d8 100644
--- a/indra/newview/llbottomtray.cpp
+++ b/indra/newview/llbottomtray.cpp
@@ -421,6 +421,18 @@ void LLBottomTray::showSnapshotButton(BOOL visible)
 	setTrayButtonVisibleIfPossible(RS_BUTTON_SNAPSHOT, visible);
 }
 
+void LLBottomTray::toggleMovementControls()
+{
+	if (mMovementButton)
+		mMovementButton->onCommit();
+}
+
+void LLBottomTray::toggleCameraControls()
+{
+	if (mCamButton)
+		mCamButton->onCommit();
+}
+
 BOOL LLBottomTray::postBuild()
 {
 
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 2eeb0c0017..18c14e5e19 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -94,6 +94,9 @@ public:
 	void showCameraButton(BOOL visible);
 	void showSnapshotButton(BOOL visible);
 
+	void toggleMovementControls();
+	void toggleCameraControls();
+
 	void onMouselookModeIn();
 	void onMouselookModeOut();
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 24a788aaed..989cfae464 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -44,6 +44,7 @@
 #include "llagent.h"
 #include "llagentwearables.h"
 #include "llagentpilot.h"
+#include "llbottomtray.h"
 #include "llcompilequeue.h"
 #include "llconsole.h"
 #include "lldebugview.h"
@@ -7631,6 +7632,24 @@ class LLWorldDayCycle : public view_listener_t
 	}
 };
 
+class LLWorldToggleMovementControls : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		LLBottomTray::getInstance()->toggleMovementControls();
+		return true;
+	}
+};
+
+class LLWorldToggleCameraControls : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		LLBottomTray::getInstance()->toggleCameraControls();
+		return true;
+	}
+};
+
 void show_navbar_context_menu(LLView* ctrl, S32 x, S32 y)
 {
 	static LLMenuGL*	show_navbar_context_menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_hide_navbar.xml",
@@ -7750,6 +7769,9 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess");
 	view_listener_t::addMenu(new LLWorldDayCycle(), "World.DayCycle");
 
+	view_listener_t::addMenu(new LLWorldToggleMovementControls(), "World.Toggle.MovementControls");
+	view_listener_t::addMenu(new LLWorldToggleCameraControls(), "World.Toggle.CameraControls");
+
 	// Tools menu
 	view_listener_t::addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
 	view_listener_t::addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 07a366da7f..e11b18ec31 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -311,8 +311,7 @@
              function="Floater.Visible"
              parameter="moveview" />
             <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="moveview" />
+             function="World.Toggle.MovementControls" />
         </menu_item_check>
         <menu_item_check
          label="View Controls"
@@ -322,8 +321,7 @@
              function="Floater.Visible"
              parameter="camera" />
             <menu_item_check.on_click
-             function="Floater.Toggle"
-             parameter="camera" />
+             function="World.Toggle.CameraControls" />
         </menu_item_check>
           <menu_item_check
              label="Ban Lines"
-- 
cgit v1.2.3


From 09ffc1e0311bc143601b50cff6f65fe914e855bd Mon Sep 17 00:00:00 2001
From: Sergei Litovchuk <slitovchuk@productengine.com>
Date: Tue, 16 Feb 2010 23:50:28 +0200
Subject: Fixed low bug (EXT-5457) Old tooltip is shown for just renamed
 landmark. - Added setting new tooltips after inventory panel item renaming.

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

(limited to 'indra/newview')

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index ca9b942629..048ed10886 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -290,8 +290,12 @@ void LLInventoryPanel::modelChanged(U32 mask)
 				if(bridge)
 				{	// Clear the display name first, so it gets properly re-built during refresh()
 					bridge->clearDisplayName();
+
+					view_item->refresh();
+
+					// Set the new tooltip with the new display name.
+					view_item->setToolTip(bridge->getDisplayName());
 				}
-				view_item->refresh();
 			}
 		}
 
-- 
cgit v1.2.3


From a24eb0a4496471b59ae70074e8d44b078eacb347 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 16 Feb 2010 11:54:46 +0200
Subject: Fixed low bug EXT-5124 - Display buddy icons on online/offline alerts

--HG--
branch : product-engine
---
 indra/newview/llcallingcard.cpp                    | 15 ++++++--
 indra/newview/llnotificationtiphandler.cpp         | 45 +++++++++++++++++++++-
 .../newview/skins/default/xui/en/notifications.xml |  4 +-
 .../skins/default/xui/en/panel_online_status.xml   | 35 +++++++++++++++++
 4 files changed, 92 insertions(+), 7 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_online_status.xml

(limited to 'indra/newview')

diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index c3bda26aac..79a2631c31 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -682,17 +682,24 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 		}
 		BOOL notify = FALSE;
 		LLSD args;
+		LLSD payload;
 		for(S32 i = 0; i < count; ++i)
 		{
 			msg->getUUIDFast(_PREHASH_AgentBlock, _PREHASH_AgentID, agent_id, i);
+			payload["FROM_ID"] = agent_id;
 			info = getBuddyInfo(agent_id);
 			if(info)
 			{
 				setBuddyOnline(agent_id,online);
 				if(chat_notify)
 				{
-					notify = TRUE;
-					args["NAME_SLURL"] = LLSLURL::buildCommand("agent", agent_id, "about");
+					std::string first, last;
+					if(gCacheName->getName(agent_id, first, last))
+					{
+						notify = TRUE;
+						args["FIRST"] = first;
+						args["LAST"] = last;
+					}
 				}
 			}
 			else
@@ -719,13 +726,13 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 				notification =
 					LLNotificationsUtil::add("FriendOnline",
 											 args,
-											 LLSD().with("respond_on_mousedown", TRUE),
+											 payload.with("respond_on_mousedown", TRUE),
 											 boost::bind(&LLAvatarActions::startIM, agent_id));
 			}
 			else
 			{
 				notification =
-					LLNotificationsUtil::add("FriendOffline", args);
+					LLNotificationsUtil::add("FriendOffline", args, payload);
 			}
 
 			// If there's an open IM session with this agent, send a notification there too.
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp
index 83a2215ac6..c55c8d6221 100644
--- a/indra/newview/llnotificationtiphandler.cpp
+++ b/indra/newview/llnotificationtiphandler.cpp
@@ -43,6 +43,37 @@
 
 using namespace LLNotificationsUI;
 
+class LLOnalineStatusToast : public LLToastPanel
+{
+public:
+
+	struct Params
+	{
+		LLNotificationPtr	notification;
+		LLUUID				avatar_id;
+		std::string			message;
+
+		Params() {}
+	};
+
+	LLOnalineStatusToast(Params& p) : LLToastPanel(p.notification)
+	{
+		LLUICtrlFactory::getInstance()->buildPanel(this, "panel_online_status.xml");
+
+		childSetValue("avatar_icon", p.avatar_id);
+		childSetValue("message", p.message);
+
+		if (p.notification->getPayload().has("respond_on_mousedown") 
+			&& p.notification->getPayload()["respond_on_mousedown"] )
+		{
+			setMouseDownCallback(boost::bind(&LLNotification::respond, p.notification, 
+				p.notification->getResponseTemplate()));
+		}
+
+		// set line max count to 2 in case of a very long name
+		snapToMessageHeight(getChild<LLTextBox>("message"), 2);
+	}
+};
 
 //--------------------------------------------------------------------------
 LLTipHandler::LLTipHandler(e_notification_type type, const LLSD& id)
@@ -114,7 +145,19 @@ bool LLTipHandler::processNotification(const LLSD& notify)
 			LLHandlerUtil::spawnIMSession(name, from_id);
 		}
 
-		LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(notification);
+		LLToastPanel* notify_box = NULL;
+		if("FriendOffline" == notification->getName() || "FriendOnline" == notification->getName())
+		{
+			LLOnalineStatusToast::Params p;
+			p.notification = notification;
+			p.message = notification->getMessage();
+			p.avatar_id = notification->getPayload()["FROM_ID"];
+			notify_box = new LLOnalineStatusToast(p);
+		}
+		else
+		{
+			notify_box = new LLToastNotifyPanel(notification);
+		}
 
 		LLToast::Params p;
 		p.notif_id = notification->getID();
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9c6b18ef27..ef983dacfe 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4310,14 +4310,14 @@ Topic: [SUBJECT], Message: [MESSAGE]
    icon="notifytip.tga"
    name="FriendOnline"
    type="notifytip">
-[NAME_SLURL] is Online
+[FIRST] [LAST] is Online
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="FriendOffline"
    type="notifytip">
-[NAME_SLURL] is Offline
+[FIRST] [LAST] is Offline
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_online_status.xml b/indra/newview/skins/default/xui/en/panel_online_status.xml
new file mode 100644
index 0000000000..babe459231
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_online_status.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ height="152"
+ label="friend_online_status"
+ layout="topleft"
+ left="0"
+ name="friend_online_status"
+ top="0"
+ width="305">
+    <avatar_icon
+	 follows="top|left"
+	 height="18"
+	 image_name="Generic_Person"
+	 layout="topleft"
+	 left="3"
+	 mouse_opaque="false"
+	 name="avatar_icon"
+	 top="10"
+	 width="18" />
+    <text
+     font="SansSerifSmall"
+     follows="all"
+     height="137"
+     layout="topleft"
+     left_pad="5"
+     name="message"
+     text_color="white"
+     top="15"
+     use_ellipses="true"
+     value=""
+     width="285"
+     word_wrap="true"
+     max_length="350" />
+</panel>
\ No newline at end of file
-- 
cgit v1.2.3


From 09a509e0073a1daa5eadf1b5bf5bdef24080ab47 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Tue, 16 Feb 2010 16:27:11 +0200
Subject: Updated low bug EXT-5124 - Display buddy icons on online/offline
 alerts Made panel background invisible to make toast background visible.

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

(limited to 'indra/newview')

diff --git a/indra/newview/skins/default/xui/en/panel_online_status.xml b/indra/newview/skins/default/xui/en/panel_online_status.xml
index babe459231..14cb5fffee 100644
--- a/indra/newview/skins/default/xui/en/panel_online_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_online_status.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- background_visible="true"
+ background_visible="false"
  height="152"
  label="friend_online_status"
  layout="topleft"
-- 
cgit v1.2.3


From aeffc8a3de966832b748dbd98a27f48b3c5a4e3a Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Wed, 17 Feb 2010 12:00:20 +0200
Subject: =?UTF-8?q?fixed=20major=20EXT-5439=20=E2=80=9CIM=20window=20vanis?=
 =?UTF-8?q?hes=20when=20trying=20to=20drag=20notecard=20to=20IM=20chat=20b?=
 =?UTF-8?q?ar=20with=20second=20inventory=20window=20open=E2=80=9D,=20adde?=
 =?UTF-8?q?d=20LLFloaterInventory=20to=20global=20group=20of=20transient?=
 =?UTF-8?q?=20exception=20list(the=20same=20as=20for=20side=20tray);?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp
index e62e2c99a7..844f0ac509 100644
--- a/indra/newview/llfloaterinventory.cpp
+++ b/indra/newview/llfloaterinventory.cpp
@@ -41,6 +41,7 @@
 #include "llpanelmaininventory.h"
 #include "llresmgr.h"
 #include "llviewerfoldertype.h"
+#include "lltransientfloatermgr.h"
 
 ///----------------------------------------------------------------------------
 /// LLFloaterInventory
@@ -49,10 +50,12 @@
 LLFloaterInventory::LLFloaterInventory(const LLSD& key)
 	: LLFloater(key)
 {
+	LLTransientFloaterMgr::getInstance()->addControlView(this);
 }
 
 LLFloaterInventory::~LLFloaterInventory()
 {
+	LLTransientFloaterMgr::getInstance()->removeControlView(this);
 }
 
 BOOL LLFloaterInventory::postBuild()
-- 
cgit v1.2.3


From 03f7086bfcc2cb23c8210ee729d35842e6ace665 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 17 Feb 2010 17:27:20 +0000
Subject: EXT-4843 [NUX] Set default Preferences

'General' pane
---
 indra/newview/app_settings/settings.xml | 10 +++++-----
 indra/newview/llfloaterpreference.cpp   |  3 ++-
 indra/newview/llstartup.cpp             |  4 +++-
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 000c63d22c..a8f2ce651f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4,13 +4,13 @@
     <key>AFKTimeout</key>
     <map>
       <key>Comment</key>
-      <string>Time before automatically setting AFK (away from keyboard) mode (seconds)</string>
+      <string>Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <real>300.0</real>
+      <real>0</real>
     </map>
     <key>AdvanceSnapshot</key>
     <map>
@@ -4328,13 +4328,13 @@
     <key>LoginLocation</key>
     <map>
       <key>Comment</key>
-      <string>Login at same location you last logged out</string>
+      <string>Login location ('last', 'home')</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>last</string>
+      <string>home</string>
     </map>
     <key>LoginPage</key>
     <map>
@@ -5554,7 +5554,7 @@
 	<key>PreferredMaturity</key>
     <map>
       <key>Comment</key>
-      <string>Setting for the user's preferred maturity level.</string>
+      <string>Setting for the user's preferred maturity level (consts in indra_constants.h)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index f20ef76bed..6439a09562 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -514,7 +514,8 @@ void LLFloaterPreference::onOpen(const LLSD& key)
 	// if we have no agent, we can't let them choose anything
 	// if we have an agent, then we only let them choose if they have a choice
 	bool can_choose_maturity =
-		gAgent.getID().notNull() &&	(gAgent.isMature() || gAgent.isGodlike());
+		gAgent.getID().notNull() &&
+		(gAgent.isMature() || gAgent.isGodlike());
 	
 	LLComboBox* maturity_combo = getChild<LLComboBox>("maturity_desired_combobox");
 	
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 136989166f..cd8051a0a9 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2899,7 +2899,9 @@ bool process_login_success_response()
 	text = response["agent_region_access"].asString();
 	if (!text.empty())
 	{
-		int preferredMaturity = LLAgent::convertTextToMaturity(text[0]);
+		int preferredMaturity =
+			llmin(LLAgent::convertTextToMaturity(text[0]),
+			      gSavedSettings.getU32("PreferredMaturity"));
 		gSavedSettings.setU32("PreferredMaturity", preferredMaturity);
 	}
 	// During the AO transition, this flag will be true. Then the flag will
-- 
cgit v1.2.3


From f52dd5ef21c330996ec95cd06974d6771a173523 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 17 Feb 2010 17:30:41 +0000
Subject: EXT-4843 [NUX] Set default Preferences

'Privacy' pane
---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a8f2ce651f..96e09409bc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5360,7 +5360,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>PerAccountSettingsFile</key>
     <map>
-- 
cgit v1.2.3


From d82e509a3a5f25e208cb88a04e7723734e6018c8 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 17 Feb 2010 17:33:15 +0000
Subject: EXT-4843 [NUX] Set default Preferences

'Sound' pane
---
 indra/newview/app_settings/settings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 96e09409bc..ff010994b9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -197,7 +197,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1.0</real>
+      <real>0.5</real>
     </map>
     <key>AudioLevelMic</key>
     <map>
@@ -219,7 +219,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1.0</real>
+      <real>0.5</real>
     </map>
     <key>AudioLevelRolloff</key>
     <map>
@@ -241,7 +241,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1.0</real>
+      <real>0.5</real>
     </map>
     <key>AudioLevelUI</key>
     <map>
-- 
cgit v1.2.3


From 818a6038ebfd23beddb4d64ea8f730da6acf0b9a Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 17 Feb 2010 17:36:07 +0000
Subject: EXT-4843 [NUX] Set default Preferences

'Setup' pane
---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ff010994b9..277bae7da2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10114,7 +10114,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>UseFreezeFrame</key>
     <map>
-- 
cgit v1.2.3


From 087d4b7bc831ba3611c023fdc9feb37b0481b0d5 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 17 Feb 2010 17:44:49 +0000
Subject: fix casts.

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

(limited to 'indra/newview')

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index cd8051a0a9..fa07278cb9 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2899,8 +2899,8 @@ bool process_login_success_response()
 	text = response["agent_region_access"].asString();
 	if (!text.empty())
 	{
-		int preferredMaturity =
-			llmin(LLAgent::convertTextToMaturity(text[0]),
+		U32 preferredMaturity =
+			llmin((U32)LLAgent::convertTextToMaturity(text[0]),
 			      gSavedSettings.getU32("PreferredMaturity"));
 		gSavedSettings.setU32("PreferredMaturity", preferredMaturity);
 	}
-- 
cgit v1.2.3