From 299382b907da4cd7151e70d0a8b2cb6d274a10a3 Mon Sep 17 00:00:00 2001
From: Damian Zhaoying <damian.zhaoying@avataresargentinos.com.ar>
Date: Thu, 15 Nov 2012 22:13:17 -0300
Subject: [PATCH 01/14] Add Merchant Outbox text files

---
 .../xui/es/floater_merchant_outbox.xml        | 34 +++++++++++++++++++
 .../xui/es/floater_region_debug_console.xml   |  3 ++
 .../default/xui/es/panel_outbox_inventory.xml |  3 ++
 3 files changed, 40 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_region_debug_console.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_outbox_inventory.xml

diff --git a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
new file mode 100644
index 000000000..a0d5b5d31
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater name="floater_merchant_outbox" title="Buzón de Salida de Comerciante">
+	<string name="OutboxFolderCount0">Sin Carpetas</string>
+	<string name="OutboxFolderCount1">1 Carpeta</string>
+	<string name="OutboxFolderCountN">[NUM] Carpetas</string>
+	<string name="OutboxImporting">Enviando Carpetas...</string>
+	<string name="OutboxInitializing">Inicializando...</string>
+	<!--panel
+      name="panel_1 this panel killed xui names, for some reason"
+      follows="all"
+      layout="topleft"
+      left="0"
+      top="0"
+      label=""
+      height="440"
+      width="333"-->
+	<panel name="outbox_inventory_placeholder_panel">
+		<text name="outbox_inventory_placeholder_title">
+			Cargando...
+		</text>
+	</panel>
+	<panel name="panel_2">
+		<panel name="outbox_generic_drag_target">
+			<text name="text_1">
+				Arrastra los Ítems aquí para crear las carpetas
+			</text>
+		</panel>
+		<button label="Enviar al Mercado" tool_tip="Poner en el escaparate de mi Tienda en el Mercado" name="outbox_import_btn"/>
+	</panel>
+	<text name="import_progress_indicator" left="180">
+		Importación en progreso
+	</text>
+	<!--/panel-->
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_region_debug_console.xml b/indra/newview/skins/default/xui/es/floater_region_debug_console.xml
new file mode 100644
index 000000000..04b569bb0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_region_debug_console.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="region_debug_console" title="Depurador de la Región">
+</floater>
diff --git a/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml
new file mode 100644
index 000000000..63005efcb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_outbox_inventory.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<outbox_inventory_panel name="inventory_outbox" tool_tip="Arrastra y suelta aquí los ítems para prepararlos para la venta en el escaparate de tu Tienda">
+</outbox_inventory_panel>

From cfbc8a23f700f81a3625d55cc3e78ba6d2d315d3 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 2 Dec 2012 17:52:36 -0500
Subject: [PATCH 02/14] Transaction Notifications are now optionally Notify
 Tips for those who don't want them to collect at the top right of the screen,
 but still want a notification.

Debug setting LiruNoTransactionClutter has been added, and is toggled by checkbox in General preferences
This adds support for TransactionInfo message, to localize the server's transaction notifications.
Adds a notification called Payment, which unifies all three of v-d's Payment* notifications.

This is a fairly large change to view, keep in mind what was removed as it may just be in a slightly different order or position..
---
 indra/newview/app_settings/settings.xml       |  11 +
 indra/newview/llpanelgeneral.cpp              |  14 +
 indra/newview/llpanelgeneral.h                |   1 +
 indra/newview/llviewermessage.cpp             | 257 +++++++++++++++++-
 .../skins/default/xui/en-us/notifications.xml |   8 +
 .../xui/en-us/panel_preferences_general.xml   |   2 +
 .../skins/default/xui/en-us/strings.xml       |  20 +-
 scripts/messages/message_template.msg         |  26 ++
 8 files changed, 325 insertions(+), 14 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6bae8e6ed..915a147b2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -693,6 +693,17 @@
       <key>Value</key>
       <integer>0</integer>
 	</map>
+    <key>LiruNoTransactionClutter</key>
+    <map>
+      <key>Comment</key>
+	  <string>Use notifytips for transactions instead of notifys, this way they do not collect in the top right of the screen.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+	  <integer>0</integer>
+	</map>
     <key>LiruSensibleARC</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llpanelgeneral.cpp b/indra/newview/llpanelgeneral.cpp
index fbd323a09..a189d809a 100644
--- a/indra/newview/llpanelgeneral.cpp
+++ b/indra/newview/llpanelgeneral.cpp
@@ -72,6 +72,7 @@ BOOL LLPanelGeneral::postBuild()
 	childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
 	childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
 	childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
+	childSetValue("no_transaction_clutter_checkbox", gSavedSettings.getBOOL("LiruNoTransactionClutter"));
 
 	
 
@@ -111,6 +112,9 @@ BOOL LLPanelGeneral::postBuild()
 	childSetVisible("maturity_desired_combobox", can_choose);
 	childSetVisible("maturity_desired_textbox",	!can_choose);
 
+	childSetEnabled("no_transaction_clutter_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
+	childSetCommitCallback("notify_money_change_checkbox", &onClickCheckbox, this);
+
 	childSetAction("clear_settings", &onClickClearSettings, this);
 			
 	return TRUE;
@@ -147,6 +151,7 @@ void LLPanelGeneral::apply()
 	gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
 	gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
 	gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
+	gSavedSettings.setBOOL("LiruNoTransactionClutter", childGetValue("no_transaction_clutter_checkbox"));
 
 	
 	gSavedSettings.setF32("UIScaleFactor", childGetValue("ui_scale_slider").asReal());
@@ -163,6 +168,15 @@ void LLPanelGeneral::cancel()
 {
 }
 
+// static
+void LLPanelGeneral::onClickCheckbox(LLUICtrl* ctrl, void* data)
+{
+	LLPanelGeneral* self = (LLPanelGeneral*)data;
+	bool enabled = ctrl->getValue().asBoolean();
+	if(ctrl->getName() == "notify_money_change_checkbox")
+		self->childSetEnabled("no_transaction_clutter_checkbox", enabled);
+}
+
 // static
 void LLPanelGeneral::onClickClearSettings(void*)
 {
diff --git a/indra/newview/llpanelgeneral.h b/indra/newview/llpanelgeneral.h
index 1249ec8ca..48c44b15c 100644
--- a/indra/newview/llpanelgeneral.h
+++ b/indra/newview/llpanelgeneral.h
@@ -47,6 +47,7 @@ public:
 	void apply();
 	void cancel();
 
+	static void onClickCheckbox(LLUICtrl* ctrl, void* data);
 	static void onClickClearSettings(void*);
 	static void callbackResetAllSettings(const LLSD& notification, const LLSD& response);
 };
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e3a98c636..1bb0d72e2 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -212,6 +212,7 @@ extern BOOL gDebugClicks;
 // function prototypes
 bool check_offer_throttle(const std::string& from_name, bool check_only);
 void callbackCacheEstateOwnerName(const LLUUID& id, const std::string& full_name,  bool is_group);
+static void process_money_balance_reply_extended(LLMessageSystem* msg);
 
 //inventory offer throttle globals
 LLFrameTimer gThrottleTimer;
@@ -5704,20 +5705,20 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 		gStatusBar->setLandCredit(credit);
 		gStatusBar->setLandCommitted(committed);
 	}
-	static std::deque<LLUUID> recent;
-	if(!desc.empty() && gSavedSettings.getBOOL("NotifyMoneyChange")
-	   && (std::find(recent.rbegin(), recent.rend(), tid) == recent.rend()))
-	{
-		// Make the user confirm the transaction, since they might
-		// have missed something during an event.
-		// *TODO:translate
-		LLSD args;
-		args["MESSAGE"] = desc;
-		LLNotificationsUtil::add("SystemMessage", args);
 
-		// Also send notification to chat -- MC
-		LLChat chat(desc);
-		LLFloaterChat::addChat(desc);
+	if (desc.empty()
+		|| !gSavedSettings.getBOOL("NotifyMoneyChange"))
+	{
+		// ...nothing to display
+		return;
+	}
+
+	// Suppress duplicate messages about the same transaction
+	static std::deque<LLUUID> recent;
+	if (std::find(recent.rbegin(), recent.rend(), tid) != recent.rend())
+	{
+		return;
+	}
 
 		// Once the 'recent' container gets large enough, chop some
 		// off the beginning.
@@ -5730,6 +5731,236 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 		}
 		//LL_DEBUGS("Messaging") << "Pushing back transaction " << tid << LL_ENDL;
 		recent.push_back(tid);
+
+	if (msg->has("TransactionInfo"))
+	{
+		// ...message has extended info for localization
+		process_money_balance_reply_extended(msg);
+	}
+	else
+	{
+		// Only old dev grids will not supply the TransactionInfo block,
+		// so we can just use the hard-coded English string.
+		LLSD args;
+		args["MESSAGE"] = desc;
+		LLNotificationsUtil::add("SystemMessage", args);
+
+		// Also send notification to chat -- MC
+		LLChat chat(desc);
+		LLFloaterChat::addChat(desc);
+	}
+}
+
+static std::string reason_from_transaction_type(S32 transaction_type,
+												const std::string& item_desc)
+{
+	// *NOTE: The keys for the reason strings are unusual because
+	// an earlier version of the code used English language strings
+	// extracted from hard-coded server English descriptions.
+	// Keeping them so we don't have to re-localize them.
+	switch (transaction_type)
+	{
+		case TRANS_OBJECT_SALE:
+		{
+			LLStringUtil::format_map_t arg;
+			arg["ITEM"] = item_desc;
+			return LLTrans::getString("for item", arg);
+		}
+		case TRANS_LAND_SALE:
+			return LLTrans::getString("for a parcel of land");
+
+		case TRANS_LAND_PASS_SALE:
+			return LLTrans::getString("for a land access pass");
+
+		case TRANS_GROUP_LAND_DEED:
+			return LLTrans::getString("for deeding land");
+
+		case TRANS_GROUP_CREATE:
+			return LLTrans::getString("to create a group");
+
+		case TRANS_GROUP_JOIN:
+			return LLTrans::getString("to join a group");
+
+		case TRANS_UPLOAD_CHARGE:
+			return LLTrans::getString("to upload");
+
+		case TRANS_CLASSIFIED_CHARGE:
+			return LLTrans::getString("to publish a classified ad");
+
+		// These have no reason to display, but are expected and should not
+		// generate warnings
+		case TRANS_GIFT:
+		case TRANS_PAY_OBJECT:
+		case TRANS_OBJECT_PAYS:
+			return std::string();
+
+		default:
+			llwarns << "Unknown transaction type "
+				<< transaction_type << llendl;
+			return std::string();
+	}
+}
+
+static void process_money_balance_reply_extended(LLMessageSystem* msg)
+{
+	// Added in server 1.40 and viewer 2.1, support for localization
+	// and agent ids for name lookup.
+	S32 transaction_type = 0;
+	LLUUID source_id;
+	BOOL is_source_group = false;
+	LLUUID dest_id;
+	BOOL is_dest_group = false;
+	S32 amount = 0;
+	std::string item_description;
+	BOOL success = false;
+
+	msg->getS32("TransactionInfo", "TransactionType", transaction_type);
+	msg->getUUID("TransactionInfo", "SourceID", source_id);
+	msg->getBOOL("TransactionInfo", "IsSourceGroup", is_source_group);
+	msg->getUUID("TransactionInfo", "DestID", dest_id);
+	msg->getBOOL("TransactionInfo", "IsDestGroup", is_dest_group);
+	msg->getS32("TransactionInfo", "Amount", amount);
+	msg->getString("TransactionInfo", "ItemDescription", item_description);
+	msg->getBOOL("MoneyData", "TransactionSuccess", success);
+	LL_INFOS("Money") << "MoneyBalanceReply source " << source_id
+		<< " dest " << dest_id
+		<< " type " << transaction_type
+		<< " item " << item_description << LL_ENDL;
+
+	if (source_id.isNull() && dest_id.isNull())
+	{
+		// this is a pure balance update, no notification required
+		return;
+	}
+
+	static LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
+	std::string source_slurl;
+	if (is_source_group)
+	{
+		gCacheName->getGroupName(source_id, source_slurl);
+	}
+	else
+	{
+		LLAvatarName avatar_name;
+		if (LLAvatarNameCache::get(source_id, &avatar_name))
+		{
+			switch (phoenix_name_system)
+			{
+				case 0 : source_slurl = avatar_name.getLegacyName(); break;
+				case 1 : source_slurl = avatar_name.getCompleteName(); break;
+				case 2 : source_slurl = avatar_name.mDisplayName; break;
+				default : source_slurl = avatar_name.getLegacyName(); break;
+			}
+		}
+	}
+
+	std::string dest_slurl;
+	if (is_dest_group)
+	{
+		gCacheName->getGroupName(dest_id, dest_slurl);
+	}
+	else
+	{
+		LLAvatarName avatar_name;
+		if (LLAvatarNameCache::get(dest_id, &avatar_name))
+		{
+			switch (phoenix_name_system)
+			{
+				case 0 : dest_slurl = avatar_name.getLegacyName(); break;
+				case 1 : dest_slurl = avatar_name.getCompleteName(); break;
+				case 2 : dest_slurl = avatar_name.mDisplayName; break;
+				default : dest_slurl = avatar_name.getLegacyName(); break;
+			}
+		}
+	}
+
+	std::string reason =
+		reason_from_transaction_type(transaction_type, item_description);
+
+	LLStringUtil::format_map_t args;
+	args["REASON"] = reason; // could be empty
+	args["AMOUNT"] = llformat("%d", amount);
+
+	// Need to delay until name looked up, so need to know whether or not
+	// is group
+	bool is_name_group = false;
+	LLUUID name_id;
+	std::string message;
+	static LLCachedControl<bool> no_transaction_clutter("LiruNoTransactionClutter", false);
+	std::string notification = no_transaction_clutter ? "Payment" : "SystemMessage";
+	LLSD final_args;
+	LLSD payload;
+
+	bool you_paid_someone = (source_id == gAgentID);
+	if (you_paid_someone)
+	{
+		args["NAME"] = dest_slurl;
+		is_name_group = is_dest_group;
+		name_id = dest_id;
+		if (!reason.empty())
+		{
+			if (dest_id.notNull())
+			{
+				message = success ? LLTrans::getString("you_paid_ldollars", args) :
+									LLTrans::getString("you_paid_failure_ldollars", args);
+			}
+			else
+			{
+				// transaction fee to the system, eg, to create a group
+				message = success ? LLTrans::getString("you_paid_ldollars_no_name", args) :
+									LLTrans::getString("you_paid_failure_ldollars_no_name", args);
+			}
+		}
+		else
+		{
+			if (dest_id.notNull())
+			{
+				message = success ? LLTrans::getString("you_paid_ldollars_no_reason", args) :
+									LLTrans::getString("you_paid_failure_ldollars_no_reason", args);
+			}
+			else
+			{
+				// no target, no reason, you just paid money
+				message = success ? LLTrans::getString("you_paid_ldollars_no_info", args) :
+									LLTrans::getString("you_paid_failure_ldollars_no_info", args);
+			}
+		}
+		final_args["MESSAGE"] = message;
+	}
+	else
+	{
+		// ...someone paid you
+		args["NAME"] = source_slurl;
+		is_name_group = is_source_group;
+		name_id = source_id;
+		if (!reason.empty())
+		{
+			message = LLTrans::getString("paid_you_ldollars", args);
+		}
+		else
+		{
+			message = LLTrans::getString("paid_you_ldollars_no_reason", args);
+		}
+		final_args["MESSAGE"] = message;
+
+		// make notification loggable
+		payload["from_id"] = source_id;
+	}
+
+	// Despite using SLURLs, wait until the name is available before
+	// showing the notification, otherwise the UI layout is strange and
+	// the user sees a "Loading..." message
+	if (is_name_group)
+	{
+		gCacheName->getGroup(name_id,
+						boost::bind(&LLNotificationsUtil::add,
+									notification, final_args, payload));
+	}
+	else
+	{
+		LLAvatarNameCache::get(name_id,
+						boost::bind(&LLNotificationsUtil::add,
+									notification, final_args, payload));
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index acb78b1f4..5a737ba85 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -5880,6 +5880,14 @@ Please select at least one type of content to search (PG, Mature, or Adult).
 [MESSAGE]
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="Payment"
+   type="notifytip">
+    <tag>funds</tag>
+[MESSAGE]
+  </notification>
+
   <notification
    icon="notify.tga"
    name="EventNotification"
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 4784afe21..4ed91e6f5 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -25,6 +25,8 @@
 	<check_box bottom="-195" height="16" initial_value="false" label="Use resolution independent scale" left="101" name="ui_auto_scale"/>
 	<spinner bottom="-220" decimal_digits="0" height="16" increment="1" initial_val="300" label="Away Timeout:" label_width="91" left="10" max_val="600" min_val="0" name="afk_timeout_spinner" width="137"/>
 	<check_box bottom="-257" height="16" initial_value="false" label="Notify when in-world currency is spent or received" left="10" name="notify_money_change_checkbox"/>
+	<check_box bottom="-257" height="16" initial_value="false" label="Notify when in-world currency is exchanged" left="10" name="notify_money_change_checkbox"/>
+	<check_box bottom="-257" height="16" label="without filling up the corner" left="245" name="no_transaction_clutter_checkbox" tool_tip="Still present the notifications, but have them pop up in the bottom right momentarily, then leave, so the transaction draws attention but doesn't get in the way."/>
 	<text bottom="-291" height="10" left="10" name="maturity_desired_label">Rating:</text>
 	<text bottom="-291" height="10" left="101" name="maturity_desired_prompt">I want to access content rated:</text>
 	<combo_box bottom="-297" follows="left|top" height="18" left="267" name="maturity_desired_combobox" width="120" control_name="PreferredMaturity">
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 89aabcb73..ef65e554c 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -3872,9 +3872,27 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="Home position set.">Home position set.</string>
 
   <!-- Financial operations strings -->
-  <string name="this_costs">This costs [CURRENCY]</string>
+  <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT] [REASON].</string>
+  <string name="paid_you_ldollars_no_reason">[NAME] paid you L$[AMOUNT].</string>
+  <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string>
+  <string name="you_paid_ldollars_no_info">You paid L$[AMOUNT].</string>
+  <string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string>
+  <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string>
+  <string name="you_paid_failure_ldollars">You failed to pay [NAME] L$[AMOUNT] [REASON].</string>
+  <string name="you_paid_failure_ldollars_no_info">You failed to pay L$[AMOUNT].</string>
+  <string name="you_paid_failure_ldollars_no_reason">You failed to pay [NAME] L$[AMOUNT].</string>
+  <string name="you_paid_failure_ldollars_no_name">You failed to pay L$[AMOUNT] [REASON].</string>
+  <string name="for item">for [ITEM]</string>
+  <string name="for a parcel of land">for a parcel of land</string>
+  <string name="for a land access pass">for a land access pass</string>
+  <string name="for deeding land">for deeding land</string>
+  <string name="to create a group">to create a group</string>
+  <string name="to join a group">to join a group</string>
+  <string name="to upload">to upload</string>
+  <string name="to publish a classified ad">to publish a classified ad</string>
 
   <string name="giving">Giving [CURRENCY]</string>
+  <string name="this_costs">This costs [CURRENCY]</string>
 
   <string name="group_role_everyone">Everyone</string>
   <string name="group_role_officers">Officers</string>
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 2ffe8a79a..6bf56790f 100644
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -6775,6 +6775,8 @@ version 2.0
 }
 
 // And, the money transfer
+// *NOTE: Unused as of 2010-04-06, because all back-end money transactions
+// are done with web services via L$ API.  JC
 {
 	MoneyTransferBackend Low 312 Trusted Zerocoded
 	{
@@ -6825,6 +6827,19 @@ version 2.0
 		{	SquareMetersCommitted	S32	}
 		{	Description			Variable 1	}	// string
 	}
+	// For replies that are part of a transaction (buying something) provide
+	// metadata for localization.  If TransactionType is 0, the message is
+	// purely a balance update.  Added for server 1.40 and viewer 2.1.  JC
+	{
+		TransactionInfo		Single
+		{	TransactionType			S32			}	// lltransactiontype.h
+		{	SourceID				LLUUID		}
+		{	IsSourceGroup			BOOL		}
+		{	DestID					LLUUID		}
+		{	IsDestGroup				BOOL		}
+		{	Amount					S32			}
+		{	ItemDescription			Variable 1	}	// string
+	}
 }
 
 
@@ -6851,6 +6866,17 @@ version 2.0
 		{	SquareMetersCommitted	S32	}
 		{	Description			Variable 1	}	// string
 	}
+	// See MoneyBalanceReply above.
+	{
+		TransactionInfo		Single
+		{	TransactionType			S32			}	// lltransactiontype.h
+		{	SourceID				LLUUID		}
+		{	IsSourceGroup			BOOL		}
+		{	DestID					LLUUID		}
+		{	IsDestGroup				BOOL		}
+		{	Amount					S32			}
+		{	ItemDescription			Variable 1	}	// string
+	}
 }
 
 

From 0876c8c2bfe82e7951f1c17117682dad3570f847 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 2 Dec 2012 22:14:36 -0500
Subject: [PATCH 03/14] Go away when idle checkbox added to General
 Preferences.

---
 indra/newview/llpanelgeneral.cpp                         | 9 ++++++++-
 .../default/xui/en-us/panel_preferences_general.xml      | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llpanelgeneral.cpp b/indra/newview/llpanelgeneral.cpp
index a189d809a..097f0d8db 100644
--- a/indra/newview/llpanelgeneral.cpp
+++ b/indra/newview/llpanelgeneral.cpp
@@ -70,6 +70,7 @@ BOOL LLPanelGeneral::postBuild()
 	childSetValue("show_my_name_checkbox", gSavedSettings.getBOOL("RenderNameHideSelf"));
 	childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames"));
 	childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
+	childSetValue("away_when_idle_checkbox", gSavedSettings.getBOOL("AllowIdleAFK"));
 	childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
 	childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
 	childSetValue("no_transaction_clutter_checkbox", gSavedSettings.getBOOL("LiruNoTransactionClutter"));
@@ -112,6 +113,9 @@ BOOL LLPanelGeneral::postBuild()
 	childSetVisible("maturity_desired_combobox", can_choose);
 	childSetVisible("maturity_desired_textbox",	!can_choose);
 
+	childSetEnabled("afk_timeout_spinner", gSavedSettings.getBOOL("AllowIdleAFK"));
+	childSetCommitCallback("away_when_idle_checkbox", &onClickCheckbox, this);
+
 	childSetEnabled("no_transaction_clutter_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
 	childSetCommitCallback("notify_money_change_checkbox", &onClickCheckbox, this);
 
@@ -149,6 +153,7 @@ void LLPanelGeneral::apply()
 	gSavedSettings.setBOOL("RenderNameHideSelf", childGetValue("show_my_name_checkbox"));
 	gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox"));
 	gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
+	gSavedSettings.setBOOL("AllowIdleAFK", childGetValue("away_when_idle_checkbox"));
 	gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
 	gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
 	gSavedSettings.setBOOL("LiruNoTransactionClutter", childGetValue("no_transaction_clutter_checkbox"));
@@ -173,7 +178,9 @@ void LLPanelGeneral::onClickCheckbox(LLUICtrl* ctrl, void* data)
 {
 	LLPanelGeneral* self = (LLPanelGeneral*)data;
 	bool enabled = ctrl->getValue().asBoolean();
-	if(ctrl->getName() == "notify_money_change_checkbox")
+	if(ctrl->getName() == "away_when_idle_checkbox")
+		self->childSetEnabled("afk_timeout_spinner", enabled);
+	else if(ctrl->getName() == "notify_money_change_checkbox")
 		self->childSetEnabled("no_transaction_clutter_checkbox", enabled);
 }
 
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 4ed91e6f5..7892d77ea 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -23,8 +23,8 @@
 	<text bottom="-180" height="12" left="10" name="UI Size:">UI Size:</text>
 	<slider bottom="-180" can_edit_text="true" height="16" increment="0.025" initial_val="1" left="98" max_val="1.4" min_val="0.75" name="ui_scale_slider" value="1" width="227" />
 	<check_box bottom="-195" height="16" initial_value="false" label="Use resolution independent scale" left="101" name="ui_auto_scale"/>
-	<spinner bottom="-220" decimal_digits="0" height="16" increment="1" initial_val="300" label="Away Timeout:" label_width="91" left="10" max_val="600" min_val="0" name="afk_timeout_spinner" width="137"/>
-	<check_box bottom="-257" height="16" initial_value="false" label="Notify when in-world currency is spent or received" left="10" name="notify_money_change_checkbox"/>
+	<check_box bottom="-219" height="16" left="10" label="Go away when idle" name="away_when_idle_checkbox"/>
+	<spinner bottom="-220" decimal_digits="0" height="16" increment="1" initial_val="300" label="Away Timeout:" label_width="91" left="136" max_val="600" min_val="0" name="afk_timeout_spinner" width="137"/>
 	<check_box bottom="-257" height="16" initial_value="false" label="Notify when in-world currency is exchanged" left="10" name="notify_money_change_checkbox"/>
 	<check_box bottom="-257" height="16" label="without filling up the corner" left="245" name="no_transaction_clutter_checkbox" tool_tip="Still present the notifications, but have them pop up in the bottom right momentarily, then leave, so the transaction draws attention but doesn't get in the way."/>
 	<text bottom="-291" height="10" left="10" name="maturity_desired_label">Rating:</text>
@@ -37,7 +37,7 @@
 	<text bottom="-291" height="10" left="265" name="maturity_desired_textbox">PG only</text>
 	<text bottom="-20" height="10" left="10" name="start_location_textbox">Start Location:</text>
 	<text bottom="-64" height="10" name="show_names_textbox">Show Names:</text>
-	<text bottom="-214" height="10" left="150" name="seconds_textbox">seconds</text>
+	<text bottom="-214" height="10" left="276" name="seconds_textbox">seconds</text>
 	<text bottom="-331" height="18" left="10" name="crash_report_textbox">Crash reports:</text>
 	<text bottom="-363" height="18" name="language_textbox">Language:</text>
 	<text bottom_delta="6" follows="top" height="18" left_delta="243" name="language_textbox2">(Requires restart for full effect)

From b9cfd2fae5907702f430791814da0f2a4ced87b3 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 4 Dec 2012 00:36:12 -0500
Subject: [PATCH 04/14] Replace the tricky copy-paste-everywhere Display Name
 system code with a unified function

Only does that, dun believe me? Take a look, oh... it also corrects improper interpretations of the PhoenixNameSystem value: 1 is both, 2 is displays, 0 and anything else is Legacy.
Also replaces a bit of the display name support code with new system... by definition this shouldn't change the log file, only the title of the session..
because of my bad connection during week days, I can not confirm this working 100%,
but if it does end up changing the logs under certain unseen conditions, replace the new name check with gCacheName->getFullName(id, name) but this reallllly shouldn't happen!
---
 indra/llmessage/llavatarnamecache.cpp     |  22 ++++-
 indra/llmessage/llavatarnamecache.h       |   3 +
 indra/newview/llcallingcard.cpp           |  70 ++++----------
 indra/newview/llfloateractivespeakers.cpp |  39 ++------
 indra/newview/llfloateractivespeakers.h   |   5 -
 indra/newview/llfloateravatarlist.cpp     |  38 ++------
 indra/newview/llfloaterfriends.cpp        | 107 ++--------------------
 indra/newview/llhoverview.cpp             |  45 +--------
 indra/newview/llimpanel.cpp               |  36 +-------
 indra/newview/llimpanel.h                 |   4 -
 indra/newview/llnetmap.cpp                |  30 +-----
 indra/newview/llpanelavatar.cpp           |  18 +---
 indra/newview/llviewermessage.cpp         |  45 +--------
 indra/newview/llviewerstats.cpp           |   2 +-
 indra/newview/llvoavatar.cpp              |   4 +-
 indra/newview/rlvui.cpp                   |   2 +-
 16 files changed, 88 insertions(+), 382 deletions(-)

diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index ae04a8105..6e114c499 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -24,12 +24,12 @@
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
-
 #include "linden_common.h"
 
 #include "llavatarnamecache.h"
 
 #include "llcachename.h"		// we wrap this system
+#include "llcontrol.h"		// For LLCachedControl
 #include "llframetimer.h"
 #include "llhttpclient.h"
 #include "llsd.h"
@@ -619,7 +619,6 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
 		// ...only do immediate lookups when cache is running
 		if (useDisplayNames())
 		{
-			  
 			// ...use display names cache
 			std::map<LLUUID,LLAvatarName>::iterator it = sCache.find(agent_id);
 			if (it != sCache.end())
@@ -664,6 +663,25 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
 	return false;
 }
 
+// Return true when name has been set to Phoenix Name System Name, if not return false.
+bool LLAvatarNameCache::getPNSName(const LLUUID& agent_id, std::string& name)
+{
+	static LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
+	LLAvatarName avatar_name;
+	if (LLAvatarNameCache::get(agent_id, &avatar_name))
+	{
+		switch (phoenix_name_system)
+		{
+			case 0 : name = avatar_name.getLegacyName(); break;
+			case 1 : name = avatar_name.getCompleteName(); break;
+			case 2 : name = avatar_name.mDisplayName; break;
+			default : name = avatar_name.getLegacyName(); break;
+		}
+		return true;
+	}
+	return false;
+}
+
 void LLAvatarNameCache::fireSignal(const LLUUID& agent_id,
 								   const callback_slot_t& slot,
 								   const LLAvatarName& av_name)
diff --git a/indra/llmessage/llavatarnamecache.h b/indra/llmessage/llavatarnamecache.h
index 75f613e74..ffe692afa 100644
--- a/indra/llmessage/llavatarnamecache.h
+++ b/indra/llmessage/llavatarnamecache.h
@@ -65,6 +65,9 @@ namespace LLAvatarNameCache
 	// If name is in cache, returns true and fills in provided LLAvatarName
 	// otherwise returns false
 	bool get(const LLUUID& agent_id, LLAvatarName *av_name);
+	// If get() succeeds, returns true and fills in name string according to Phoenix Name System
+	// otherwise returns false
+	bool getPNSName(const LLUUID& agent_id, std::string& name);
 
 	// Callback types for get() below
 	typedef boost::signals2::signal<
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 12dd4a4b9..3aa786ff5 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -99,11 +99,6 @@ const F32 OFFLINE_SECONDS = FIND_FREQUENCY + 8.0f;
 // static
 LLAvatarTracker LLAvatarTracker::sInstance;
 
-static void on_avatar_name_cache_notify(const LLUUID& agent_id,
-										const LLAvatarName& av_name,
-										bool online,
-										LLSD payload);
-
 ///----------------------------------------------------------------------------
 /// Class LLAvatarTracker
 ///----------------------------------------------------------------------------
@@ -638,22 +633,11 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
 			{
 				if((mBuddyInfo[agent_id]->getRightsGrantedFrom() ^  new_rights) & LLRelationship::GRANT_MODIFY_OBJECTS)
 				{
-					std::string first, last;
 					std::string fullname;
 					LLSD args;
-					LLAvatarName avatar_name;
-					if (LLAvatarNameCache::get(agent_id, &avatar_name))
-					{
-						switch (gSavedSettings.getS32("PhoenixNameSystem"))
-						{
-							case 0 : fullname = avatar_name.getLegacyName(); break;
-							case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.mDisplayName : avatar_name.getCompleteName()); break;
-							case 2 : fullname = avatar_name.mDisplayName; break;
-							default : fullname = avatar_name.getCompleteName(); break;
-						}
+					if (LLAvatarNameCache::getPNSName(agent_id, fullname))
 						args["NAME"] = fullname;
-					}
-					
+
 					LLSD payload;
 					payload["from_id"] = agent_id;
 					if(LLRelationship::GRANT_MODIFY_OBJECTS & new_rights)
@@ -722,9 +706,23 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 		if(chat_notify)
 		{
 			// Look up the name of this agent for the notification
-			LLAvatarNameCache::get(agent_id,
-				boost::bind(&on_avatar_name_cache_notify,
-					_1, _2, online, payload));
+			std::string name;
+			LLSD args;
+			if (LLAvatarNameCache::getPNSName(agent_id, name))
+				args["NAME"] = name;
+
+			// Popup a notify box with online status of this agent
+			LLNotificationPtr notification = LLNotificationsUtil::add(online ? "FriendOnline" : "FriendOffline", args, payload);
+
+			// If there's an open IM session with this agent, send a notification there too.
+			LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, agent_id);
+			LLFloaterIMPanel *floater = gIMMgr->findFloaterBySession(session_id);
+			if (floater)
+			{
+				std::string notifyMsg = notification->getMessage();
+				if (!notifyMsg.empty())
+					floater->addHistoryLine(notifyMsg,gSavedSettings.getColor4("SystemChatColor"));
+			}
 		}
 
 		mModifyMask |= LLFriendObserver::ONLINE;
@@ -733,36 +731,6 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 	}
 }
 
-static void on_avatar_name_cache_notify(const LLUUID& agent_id,
-										const LLAvatarName& av_name,
-										bool online,
-										LLSD payload)
-{
-	// Popup a notify box with online status of this agent
-	// Use display name only because this user is your friend
-	LLSD args;
-	switch (gSavedSettings.getS32("PhoenixNameSystem"))
-	{
-		case 0 : args["NAME"] = av_name.getLegacyName(); break;
-		case 1 : args["NAME"] = (av_name.mIsDisplayNameDefault ? av_name.mDisplayName : av_name.getCompleteName()); break;
-		case 2 : args["NAME"] = av_name.mDisplayName; break;
-		default : args["NAME"] = av_name.getCompleteName(); break;
-	}
-	
-	// Popup a notify box with online status of this agent
-	LLNotificationPtr notification = LLNotificationsUtil::add(online ? "FriendOnline" : "FriendOffline", args, payload);
-
-	// If there's an open IM session with this agent, send a notification there too.
-	LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, agent_id);
-	LLFloaterIMPanel *floater = gIMMgr->findFloaterBySession(session_id);
-	if (floater)
-	{
-		std::string notifyMsg = notification->getMessage();
-		if (!notifyMsg.empty())
-			floater->addHistoryLine(notifyMsg,gSavedSettings.getColor4("SystemChatColor"));
-	}
-}
-
 void LLAvatarTracker::formFriendship(const LLUUID& id)
 {
 	if(id.notNull())
diff --git a/indra/newview/llfloateractivespeakers.cpp b/indra/newview/llfloateractivespeakers.cpp
index 9aa5a7adf..a43fa7e76 100644
--- a/indra/newview/llfloateractivespeakers.cpp
+++ b/indra/newview/llfloateractivespeakers.cpp
@@ -102,41 +102,18 @@ LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerTy
 
 void LLSpeaker::lookupName()
 {
-    // [Ansariel: Display name support]
-	LLAvatarNameCache::get(mID, boost::bind(&LLSpeaker::onAvatarNameLookup, _1, _2, new LLHandle<LLSpeaker>(getHandle())));
-    // [/Ansariel: Display name support]
-}
+	LLAvatarNameCache::getPNSName(mID, mDisplayName);
 
-//static
-// [Ansariel: Display name support]
-void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_name, void* user_data)
-// [/Ansariel: Display name support]
-{
-	LLSpeaker* speaker_ptr = ((LLHandle<LLSpeaker>*)user_data)->get();
-	delete (LLHandle<LLSpeaker>*)user_data;
-
-	if (speaker_ptr)
-	{
-        // [Ansariel: Display name support]
-		switch (gSavedSettings.getS32("PhoenixNameSystem"))
-		{
-			case 0 : speaker_ptr->mDisplayName = avatar_name.getLegacyName(); break;
-			case 1 : speaker_ptr->mDisplayName = (avatar_name.mIsDisplayNameDefault ? avatar_name.mDisplayName : avatar_name.getCompleteName()); break;
-			case 2 : speaker_ptr->mDisplayName = avatar_name.mDisplayName; break;
-			default : speaker_ptr->mDisplayName = avatar_name.getLegacyName(); break;
-		}
-
-		// Also set the legacy name. We will need it to initiate a new
-		// IM session.
-		speaker_ptr->mLegacyName = LLCacheName::cleanFullName(avatar_name.getLegacyName());
-	    // [/Ansariel: Display name support]
+	// Also set the legacy name. We will need it to initiate a new
+	// IM session.
+	gCacheName->getFullName(mID, mLegacyName);
+	mLegacyName = LLCacheName::cleanFullName(mLegacyName);
 
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g
-		// TODO-RLVa: this seems to get called per frame which is very likely an LL bug that will eventuall get fixed
-		if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
-			speaker_ptr->mDisplayName = RlvStrings::getAnonym(speaker_ptr->mDisplayName);
+	// TODO-RLVa: this seems to get called per frame which is very likely an LL bug that will eventually get fixed
+	if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+		mDisplayName = RlvStrings::getAnonym(mDisplayName);
 // [/RLVa:KB]
-	}
 }
 
 LLSpeakerTextModerationEvent::LLSpeakerTextModerationEvent(LLSpeaker* source)
diff --git a/indra/newview/llfloateractivespeakers.h b/indra/newview/llfloateractivespeakers.h
index b8a9ece01..a2cf940a5 100644
--- a/indra/newview/llfloateractivespeakers.h
+++ b/indra/newview/llfloateractivespeakers.h
@@ -77,11 +77,6 @@ public:
 	~LLSpeaker() {};
 	void lookupName();
 
-    // [Ansariel: Display name support]
-	//static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data);
-    static void onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_name, void* user_data);
-    // [/Ansariel: Display name support]
-
 	ESpeakerStatus	mStatus;			// current activity status in speech group
 	F32				mLastSpokeTime;		// timestamp when this speaker last spoke
 	F32				mSpeechVolume;		// current speech amplitude (timea average rms amplitude?)
diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index c214f3480..9f2e3c50c 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -457,8 +457,6 @@ void LLFloaterAvatarList::updateAvatarList()
 		for (i = 0; i < count; ++i)
 		{
 			std::string name;
-			std::string first;
-			std::string last;
 			const LLUUID &avid = avatar_ids[i];
 
 			LLVector3d position;
@@ -478,24 +476,8 @@ void LLFloaterAvatarList::updateAvatarList()
 				position = gAgent.getPosGlobalFromAgent(avatarp->getCharacterPosition());
 				name = avatarp->getFullname();
 
-				// [Ansariel: Display name support]
-				LLAvatarName avatar_name;
-				if (LLAvatarNameCache::get(avatarp->getID(), &avatar_name))
-				{
-				    static LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
-					switch (phoenix_name_system)
-					{
-						case 0 : name = avatar_name.getLegacyName(); break;
-						case 1 : name = (avatar_name.mIsDisplayNameDefault ? avatar_name.mDisplayName : avatar_name.getCompleteName()); break;
-						case 2 : name = avatar_name.mDisplayName; break;
-						default : name = avatar_name.getLegacyName(); break;
-					}
-
-					first = avatar_name.mLegacyFirstName;
-					last = avatar_name.mLegacyLastName;
-				}
-				else continue;
-				// [/Ansariel: Display name support]
+				if (!LLAvatarNameCache::getPNSName(avatarp->getID(), name))
+					continue;
 
 				//duped for lower section
 				if (name.empty() || (name.compare(" ") == 0))// || (name.compare(gCacheName->getDefaultName()) == 0))
@@ -966,14 +948,12 @@ void LLFloaterAvatarList::onClickIM(void* userdata)
 			// Single avatar
 			LLUUID agent_id = ids[0];
 
-			// [Ansariel: Display name support]
-			LLAvatarName avatar_name;
-			if (LLAvatarNameCache::get(agent_id, &avatar_name))
+			std::string avatar_name;
+			if (LLAvatarNameCache::getPNSName(agent_id, avatar_name))
 			{
 				gIMMgr->setFloaterOpen(TRUE);
-				gIMMgr->addSession(LLCacheName::cleanFullName(avatar_name.getLegacyName()),IM_NOTHING_SPECIAL,agent_id);
+				gIMMgr->addSession(avatar_name,IM_NOTHING_SPECIAL,agent_id);
 			}
-			// [Ansariel: Display name support]
 		}
 		else
 		{
@@ -1120,14 +1100,12 @@ BOOL LLFloaterAvatarList::handleKeyHere(KEY key, MASK mask)
 				// Single avatar
 				LLUUID agent_id = ids[0];
 
-				// [Ansariel: Display name support]
-				LLAvatarName avatar_name;
-				if (LLAvatarNameCache::get(agent_id, &avatar_name))
+				std::string avatar_name;
+				if (LLAvatarNameCache::getPNSName(agent_id, avatar_name))
 				{
 					gIMMgr->setFloaterOpen(TRUE);
-					gIMMgr->addSession(LLCacheName::cleanFullName(avatar_name.getLegacyName()),IM_NOTHING_SPECIAL,agent_id);
+					gIMMgr->addSession(avatar_name,IM_NOTHING_SPECIAL,agent_id);
 				}
-				// [Ansariel: Display name support]
 			}
 			else
 			{
diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp
index 2b09b57d4..c3b9826c6 100644
--- a/indra/newview/llfloaterfriends.cpp
+++ b/indra/newview/llfloaterfriends.cpp
@@ -44,10 +44,7 @@
 #include "llagent.h"
 #include "llappviewer.h"	// for gLastVersionChannel
 
-// [Ansariel: Display name support]
-#include "llavatarname.h"
 #include "llavatarnamecache.h"
-// [/Ansariel: Display name support]
 
 #include "llfloateravatarpicker.h"
 #include "llviewerwindow.h"
@@ -421,26 +418,8 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
 	bool isOnline = relationInfo->isOnline();
 
 	std::string fullname;
-	// [Ansariel: Display name support]
-	//BOOL have_name = gCacheName->getFullName(agent_id, fullname);
-	LLAvatarName avatar_name;
-	BOOL have_name;
-	if (LLAvatarNameCache::get(agent_id, &avatar_name))
-	{
-		static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
-		switch (phoenix_name_system)
-		{
-			case 0 : fullname = avatar_name.getLegacyName(); break;
-			case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.mDisplayName : avatar_name.getCompleteName()); break;
-			case 2 : fullname = avatar_name.mDisplayName; break;
-			default : fullname = avatar_name.getCompleteName(); break;
-		}
+	BOOL have_name = LLAvatarNameCache::getPNSName(agent_id, fullname);
 
-		have_name = TRUE;
-	}
-	else have_name = FALSE;
-	// [/Ansariel: Display name support]
-	
 	LLSD element;
 	element["id"] = agent_id;
 	LLSD& friend_column = element["columns"][LIST_FRIEND_NAME];
@@ -520,26 +499,8 @@ BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh
 	bool isOnlineSIP = LLVoiceClient::getInstance()->isOnlineSIP(itemp->getUUID());
 	bool isOnline = info->isOnline();
 
-	std::string fullname;	
-	// [Ansariel: Display name support]
-	//BOOL have_name = gCacheName->getFullName(agent_id, fullname);
-	LLAvatarName avatar_name;
-	BOOL have_name;
-	if (LLAvatarNameCache::get(agent_id, &avatar_name))
-	{
-		static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
-		switch (phoenix_name_system)
-		{
-			case 0 : fullname = avatar_name.getLegacyName(); break;
-			case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.mDisplayName : avatar_name.getCompleteName()); break;
-			case 2 : fullname = avatar_name.mDisplayName; break;
-			default : fullname = avatar_name.getCompleteName(); break;
-		}
-
-		have_name = TRUE;
-	}
-	else have_name = FALSE;
-	// [/Ansariel: Display name support]
+	std::string fullname;
+	BOOL have_name = LLAvatarNameCache::getPNSName(agent_id, fullname);
 
 	// Name of the status icon to use
 	std::string statusIcon;
@@ -892,20 +853,12 @@ void LLPanelFriends::onClickIM(void* user_data)
 		{
 			LLUUID agent_id = ids[0];
 			const LLRelationship* info = LLAvatarTracker::instance().getBuddyInfo(agent_id);
-			// [Ansariel: Display name support]
-			//std::string fullname;
-			//if(info && gCacheName->getFullName(agent_id, fullname))
-			//{
-			//	gIMMgr->setFloaterOpen(TRUE);
-			//	gIMMgr->addSession(fullname, IM_NOTHING_SPECIAL, agent_id);
-			//}
-			LLAvatarName avatar_name;
-			if (info && LLAvatarNameCache::get(agent_id, &avatar_name))
+			std::string fullname;
+			if(info && gCacheName->getFullName(agent_id, fullname))
 			{
 				gIMMgr->setFloaterOpen(TRUE);
-				gIMMgr->addSession(LLCacheName::cleanFullName(avatar_name.getLegacyName()),IM_NOTHING_SPECIAL,agent_id);
+				gIMMgr->addSession(fullname, IM_NOTHING_SPECIAL, agent_id);
 			}
-			// [/Ansariel: Display name support]
 		}
 		else
 		{
@@ -1022,30 +975,9 @@ void LLPanelFriends::onClickRemove(void* user_data)
 		if(ids.size() == 1)
 		{
 			LLUUID agent_id = ids[0];
-			// [Ansariel: Display name support]
-			//std::string first, last;
-			//if(gCacheName->getName(agent_id, first, last))
-			//{
-			//	args["FIRST_NAME"] = first;
-			//	args["LAST_NAME"] = last;	
-			//}
-
-			LLAvatarName avatar_name;
-			if (LLAvatarNameCache::get(agent_id, &avatar_name))
-			{
-				std::string fullname;
-				static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
-				switch (phoenix_name_system)
-				{
-					case 0 : fullname = avatar_name.getLegacyName(); break;
-					case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.mDisplayName : avatar_name.getCompleteName()); break;
-					case 2 : fullname = avatar_name.mDisplayName; break;
-					default : fullname = avatar_name.getCompleteName(); break;
-				}
-				
+			std::string fullname;
+			if (LLAvatarNameCache::getPNSName(agent_id, fullname))
 				args["NAME"] = fullname;
-			}
-			// [/Ansariel: Display name support]
 		}
 		else
 		{
@@ -1289,28 +1221,9 @@ void LLPanelFriends::confirmModifyRights(rights_map_t& ids, EGrantRevoke command
 		if(ids.size() == 1)
 		{
 			LLUUID agent_id = ids.begin()->first;
-			//std::string first, last;
-			//if(gCacheName->getName(agent_id, first, last))
-			//{
-			//	args["FIRST_NAME"] = first;
-			//	args["LAST_NAME"] = last;	
-			//}
-
-			LLAvatarName avatar_name;
-			if (LLAvatarNameCache::get(agent_id, &avatar_name))
-			{
-				std::string fullname;
-				static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
-				switch (phoenix_name_system)
-				{
-					case 0 : fullname = avatar_name.getLegacyName(); break;
-					case 1 : fullname = (avatar_name.mIsDisplayNameDefault ? avatar_name.mDisplayName : avatar_name.getCompleteName()); break;
-					case 2 : fullname = avatar_name.mDisplayName; break;
-					default : fullname = avatar_name.getCompleteName(); break;
-				}
-				
+			std::string fullname;
+			if (LLAvatarNameCache::getPNSName(agent_id, fullname))
 				args["NAME"] = fullname;
-			}
 
 			if (command == GRANT)
 			{
diff --git a/indra/newview/llhoverview.cpp b/indra/newview/llhoverview.cpp
index f6cff6f16..fa922a94b 100644
--- a/indra/newview/llhoverview.cpp
+++ b/indra/newview/llhoverview.cpp
@@ -262,39 +262,16 @@ void LLHoverView::updateText()
 				else
 				{
 // [/RLVa:KB]
-
-                    // [Ansariel: Display name support]
-    				std::string complete_name = firstname->getString();
-    				complete_name += " ";
-    				complete_name += lastname->getString();
-
-    				if (LLAvatarNameCache::useDisplayNames())
-    				{
-    					LLAvatarName avatar_name;
-    					if (LLAvatarNameCache::get(hit_object->getID(), &avatar_name))
-    					{
-							static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
-    						if (phoenix_name_system == 2 || (phoenix_name_system == 1 && avatar_name.mIsDisplayNameDefault))
-    						{
-    							complete_name = avatar_name.mDisplayName;
-    						}
-    						else
-    						{
-    							complete_name = avatar_name.getCompleteName();
-    						}
-    					}
-    				}
-					// [/Ansariel: Display name support]
+					std::string complete_name;
+					if (!LLAvatarNameCache::getPNSName(hit_object->getID(), complete_name))
+						complete_name = firstname->getString() + std::string(" ") + lastname->getString();
 
 					if (title)
 					{
 						line.append(title->getString());
 						line.append(1, ' ');
 					}
-					
-					// [Ansariel: Display name support]
 					line += complete_name;
-					// [/Ansariel: Display name support]
 					
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
 				}
@@ -347,27 +324,13 @@ void LLHoverView::updateText()
 					std::string name;
 					if (!nodep->mPermissions->isGroupOwned())
 					{
-						// [Ansariel: Display name support]
-						LLAvatarName avatar_name;
-						// [/Ansariel: Display name support]
 						owner = nodep->mPermissions->getOwner();
 						if (LLUUID::null == owner)
 						{
 							line.append(LLTrans::getString("TooltipPublic"));
 						}
-						// [Ansariel: Display name support]
-						//else if(gCacheName->getFullName(owner, name))
-						else if (LLAvatarNameCache::get(owner, &avatar_name))
+						else if(LLAvatarNameCache::getPNSName(owner, name))
 						{
-							static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
-							switch (phoenix_name_system)
-							{
-								case 0 : name = avatar_name.getCompleteName(); break;
-								case 1 : name = (avatar_name.mIsDisplayNameDefault ? avatar_name.mDisplayName : avatar_name.getCompleteName()); break;
-								case 2 : name = avatar_name.mDisplayName; break;
-								default : name = avatar_name.getCompleteName(); break;
-							}
-						// [/Ansariel: Display name support]
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
 							if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
 							{
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index bd8ec64be..76e244e25 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1297,28 +1297,13 @@ void LLFloaterIMPanel::init(const std::string& session_label)
 	}
 }
 
-// [Ansariel: Display name support]
 void LLFloaterIMPanel::lookupName()
 {
-	LLAvatarNameCache::get(mOtherParticipantUUID, boost::bind(&LLFloaterIMPanel::onAvatarNameLookup, _1, _2, this));
+	std::string title;
+	if (LLAvatarNameCache::getPNSName(mOtherParticipantUUID, title))
+		setTitle(title);
 }
 
-//static
-void LLFloaterIMPanel::onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_name, void* user_data)
-{
-	LLFloaterIMPanel* self = (LLFloaterIMPanel*)user_data;
-
-	if (self && sFloaterIMPanels.count(self) != 0)
-	{
-		std::string title = avatar_name.getCompleteName();
-		if (!title.empty())
-		{
-			self->setTitle(title);
-		}
-	}
-}
-// [/Ansariel: Display name support]
-
 LLFloaterIMPanel::~LLFloaterIMPanel()
 {
     // [Ansariel: Display name support]
@@ -1676,19 +1661,8 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
 		else
 		{
 			std::string show_name = name;
-			LLAvatarName avatar_name;
-			if (source.notNull() &&
-				LLAvatarNameCache::get(source, &avatar_name))
-			{
-				static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
-				switch (phoenix_name_system)
-				{
-					case 0 : show_name = avatar_name.getCompleteName(); break;
-					case 1 : show_name = (avatar_name.mIsDisplayNameDefault ? avatar_name.mDisplayName : avatar_name.getCompleteName()); break;
-					case 2 : show_name = avatar_name.mDisplayName; break;
-					default : show_name = avatar_name.getCompleteName(); break;
-				}
-			}
+			if (source.notNull())
+				LLAvatarNameCache::getPNSName(source, show_name);
 			// Convert the name to a hotlink and add to message.
 			const LLStyleSP &source_style = LLStyleMap::instance().lookupAgent(source);
 			mHistoryEditor->appendStyledText(show_name,false,prepend_newline,source_style);
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index 943bd37c1..b2a3b8e0e 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -196,10 +196,7 @@ public:
 					 EInstantMessage dialog);
 	virtual ~LLFloaterIMPanel();
 
-    // [Ansariel: Display name support]	
 	void lookupName();
-	static void onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_name, void* user_data);	
-    // [/Ansariel: Display name support]
 
 	/*virtual*/ BOOL postBuild();
 
@@ -400,7 +397,6 @@ private:
 	typedef std::map<LLUUID, LLStyleSP> styleMap;
 	static styleMap mStyleMap;
 	
-	// [Ansariel: Display name support]
 	static std::set<LLFloaterIMPanel*> sFloaterIMPanels;
 };
 
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 86294d46b..8a09fa7b1 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -627,37 +627,11 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
 	{
 		msg.assign("");
 		std::string fullname;
-		if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname))
+		if(mClosestAgentToCursor.notNull() && LLAvatarNameCache::getPNSName(mClosestAgentToCursor, fullname))
 		{
 			//msg.append(fullname);
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.0b
-            // [Ansariel: Display name support]
-			// msg.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullname : RlvStrings::getAnonym(fullname) );
-            if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
-            {
-                msg.append(RlvStrings::getAnonym(fullname));
-            }
-            else
-            {
-				if (LLAvatarNameCache::useDisplayNames())
-    			{
-					LLAvatarName avatar_name;
-					if (LLAvatarNameCache::get(mClosestAgentToCursor, &avatar_name))
-					{
-						static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
-						if (phoenix_name_system == 2 || (phoenix_name_system == 1 && avatar_name.mIsDisplayNameDefault))
-						{
-							fullname = avatar_name.mDisplayName;
-						}
-						else
-						{
-							fullname = avatar_name.getCompleteName(true);
-						}
-					}
-				}
-                msg.append(fullname);
-            }
-            // [/Ansariel: Display name support]
+			msg.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullname : RlvStrings::getAnonym(fullname) );
 // [/RLVa:KB]
 			msg.append("\n");
 
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 14709805e..7f707e519 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -167,21 +167,9 @@ void LLPanelAvatarSecondLife::updatePartnerName()
 {
 	if (mPartnerID.notNull())
 	{
-		// [Ansariel: Display name support]
-		LLAvatarName avatar_name;
-		if (LLAvatarNameCache::get(mPartnerID, &avatar_name))
-		{
-			std::string name;
-			switch (gSavedSettings.getS32("PhoenixNameSystem"))
-			{
-				case 0 : name = avatar_name.getLegacyName(); break;
-				case 1 : name = (avatar_name.mIsDisplayNameDefault ? avatar_name.mDisplayName : avatar_name.getCompleteName()); break;
-				case 2 : name = avatar_name.mDisplayName; break;
-				default : name = avatar_name.getLegacyName(); break;
-			}
+		std::string name;
+		if (LLAvatarNameCache::getPNSName(mPartnerID, name))
 			childSetTextArg("partner_edit", "[NAME]", name);
-		}
-		// [/Ansariel: Display name support]
 		childSetEnabled("partner_info", TRUE);
 	}
 }
@@ -202,9 +190,7 @@ void LLPanelAvatarSecondLife::clearControls()
 	childSetValue("born", "");
 	childSetValue("acct", "");
 
-	// [Ansariel: Display name support]
 	childSetTextArg("partner_edit", "[NAME]", LLStringUtil::null);
-	// [/Ansariel: Display name support]
 
 	mPartnerID = LLUUID::null;
 	
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 1bb0d72e2..70ee4f5bf 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3633,29 +3633,11 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			}
 		}
 
-
-		// [Ansariel/Henri: Display name support]
 		if (chatter && chatter->isAvatar())
 		{
-			if (LLAvatarNameCache::useDisplayNames())
-			{
-				LLAvatarName avatar_name;
-				if (LLAvatarNameCache::get(from_id, &avatar_name))
-				{
-					static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
-					if (phoenix_name_system == 2 || (phoenix_name_system == 1 && avatar_name.mIsDisplayNameDefault))
-					{
-						from_name = avatar_name.mDisplayName;
-					}
-					else
-					{
-						from_name = avatar_name.getCompleteName();
-					}
-				}
+			if (LLAvatarNameCache::getPNSName(from_id, from_name))
 				chat.mFromName = from_name;
-			}
 		}
-		// [/Ansariel/Henri: Display name support]
 
 		BOOL visible_in_chat_bubble = FALSE;
 		std::string verb;
@@ -5833,7 +5815,6 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
 		return;
 	}
 
-	static LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
 	std::string source_slurl;
 	if (is_source_group)
 	{
@@ -5841,17 +5822,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
 	}
 	else
 	{
-		LLAvatarName avatar_name;
-		if (LLAvatarNameCache::get(source_id, &avatar_name))
-		{
-			switch (phoenix_name_system)
-			{
-				case 0 : source_slurl = avatar_name.getLegacyName(); break;
-				case 1 : source_slurl = avatar_name.getCompleteName(); break;
-				case 2 : source_slurl = avatar_name.mDisplayName; break;
-				default : source_slurl = avatar_name.getLegacyName(); break;
-			}
-		}
+		LLAvatarNameCache::getPNSName(source_id, source_slurl);
 	}
 
 	std::string dest_slurl;
@@ -5861,17 +5832,7 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
 	}
 	else
 	{
-		LLAvatarName avatar_name;
-		if (LLAvatarNameCache::get(dest_id, &avatar_name))
-		{
-			switch (phoenix_name_system)
-			{
-				case 0 : dest_slurl = avatar_name.getLegacyName(); break;
-				case 1 : dest_slurl = avatar_name.getCompleteName(); break;
-				case 2 : dest_slurl = avatar_name.mDisplayName; break;
-				default : dest_slurl = avatar_name.getLegacyName(); break;
-			}
-		}
+		LLAvatarNameCache::getPNSName(dest_id, dest_slurl);
 	}
 
 	std::string reason =
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 6013a47f2..8a2667555 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -873,7 +873,7 @@ void send_stats()
 	llinfos << "Misc Stats: int_1: " << misc["int_1"] << " int_2: " << misc["int_2"] << llendl;
 	llinfos << "Misc Stats: string_1: " << misc["string_1"] << " string_2: " << misc["string_2"] << llendl;
 
-	body["DisplayNamesEnabled"] = gSavedSettings.getS32("PhoenixNameSystem") > 0;
+	body["DisplayNamesEnabled"] = gSavedSettings.getS32("PhoenixNameSystem") == 1 || gSavedSettings.getS32("PhoenixNameSystem") == 2;
 	body["DisplayNamesShowUsername"] = gSavedSettings.getS32("PhoenixNameSystem") == 1;
 	
 	body["MinimalSkin"] = false;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 19bd366b4..217f165f7 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3755,8 +3755,8 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
 
 		static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
 
-		bool show_display_names = phoenix_name_system > 0;
-		bool show_usernames = phoenix_name_system < 2;
+		bool show_display_names = phoenix_name_system == 1 || phoenix_name_system == 2;
+		bool show_usernames = phoenix_name_system != 2;
 		if (show_display_names && LLAvatarNameCache::useDisplayNames())
 		{
 			LLAvatarName av_name;
diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp
index 2f1d59091..405dc7909 100644
--- a/indra/newview/rlvui.cpp
+++ b/indra/newview/rlvui.cpp
@@ -265,7 +265,7 @@ void RlvUIEnabler::onToggleShowNames(bool fQuitting)
 	else
 	{
 		LLAvatarNameCache::setForceDisplayNames(false);
-		LLAvatarNameCache::setUseDisplayNames(gSavedSettings.getS32("PhoenixNameSystem") != 0);
+		LLAvatarNameCache::setUseDisplayNames(gSavedSettings.getS32("PhoenixNameSystem") == 1 || gSavedSettings.getS32("PhoenixNameSystem") == 2);
 	}
 	LLVOAvatar::invalidateNameTags();	// See handleDisplayNamesOptionChanged()
 }

From 922e234fe9056ffb3d6b51b99a27bb9ce849ce64 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 4 Dec 2012 03:53:05 -0500
Subject: [PATCH 05/14] Baker Linden's group update, added with some care,
 won't compile,

Note: These changesets removed the some caps in llviewerregion.cpp, I have made a note of these, but left them in.
Please take a look at the Singu Note:'s and Singu: TODO:'s when working on this.
---
 indra/newview/llgroupmgr.cpp          | 181 ++++++++++++++++++++++++++
 indra/newview/llgroupmgr.h            |   5 +
 indra/newview/llpanelgroupgeneral.cpp |  15 +--
 indra/newview/llpanelgroupinvite.cpp  |   2 +-
 indra/newview/llpanelgrouproles.cpp   |   6 +-
 indra/newview/llviewerregion.cpp      |  21 ++-
 6 files changed, 207 insertions(+), 23 deletions(-)

diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index c89c414b5..282b5344f 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -36,6 +36,7 @@
 #include <vector>
 #include <algorithm>
 
+#include "llappviewer.h" //For gFrameCount
 #include "llagent.h"
 #include "llui.h"
 #include "message.h"
@@ -44,6 +45,7 @@
 #include "llstatusbar.h"
 #include "lleconomy.h"
 #include "llviewercontrol.h"
+#include "llviewerregion.h"
 #include "llviewerwindow.h"
 #include "llfloaterdirectory.h"
 #include "llfloatergroupinfo.h"
@@ -821,6 +823,7 @@ void LLGroupMgrGroupData::cancelRoleChanges()
 
 LLGroupMgr::LLGroupMgr()
 {
+	mLastGroupMembersRequestFrame = 0;
 }
 
 LLGroupMgr::~LLGroupMgr()
@@ -1885,6 +1888,184 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 	}
 }
 
+
+// Responder class for capability group management
+class GroupMemberDataResponder : public LLHTTPClient::Responder
+{	//Singu: TODO: make this comply with CT3 standards and compile
+public:
+	GroupMemberDataResponder() {}
+	virtual ~GroupMemberDataResponder() {}
+	virtual void result(const LLSD& pContent);
+	virtual void error(U32 pStatus, const std::string& pReason);
+private:
+	LLSD mMemberData;
+};
+
+void GroupMemberDataResponder::error(U32 pStatus, const std::string& pReason)
+{
+	LL_WARNS("GrpMgr") << "Error receiving group member data." << LL_ENDL;
+}
+
+void GroupMemberDataResponder::result(const LLSD& content)
+{
+	LLGroupMgr::processCapGroupMembersRequest(content);
+}
+
+
+// static
+void LLGroupMgr::sendCapGroupMembersRequest(const LLUUID& group_id)
+{
+	// Have we requested the information already this frame?
+	if (mLastGroupMembersRequestFrame == gFrameCount)
+		return;
+
+	LLViewerRegion* currentRegion = gAgent.getRegion();
+	// Thank you FS:Ansariel!
+	if (!currentRegion)
+	{
+		LL_WARNS("GrpMgr") << "Agent does not have a current region. Uh-oh!" << LL_ENDL;
+		return;
+	}
+
+	// Check to make sure we have our capabilities
+	if (!currentRegion->capabilitiesReceived())
+	{
+		LL_WARNS("GrpMgr") << " Capabilities not received!" << LL_ENDL;
+		return;
+	}
+
+	// Get our capability
+	std::string cap_url =  currentRegion->getCapability("GroupMemberData");
+
+	// Thank you FS:Ansariel!
+	if (cap_url.empty())
+	{
+		LL_INFOS("GrpMgr") << "Region has no GroupMemberData capability.  Falling back to UDP fetch." << LL_ENDL;
+		sendGroupMembersRequest(group_id);
+		return;
+	}
+
+	// Post to our service.  Add a body containing the group_id.
+	LLSD body = LLSD::emptyMap();
+	body["group_id"] = group_id;
+
+	LLHTTPClient::ResponderPtr grp_data_responder = new GroupMemberDataResponder();
+
+	//Singu: TODO: make this timeout after 5 minutes somehow.. AIHTTPTimeoutPolicy?
+	// This could take a while to finish, timeout after 5 minutes.
+	//LLHTTPClient::post(cap_url, body, grp_data_responder, LLSD(), 300);
+	LLHTTPClient::post(cap_url, body, grp_data_responder);
+
+	mLastGroupMembersRequestFrame = gFrameCount;
+}
+
+// static
+void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
+{
+	// Did we get anything in content?
+	if (!content.size())
+	{
+		LL_DEBUGS("GrpMgr") << "No group member data received." << LL_ENDL;
+		return;
+	}
+
+	// If we have no members, there's no reason to do anything else
+	S32 num_members = content["member_count"];
+	if (num_members < 1)
+		return;
+
+	LLUUID group_id = content["group_id"].asUUID();
+
+	LLGroupMgrGroupData* group_datap = LLGroupMgr::getInstance()->getGroupData(group_id);
+	if (!group_datap)
+	{
+		LL_WARNS("GrpMgr") << "Received incorrect, possibly stale, group or request id" << LL_ENDL;
+		return;
+	}
+
+	group_datap->mMemberCount = num_members;
+
+	LLSD member_list = content["members"];
+	LLSD titles = content["titles"];
+	LLSD defaults = content["defaults"];
+
+	std::string online_status;
+	std::string title;
+	S32 contribution;
+	U64 member_powers;
+	// If this is changed to a bool, make sure to change the LLGroupMemberData constructor
+	BOOL is_owner;
+
+	// Compute this once, rather than every time.
+	U64 default_powers = llstrtou64(defaults["default_powers"].asString().c_str(), NULL, 16);
+
+	LLSD::map_const_iterator member_iter_start = member_list.beginMap();
+	LLSD::map_const_iterator member_iter_end = member_list.endMap();
+	for ( ; member_iter_start != member_iter_end; ++member_iter_start)
+	{
+		// Reset defaults
+		online_status = "unknown";
+		title = titles[0].asString();
+		contribution = 0;
+		member_powers = default_powers;
+		is_owner = false;
+
+		const LLUUID member_id(member_iter_start->first);
+		LLSD member_info = member_iter_start->second;
+
+		if (member_info.has("last_login"))
+		{
+			online_status = member_info["last_login"].asString();
+			if (online_status == "Online")
+				online_status = LLTrans::getString("group_member_status_online");
+			else
+				formatDateString(online_status);
+		}
+
+		if (member_info.has("title"))
+			title = titles[member_info["title"].asInteger()].asString();
+
+		if (member_info.has("powers"))
+			member_powers = llstrtou64(member_info["powers"].asString().c_str(), NULL, 16);
+
+		if (member_info.has("donated_square_meters"))
+			contribution = member_info["donated_square_meters"];
+
+		if (member_info.has("owner"))
+			is_owner = true;
+
+		LLGroupMemberData* data = new LLGroupMemberData(member_id, 
+			contribution,
+			member_powers,
+			title,
+			online_status,
+			is_owner);
+
+		group_datap->mMembers[member_id] = data;
+	}
+
+	// Technically, we have this data, but to prevent completely overhauling
+	// this entire system (it would be nice, but I don't have the time),
+	// I'm going to be dumb and just call services I most likely don't need
+	// with the thought being that the system might need it to be done.
+	//
+	// TODO: Refactor to reduce multiple calls for data we already have.
+	if (group_datap->mTitles.size() < 1)
+		LLGroupMgr::getInstance()->sendGroupTitlesRequest(group_id);
+
+	group_datap->mMemberDataComplete = TRUE;
+	group_datap->mMemberRequestID.setNull();
+	// Make the role-member data request
+	if (group_datap->mPendingRoleMemberRequest)
+	{
+		group_datap->mPendingRoleMemberRequest = FALSE;
+		LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(group_id);
+	}
+
+	group_datap->mChanged = TRUE;
+	LLGroupMgr::getInstance()->notifyObservers(GC_MEMBER_DATA);
+}
+
 void LLGroupMgr::sendGroupRoleChanges(const LLUUID& group_id)
 {
 	lldebugs << "LLGroupMgr::sendGroupRoleChanges" << llendl;
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
index 225db1735..6a18add68 100644
--- a/indra/newview/llgroupmgr.h
+++ b/indra/newview/llgroupmgr.h
@@ -335,6 +335,9 @@ public:
 	static void sendGroupMemberEjects(const LLUUID& group_id,
 									  uuid_vec_t& member_ids);
 
+	void sendCapGroupMembersRequest(const LLUUID& group_id);
+	static void processCapGroupMembersRequest(const LLSD& content);
+
 	void cancelGroupRoleChanges(const LLUUID& group_id);
 
 	static void processGroupPropertiesReply(LLMessageSystem* msg, void** data);
@@ -370,6 +373,8 @@ private:
 	typedef std::set<LLParticularGroupObserver*> observer_set_t;
 	typedef std::map<LLUUID,observer_set_t> observer_map_t;
 	observer_map_t mParticularObservers;
+
+	S32 mLastGroupMembersRequestFrame;
 };
 
 
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 5aecdce57..e46049a3d 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -433,10 +433,9 @@ void LLPanelGroupGeneral::activate()
 		LLGroupMgr::getInstance()->sendGroupTitlesRequest(mGroupID);
 		LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mGroupID);
 
-		
 		if (!gdatap || !gdatap->isMemberDataComplete() )
 		{
-			LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
+			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
 		}
 
 		mFirstUse = FALSE;
@@ -901,7 +900,7 @@ void LLPanelGroupGeneral::updateMembers()
 	for( ; mMemberProgress != gdatap->mMembers.end() && i<UPDATE_MEMBERS_PER_FRAME; 
 			++mMemberProgress, ++i)
 	{
-		//llinfos << "Adding " << iter->first << ", " << iter->second->getTitle() << llendl;
+		lldebugs << "Adding " << mMemberProgress->first << ", " << mMemberProgress->second->getTitle() << llendl;
 		LLGroupMemberData* member = mMemberProgress->second;
 		if (!member)
 		{
@@ -941,15 +940,15 @@ void LLPanelGroupGeneral::updateMembers()
 	}
 	sAllTime += all_timer.getElapsedTimeF32();
 
-	llinfos << "Updated " << i << " of " << UPDATE_MEMBERS_PER_FRAME << "members in the list." << llendl;
+	lldebugs << "Updated " << i << " of " << UPDATE_MEMBERS_PER_FRAME << "members in the list." << llendl;
 	if (mMemberProgress == gdatap->mMembers.end())
 	{
-		llinfos << "   member list completed." << llendl;
+		lldebugs << "   member list completed." << llendl;
 		mListVisibleMembers->setEnabled(TRUE);
 
-		llinfos << "All Time: " << sAllTime << llendl;
-		llinfos << "SD Time: " << sSDTime << llendl;
-		llinfos << "Element Time: " << sElementTime << llendl;
+		lldebugs << "All Time: " << sAllTime << llendl;
+		lldebugs << "SD Time: " << sSDTime << llendl;
+		lldebugs << "Element Time: " << sElementTime << llendl;
 	}
 	else
 	{
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index 35f405340..159b2307a 100644
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -472,8 +472,8 @@ void LLPanelGroupInvite::updateLists()
 		if (!mPendingUpdate) 
 		{
 			LLGroupMgr::getInstance()->sendGroupPropertiesRequest(mImplementation->mGroupID);
-			LLGroupMgr::getInstance()->sendGroupMembersRequest(mImplementation->mGroupID);
 			LLGroupMgr::getInstance()->sendGroupRoleDataRequest(mImplementation->mGroupID);
+			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mImplementation->mGroupID);
 		}
 		mPendingUpdate = TRUE;
 	} 
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 155ab8dde..c624c93cd 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -402,7 +402,7 @@ void LLPanelGroupRoles::activate()
 		
 		if (!gdatap || !gdatap->isMemberDataComplete() )
 		{
-			LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
+			LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
 		}
 
 		// Check role data.
@@ -1980,7 +1980,7 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
 
 	if (!gdatap || !gdatap->isMemberDataComplete())
 	{
-		LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
+		LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
 	}
 	
 	if (!gdatap || !gdatap->isRoleMemberDataComplete())
@@ -2572,7 +2572,7 @@ void LLPanelGroupActionsSubTab::handleActionSelect()
 	}
 	else
 	{
-		LLGroupMgr::getInstance()->sendGroupMembersRequest(mGroupID);
+		LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID);
 	}
 
 	if (gdatap->isRoleDataComplete())
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 7df9352f6..a59392821 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1564,7 +1564,6 @@ void LLViewerRegion::unpackRegionHandshake()
 	msg->sendReliable(host);
 }
 
-
 void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 {
 	capabilityNames.append("AgentState");
@@ -1575,11 +1574,9 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("CopyInventoryFromNotecard");
 	capabilityNames.append("CreateInventoryCategory");
 	capabilityNames.append("DispatchRegionInfo");
+	capabilityNames.append("EnvironmentSettings");
 	capabilityNames.append("EstateChangeInfo");
 	capabilityNames.append("EventQueueGet");
-	capabilityNames.append("EnvironmentSettings");
-	/*capabilityNames.append("ObjectMedia");
-	capabilityNames.append("ObjectMediaNavigate");*/
 	
 	if (gSavedSettings.getBOOL("UseHTTPInventory")) //Caps suffixed with 2 by LL. Don't update until rest of fetch system is updated first.
 	{
@@ -1590,12 +1587,12 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	}
 
 	capabilityNames.append("GetDisplayNames");
-	capabilityNames.append("GetTexture");
 	capabilityNames.append("GetMesh");
 	capabilityNames.append("GetObjectCost");
 	capabilityNames.append("GetObjectPhysicsData");
+	capabilityNames.append("GetTexture");
+	capabilityNames.append("GroupMemberData");
 	capabilityNames.append("GroupProposalBallot");
-
 	capabilityNames.append("HomeLocation");
 	//capabilityNames.append("LandResources"); //Script limits (llfloaterscriptlimits.cpp)
 	capabilityNames.append("MapLayer");
@@ -1605,9 +1602,11 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 #endif //MESH_IMPORT
 	capabilityNames.append("NavMeshGenerationStatus");
 	capabilityNames.append("NewFileAgentInventory");
+	/*capabilityNames.append("ObjectMedia");
+	capabilityNames.append("ObjectMediaNavigate");*/
 	capabilityNames.append("ObjectNavMeshProperties");
+	capabilityNames.append("ParcelNavigateMedia"); //Singu Note: Removed by Baker, do we need this?
 	capabilityNames.append("ParcelPropertiesUpdate");
-	capabilityNames.append("ParcelNavigateMedia");
 	capabilityNames.append("ParcelVoiceInfoRequest");
 	capabilityNames.append("ProductInfoRequest");
 	capabilityNames.append("ProvisionVoiceAccountRequest");
@@ -1621,10 +1620,10 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("SendUserReport");
 	capabilityNames.append("SendUserReportWithScreenshot");
 	capabilityNames.append("ServerReleaseNotes");
-	capabilityNames.append("SimConsole");
-	capabilityNames.append("SimulatorFeatures");
 	capabilityNames.append("SetDisplayName");
+	capabilityNames.append("SimConsole"); //Singu: TODO: Removed by Baker, find out if sim console will work without this.
 	capabilityNames.append("SimConsoleAsync");
+	capabilityNames.append("SimulatorFeatures");
 	capabilityNames.append("StartGroupProposal");
 	capabilityNames.append("TerrainNavMeshProperties");
 	capabilityNames.append("TextureStats");
@@ -1632,10 +1631,10 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("UpdateAgentInformation");
 	capabilityNames.append("UpdateAgentLanguage");
 	capabilityNames.append("UpdateGestureAgentInventory");
-	capabilityNames.append("UpdateNotecardAgentInventory");
-	capabilityNames.append("UpdateScriptAgent");
 	capabilityNames.append("UpdateGestureTaskInventory");
+	capabilityNames.append("UpdateNotecardAgentInventory");
 	capabilityNames.append("UpdateNotecardTaskInventory");
+	capabilityNames.append("UpdateScriptAgent");
 	capabilityNames.append("UpdateScriptTask");
 	capabilityNames.append("UploadBakedTexture");
 	//capabilityNames.append("ViewerMetrics");

From 2c48161595b9c7caaa3fe0c128a775238f71b7a8 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 4 Dec 2012 11:54:54 -0500
Subject: [PATCH 06/14] Make Baker's Group code compile! Thanks Shyotl~

Note: Large groups still don't load?!
SimConsole cap is needed for Sim Console, won't work without it, keeping it in!
..But it should work with the new ASync one? Maybe needs tweaks, first?

Also switches opening IMs to the gCacheName->getFullName(id, name) system mentioned earlier, my connection has improved!
And makes the Avatar Picker show display names! Yay! (Rearranged the includes there, alphabetical~)
Also fallback to gCacheName->getFullName(id, name) if getting name fails in the new system.. hopefully this will combat occasional big failures.. but it may not work anyway.. maybe my connection is just awful again
---
 indra/llmessage/aihttptimeoutpolicy.cpp |  1 +
 indra/llmessage/llavatarnamecache.cpp   |  2 ++
 indra/newview/llfloateravatarlist.cpp   |  8 ++++----
 indra/newview/llfloateravatarpicker.cpp | 10 +++++-----
 indra/newview/llgroupmgr.cpp            | 11 +++++++----
 indra/newview/llpanelgroupinvite.cpp    |  3 ++-
 indra/newview/llviewerregion.cpp        |  2 +-
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/indra/llmessage/aihttptimeoutpolicy.cpp b/indra/llmessage/aihttptimeoutpolicy.cpp
index 4acd41267..7e8cc1f91 100644
--- a/indra/llmessage/aihttptimeoutpolicy.cpp
+++ b/indra/llmessage/aihttptimeoutpolicy.cpp
@@ -838,6 +838,7 @@ P(estateChangeInfoResponder);
 P(eventPollResponder);
 P(fetchInventoryResponder);
 P(fnPtrResponder);
+P2(groupMemberDataResponder,					transfer_300s);
 P2(groupProposalBallotResponder,				transfer_300s);
 P(homeLocationResponder);
 P(HTTPGetResponder);
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 6e114c499..14b02cd00 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -679,6 +679,8 @@ bool LLAvatarNameCache::getPNSName(const LLUUID& agent_id, std::string& name)
 		}
 		return true;
 	}
+	if (gCacheName->getFullName(agent_id, name)) //We've failed, try to get the legacy name anyway
+		return false; //Legacy name is still a failure, it's not a PNSName, afterall.
 	return false;
 }
 
diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 9f2e3c50c..b7bfb850c 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -482,7 +482,7 @@ void LLFloaterAvatarList::updateAvatarList()
 				//duped for lower section
 				if (name.empty() || (name.compare(" ") == 0))// || (name.compare(gCacheName->getDefaultName()) == 0))
 				{
-					if (!gCacheName->getFullName(avid, name)) //seems redudant with LLAvatarNameCache::get above...
+					if (!gCacheName->getFullName(avid, name)) //seems redudant with LLAvatarNameCache::getPNSName above...
 					{
 						continue;
 					}
@@ -521,7 +521,7 @@ void LLFloaterAvatarList::updateAvatarList()
 					continue;
 				}
 
-				if (!gCacheName->getFullName(avid, name))
+				if (!LLAvatarNameCache::getPNSName(avid, name))
 				{
 					//name = gCacheName->getDefaultName();
 					continue; //prevent (Loading...)
@@ -949,7 +949,7 @@ void LLFloaterAvatarList::onClickIM(void* userdata)
 			LLUUID agent_id = ids[0];
 
 			std::string avatar_name;
-			if (LLAvatarNameCache::getPNSName(agent_id, avatar_name))
+			if (gCacheName->getFullName(agent_id, avatar_name))
 			{
 				gIMMgr->setFloaterOpen(TRUE);
 				gIMMgr->addSession(avatar_name,IM_NOTHING_SPECIAL,agent_id);
@@ -1101,7 +1101,7 @@ BOOL LLFloaterAvatarList::handleKeyHere(KEY key, MASK mask)
 				LLUUID agent_id = ids[0];
 
 				std::string avatar_name;
-				if (LLAvatarNameCache::getPNSName(agent_id, avatar_name))
+				if (gCacheName->getFullName(agent_id, avatar_name))
 				{
 					gIMMgr->setFloaterOpen(TRUE);
 					gIMMgr->addSession(avatar_name,IM_NOTHING_SPECIAL,agent_id);
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index b93812506..b66309ac4 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -33,21 +33,21 @@
 
 #include "llfloateravatarpicker.h"
 
-#include "message.h"
-
 #include "llagent.h"
+#include "llavatarnamecache.h"
 #include "llbutton.h"
 #include "llfocusmgr.h"
 #include "llfoldervieweventlistener.h"
-#include "llinventorypanel.h"
-#include "llinventorymodel.h"
 #include "llinventoryfunctions.h"
+#include "llinventorymodel.h"
+#include "llinventorypanel.h"
 #include "lllineeditor.h"
 #include "llscrolllistctrl.h"
 #include "lltextbox.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 #include "llworld.h"
+#include "message.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
@@ -323,7 +323,7 @@ void LLFloaterAvatarPicker::populateNearMe()
 		LLSD element;
 		element["id"] = av; // value
 		std::string fullname;
-		if(!gCacheName->getFullName(av, fullname))
+		if(!LLAvatarNameCache::getPNSName(av, fullname))
 		{
 			element["columns"][0]["value"] = LLCacheName::getDefaultName();
 			all_loaded = FALSE;
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 282b5344f..3cde11774 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1889,10 +1889,15 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
 }
 
 
+class AIHTTPTimeoutPolicy;
+extern AIHTTPTimeoutPolicy groupMemberDataResponder_timeout;
+
 // Responder class for capability group management
-class GroupMemberDataResponder : public LLHTTPClient::Responder
-{	//Singu: TODO: make this comply with CT3 standards and compile
+class GroupMemberDataResponder : public LLHTTPClient::ResponderWithResult
+{
 public:
+	virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return groupMemberDataResponder_timeout; }
+
 	GroupMemberDataResponder() {}
 	virtual ~GroupMemberDataResponder() {}
 	virtual void result(const LLSD& pContent);
@@ -1951,9 +1956,7 @@ void LLGroupMgr::sendCapGroupMembersRequest(const LLUUID& group_id)
 
 	LLHTTPClient::ResponderPtr grp_data_responder = new GroupMemberDataResponder();
 
-	//Singu: TODO: make this timeout after 5 minutes somehow.. AIHTTPTimeoutPolicy?
 	// This could take a while to finish, timeout after 5 minutes.
-	//LLHTTPClient::post(cap_url, body, grp_data_responder, LLSD(), 300);
 	LLHTTPClient::post(cap_url, body, grp_data_responder);
 
 	mLastGroupMembersRequestFrame = gFrameCount;
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index 159b2307a..858dfc22a 100644
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -34,6 +34,7 @@
 #include "llpanelgroupinvite.h"
 
 #include "llagent.h"
+#include "llavatarnamecache.h"
 #include "llfloateravatarpicker.h"
 #include "llbutton.h"
 #include "llcombobox.h"
@@ -393,7 +394,7 @@ void LLPanelGroupInvite::addUsers(std::vector<LLUUID>& agent_ids)
 	for (S32 i = 0; i < (S32)agent_ids.size(); i++)
 	{
 		std::string name;
-		if(gCacheName->getFullName(agent_ids[i], name))
+		if(LLAvatarNameCache::getPNSName(agent_ids[i], name))
 			names.push_back(name);
 	}
 	mImplementation->addUsers(names, agent_ids);
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index a59392821..67e6ee7ee 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1621,7 +1621,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("SendUserReportWithScreenshot");
 	capabilityNames.append("ServerReleaseNotes");
 	capabilityNames.append("SetDisplayName");
-	capabilityNames.append("SimConsole"); //Singu: TODO: Removed by Baker, find out if sim console will work without this.
+	capabilityNames.append("SimConsole"); //Singu Note: Removed by Baker, sim console won't work without this.
 	capabilityNames.append("SimConsoleAsync");
 	capabilityNames.append("SimulatorFeatures");
 	capabilityNames.append("StartGroupProposal");

From e2b011590d5cdbbc161c5cf1b94ceffaf69763ec Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 5 Dec 2012 01:48:09 -0500
Subject: [PATCH 07/14] Fix up the Name System just a little bit more.

Better viewed without space changes
Pretty much add support for sending LLAvatarName and std::string to become a name via the system...
Also a bit of a revert for llcallingcard.cpp in this regard, just allow it to use a callback along with the new support,
but still handle the actual name switching in LLAvatarNameCache.
Fixes a problem I was having with "[NAME] is Online" notifications appearing early on, only.
---
 indra/llmessage/llavatarnamecache.cpp | 28 ++++++++-------
 indra/llmessage/llavatarnamecache.h   |  7 ++--
 indra/newview/llcallingcard.cpp       | 51 ++++++++++++++++++---------
 3 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 14b02cd00..af6fb01ec 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -666,22 +666,24 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
 // Return true when name has been set to Phoenix Name System Name, if not return false.
 bool LLAvatarNameCache::getPNSName(const LLUUID& agent_id, std::string& name)
 {
-	static LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
 	LLAvatarName avatar_name;
-	if (LLAvatarNameCache::get(agent_id, &avatar_name))
+	if (get(agent_id, &avatar_name))
+		getPNSName(avatar_name, name);
+	else return false;
+	return true;
+}
+
+// get() with callback compatible version of getPNSName
+void LLAvatarNameCache::getPNSName(const LLAvatarName& avatar_name, std::string& name)
+{
+	static LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
+	switch (phoenix_name_system)
 	{
-		switch (phoenix_name_system)
-		{
-			case 0 : name = avatar_name.getLegacyName(); break;
-			case 1 : name = avatar_name.getCompleteName(); break;
-			case 2 : name = avatar_name.mDisplayName; break;
-			default : name = avatar_name.getLegacyName(); break;
-		}
-		return true;
+		case 0 : name = avatar_name.getLegacyName(); break;
+		case 1 : name = avatar_name.getCompleteName(); break;
+		case 2 : name = avatar_name.mDisplayName; break;
+		default : name = avatar_name.getLegacyName(); break;
 	}
-	if (gCacheName->getFullName(agent_id, name)) //We've failed, try to get the legacy name anyway
-		return false; //Legacy name is still a failure, it's not a PNSName, afterall.
-	return false;
 }
 
 void LLAvatarNameCache::fireSignal(const LLUUID& agent_id,
diff --git a/indra/llmessage/llavatarnamecache.h b/indra/llmessage/llavatarnamecache.h
index ffe692afa..b5745c77b 100644
--- a/indra/llmessage/llavatarnamecache.h
+++ b/indra/llmessage/llavatarnamecache.h
@@ -65,9 +65,12 @@ namespace LLAvatarNameCache
 	// If name is in cache, returns true and fills in provided LLAvatarName
 	// otherwise returns false
 	bool get(const LLUUID& agent_id, LLAvatarName *av_name);
-	// If get() succeeds, returns true and fills in name string according to Phoenix Name System
-	// otherwise returns false
+	// If get() succeeds, returns true and fills in name string
+	// via void function below, otherwise returns false
 	bool getPNSName(const LLUUID& agent_id, std::string& name);
+	// Perform a filling of name string according to Phoenix Name System,
+	// when we have an LLAvatarName already.
+	void getPNSName(const LLAvatarName& avatar_name, std::string& name);
 
 	// Callback types for get() below
 	typedef boost::signals2::signal<
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 3aa786ff5..34b8785c9 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -99,6 +99,11 @@ const F32 OFFLINE_SECONDS = FIND_FREQUENCY + 8.0f;
 // static
 LLAvatarTracker LLAvatarTracker::sInstance;
 
+static void on_avatar_name_cache_notify(const LLUUID& agent_id,
+										const LLAvatarName& av_name,
+										bool online,
+										LLSD payload);
+
 ///----------------------------------------------------------------------------
 /// Class LLAvatarTracker
 ///----------------------------------------------------------------------------
@@ -706,23 +711,9 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 		if(chat_notify)
 		{
 			// Look up the name of this agent for the notification
-			std::string name;
-			LLSD args;
-			if (LLAvatarNameCache::getPNSName(agent_id, name))
-				args["NAME"] = name;
-
-			// Popup a notify box with online status of this agent
-			LLNotificationPtr notification = LLNotificationsUtil::add(online ? "FriendOnline" : "FriendOffline", args, payload);
-
-			// If there's an open IM session with this agent, send a notification there too.
-			LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, agent_id);
-			LLFloaterIMPanel *floater = gIMMgr->findFloaterBySession(session_id);
-			if (floater)
-			{
-				std::string notifyMsg = notification->getMessage();
-				if (!notifyMsg.empty())
-					floater->addHistoryLine(notifyMsg,gSavedSettings.getColor4("SystemChatColor"));
-			}
+			LLAvatarNameCache::get(agent_id,
+				boost::bind(&on_avatar_name_cache_notify,
+					_1, _2, online, payload));
 		}
 
 		mModifyMask |= LLFriendObserver::ONLINE;
@@ -731,6 +722,32 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 	}
 }
 
+static void on_avatar_name_cache_notify(const LLUUID& agent_id,
+										const LLAvatarName& av_name,
+										bool online,
+										LLSD payload)
+{
+	// Popup a notify box with online status of this agent
+	// Use display name only because this user is your friend
+	std::string name;
+	LLAvatarNameCache::getPNSName(av_name, name);
+	LLSD args;
+	args["NAME"] = name;
+
+	// Popup a notify box with online status of this agent
+	LLNotificationPtr notification = LLNotificationsUtil::add(online ? "FriendOnline" : "FriendOffline", args, payload);
+
+	// If there's an open IM session with this agent, send a notification there too.
+	LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, agent_id);
+	LLFloaterIMPanel *floater = gIMMgr->findFloaterBySession(session_id);
+	if (floater)
+	{
+		std::string notifyMsg = notification->getMessage();
+		if (!notifyMsg.empty())
+			floater->addHistoryLine(notifyMsg,gSavedSettings.getColor4("SystemChatColor"));
+	}
+}
+
 void LLAvatarTracker::formFriendship(const LLUUID& id)
 {
 	if(id.notNull())

From 7ba21ac4fd7eae71fe618952c069bca169b41841 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 5 Dec 2012 12:06:10 -0500
Subject: [PATCH 08/14] Show Highlight and Edit Axis at Root on build floater

Thanks for the help, Naudia Nadezda!
---
 indra/newview/llfloatertools.cpp               |  6 ++++++
 indra/newview/llfloatertools.h                 |  2 ++
 .../skins/default/xui/en-us/floater_tools.xml  | 18 +++++++++++-------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 1219176d6..f52b0960c 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -277,6 +277,8 @@ BOOL	LLFloaterTools::postBuild()
 	mComboGridMode			= getChild<LLComboBox>("combobox grid mode");
 	childSetCommitCallback("combobox grid mode",commit_grid_mode, this);
 
+	mCheckShowHighlight = getChild<LLCheckBoxCtrl>("checkbox show highlight");
+	mCheckActualRoot = getChild<LLCheckBoxCtrl>("checkbox actual root");
 	//
 	// Create Buttons
 	//
@@ -382,6 +384,8 @@ LLFloaterTools::LLFloaterTools()
 	mCheckStretchUniform(NULL),
 	mCheckStretchTexture(NULL),
 	mCheckLimitDrag(NULL),
+	mCheckShowHighlight(NULL),
+	mCheckActualRoot(NULL),
 
 	mBtnRotateLeft(NULL),
 	mBtnRotateReset(NULL),
@@ -712,6 +716,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 	if (mCheckStretchUniform) mCheckStretchUniform->setVisible( edit_visible );
 	if (mCheckStretchTexture) mCheckStretchTexture->setVisible( edit_visible );
 	if (mCheckLimitDrag) mCheckLimitDrag->setVisible( edit_visible );
+	if (mCheckShowHighlight) mCheckShowHighlight->setVisible(edit_visible);
+	if (mCheckActualRoot) mCheckActualRoot->setVisible(edit_visible);
 
 	// Create buttons
 	BOOL create_visible = (tool == LLToolCompCreate::getInstance());
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index 085a2774e..90cdf83eb 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -143,6 +143,8 @@ public:
 	LLCheckBoxCtrl*	mCheckStretchUniform;
 	LLCheckBoxCtrl*	mCheckStretchTexture;
 	LLCheckBoxCtrl*	mCheckLimitDrag;
+	LLCheckBoxCtrl*	mCheckShowHighlight;
+	LLCheckBoxCtrl*	mCheckActualRoot;
 
 
 	LLButton	*mBtnRotateLeft;
diff --git a/indra/newview/skins/default/xui/en-us/floater_tools.xml b/indra/newview/skins/default/xui/en-us/floater_tools.xml
index e2c6803dd..d381d3311 100644
--- a/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -99,9 +99,9 @@
 			Reference
 		</combo_item>
 	</combo_box>
-	<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
+	<check_box bottom="-67" control_name="ScaleUniform" follows="left|top"
 	    font="SansSerifSmall" height="15" initial_value="false"
-	    label="Stretch Both Sides" left="143" mouse_opaque="true"
+	    label="Stretch Both Sides" left="128" mouse_opaque="true"
 	    name="checkbox uniform" width="134" />
 	<check_box bottom_delta="-16" control_name="ScaleStretchTextures" follows="left|top"
 	    font="SansSerifSmall" height="15" initial_value="true"
@@ -111,12 +111,16 @@
 	    font="SansSerifSmall" height="15" initial_value="true"
 	    label="Limit drag distance" left_delta="0" mouse_opaque="true"
 	    name="checkbox limit drag distance" width="134" />
+	<check_box bottom_delta="-15" control_name="AscentBuildPrefs_ActualRoot" follows="left|top"
+		height="16" label="Edit Axis at Root" name="checkbox actual root" width="134"/>
+	<check_box bottom_delta="-16" control_name="RenderHighlightSelections" follows="left|top"
+		height="15" label="Show Highlight" name="checkbox show highlight"/>
 	<check_box bottom_delta="-16" control_name="SnapEnabled" follows="left|top"
 	    font="SansSerifSmall" height="15" initial_value="true" label="Use Grid"
 	    left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-	<button bottom_delta="-17" follows="left|top" font="SansSerifSmall" halign="center" 
-		valign="center" height="20" label="Options..." label_selected="Options..." 
-		left_delta="20" mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+		valign="center" height="18" label="Options..." label_selected="Options..."
+		left_delta="64" mouse_opaque="true" name="Options..." scale_image="TRUE" width="75" />
 
 <!-- Help text -->
 
@@ -293,13 +297,13 @@
 	     increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
 	     mouse_opaque="true" name="slider force" width="80" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-         bottom="-151" left="118" drop_shadow_visible="true" follows="left|top"
+         bottom="-160" left="118" drop_shadow_visible="true" follows="left|top"
          font="SansSerifSmall" h_pad="0" halign="right" height="16" visible="false" 
          mouse_opaque="true" name="link_num_obj_count" v_pad="0" width="143">
 		[DESC] [NUM]
 	</text>
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom="-163" left="118" drop_shadow_visible="true" follows="left|top"
+       bottom="-170" left="118" drop_shadow_visible="true" follows="left|top"
        font="SansSerifSmall" h_pad="0" halign="right" height="16"
        mouse_opaque="true" name="prim_count" v_pad="0" width="143"/>
 

From 0100cd2f36ab85a451cc039185aec0c5bf59a684 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Thu, 6 Dec 2012 21:04:06 -0500
Subject: [PATCH 09/14] More of e2b011590d5cdbbc161c5cf1b94ceffaf69763ec

Fixing up the name system, missed two parts.
---
 indra/newview/llfloateractivespeakers.cpp |  8 +++++++-
 indra/newview/llimpanel.cpp               | 17 ++++++++++++++---
 indra/newview/llimpanel.h                 |  1 +
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llfloateractivespeakers.cpp b/indra/newview/llfloateractivespeakers.cpp
index a43fa7e76..b6dbd16a3 100644
--- a/indra/newview/llfloateractivespeakers.cpp
+++ b/indra/newview/llfloateractivespeakers.cpp
@@ -70,6 +70,8 @@ const LLColor4 INACTIVE_COLOR(0.3f, 0.3f, 0.3f, 0.5f);
 const LLColor4 ACTIVE_COLOR(0.5f, 0.5f, 0.5f, 1.f);
 const F32 TYPING_ANIMATION_FPS = 2.5f;
 
+static void on_avatar_name_lookup(const LLUUID&, const LLAvatarName& avatar_name, std::string& mDisplayName);
+
 LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerType type) : 
 	mStatus(LLSpeaker::STATUS_TEXT_ONLY),
 	mLastSpokeTime(0.f), 
@@ -102,13 +104,17 @@ LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerTy
 
 void LLSpeaker::lookupName()
 {
-	LLAvatarNameCache::getPNSName(mID, mDisplayName);
+	LLAvatarNameCache::get(mID, boost::bind(&on_avatar_name_lookup, _1, _2, boost::ref(mDisplayName)));
 
 	// Also set the legacy name. We will need it to initiate a new
 	// IM session.
 	gCacheName->getFullName(mID, mLegacyName);
 	mLegacyName = LLCacheName::cleanFullName(mLegacyName);
+}
 
+static void on_avatar_name_lookup(const LLUUID&, const LLAvatarName& avatar_name, std::string& mDisplayName)
+{
+	LLAvatarNameCache::getPNSName(avatar_name, mDisplayName);
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g
 	// TODO-RLVa: this seems to get called per frame which is very likely an LL bug that will eventually get fixed
 	if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 76e244e25..2cbe64c02 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1299,9 +1299,20 @@ void LLFloaterIMPanel::init(const std::string& session_label)
 
 void LLFloaterIMPanel::lookupName()
 {
-	std::string title;
-	if (LLAvatarNameCache::getPNSName(mOtherParticipantUUID, title))
-		setTitle(title);
+	LLAvatarNameCache::get(mOtherParticipantUUID, boost::bind(&LLFloaterIMPanel::onAvatarNameLookup, _1, _2, this));
+}
+
+//static
+void LLFloaterIMPanel::onAvatarNameLookup(const LLUUID&, const LLAvatarName& avatar_name, void* data)
+{
+	LLFloaterIMPanel* self = (LLFloaterIMPanel*)data;
+
+	if (self && sFloaterIMPanels.count(self) != 0)
+	{
+		std::string title;
+		LLAvatarNameCache::getPNSName(avatar_name, title);
+		self->setTitle(title);
+	}
 }
 
 LLFloaterIMPanel::~LLFloaterIMPanel()
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index b2a3b8e0e..61d8c01f7 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -197,6 +197,7 @@ public:
 	virtual ~LLFloaterIMPanel();
 
 	void lookupName();
+	static void onAvatarNameLookup(const LLUUID&, const LLAvatarName& avatar_name, void* data);
 
 	/*virtual*/ BOOL postBuild();
 

From 1ffb5aa6fee933269d23decd6831840a8b14e72f Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Thu, 6 Dec 2012 22:17:44 -0500
Subject: [PATCH 10/14] LLFloaterAvatarList RLVa: Don't announce people are in
 range when the user is blind.

---
 indra/newview/llfloateravatarlist.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index b7bfb850c..1655c2714 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -83,6 +83,7 @@ typedef enum e_radar_alert_type
 
 void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool entering)
 {
+	if(gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) return; //RLVa:LF Don't announce people are around when blind, that cheats the system.
 	static LLCachedControl<bool> radar_chat_alerts(gSavedSettings, "RadarChatAlerts");
 	if (!radar_chat_alerts) return;
 	static LLCachedControl<bool> radar_alert_sim(gSavedSettings, "RadarAlertSim");

From 813a4b02004a4504e2388d1df361fdddcb1c2d80 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 10 Dec 2012 13:26:48 -0500
Subject: [PATCH 11/14] =?UTF-8?q?Fix=20warning:=20unused=20variable=20?=
 =?UTF-8?q?=E2=80=98len=E2=80=99=20in=20release=20builds.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 indra/newview/llmarketplacefunctions.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 3cb77c432..e454cf65b 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -74,8 +74,7 @@ static std::string getMarketplaceDomain()
 			// SecondLife(tm) BETA grid.
 			// Using the login URI is a bit of a kludge, but it's the best we've got at the moment.
 			domain = utf8str_tolower(getLoginUriDomain());				// <gridid>.lindenlab.com; ie, "aditi.lindenlab.com".
-			std::string::size_type len = domain.length();
-			llassert(len > 14 && domain.substr(len - 14) == ".lindenlab.com");
+			llassert(domain.length() > 14 && domain.substr(domain.length() - 14) == ".lindenlab.com");
 			if (domain == "damballah.lindenlab.com")
 			{
 				domain = "secondlife-staging.com";

From 03f191f47dd968411be00227c55d74bcc790f5fe Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 10 Dec 2012 16:42:06 -0500
Subject: [PATCH 12/14] Satisfy Issue 494: 	Inventory: Copy links (without
 "find original")

http://code.google.com/p/singularity-viewer/issues/detail?id=494
Patch by Kitty Barnett, slightly modified by myself.
---
 indra/newview/llinventorybridge.cpp | 51 ++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 84e1d1199..ff3a0a3da 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -731,6 +731,20 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 	{
 		if (obj->getIsLinkType())
 		{
+			// Patch: Inventory-Links tweak, Can copy and cut Inventory Links
+			items.push_back(std::string("Copy Separator"));
+
+			items.push_back(std::string("Copy"));
+			if (!isItemCopyable())
+			{
+				disabled_items.push_back(std::string("Copy"));
+			}
+
+			items.push_back(std::string("Cut"));
+			if (!isItemMovable() || !isItemRemovable())
+			{
+				disabled_items.push_back(std::string("Cut"));
+			}
 			items.push_back(std::string("Find Original"));
 			if (isLinkedObjectMissing())
 			{
@@ -1812,7 +1826,10 @@ BOOL LLItemBridge::removeItem()
 	// we can't do this check because we may have items in a folder somewhere that is
 	// not yet in memory, so we don't want false negatives.  (If disabled, then we 
 	// know we only have links in the Outfits folder which we explicitly fetch.)
-	if (!InventoryLinksEnabled())
+// [SL:KB] - Patch: Inventory-Links | Checked: 2010-06-01 (Catznip-2.2.0a) | Added: Catznip-2.0.1a
+	// Users move folders around and reuse links that way... if we know something has links then it's just bad not to warn them :|
+// [/SL:KB]
+//	if (!InventoryLinksEnabled())
 	{
 		if (!item->getIsLinkType())
 		{
@@ -1873,13 +1890,26 @@ BOOL LLItemBridge::isItemCopyable() const
 			return FALSE;
 		}*/
 
-		// You can never copy a link.
-		if (item->getIsLinkType())
+//		// You can never copy a link.
+//		if (item->getIsLinkType())
+// [SL:KB] - Patch: Inventory-Links | Checked: 2010-04-12 (Catznip-2.2.0a) | Added: Catznip-2.0.0a
+		// We'll allow copying a link if:
+		//   - its target is available
+		//   - it doesn't point to another link [see LLViewerInventoryItem::getLinkedItem() which returns NULL in that case]
+		if (item->getIsLinkType() && !item->getLinkedItem())
+// [/SL:KB]
 		{
 			return FALSE;
 		}
 
-		return item->getPermissions().allowCopyBy(gAgent.getID()) || InventoryLinksEnabled();
+// [SL:KB] - Patch: Inventory-Links | Checked: 2010-04-12 (Catznip-2.2.0a) | Added: Catznip-2.0.0a
+		// User can copy the item if:
+		//   - the item (or its target in the case of a link) is "copy"
+		//   - and/or if the item (or its target in the case of a link) has a linkable asset type
+		// NOTE: we do *not* want to return TRUE on everything like LL seems to do in SL-2.1.0 because not all types are "linkable"
+		return (item->getPermissions().allowCopyBy(gAgent.getID())) || (LLAssetType::lookupCanLink(item->getType()));
+// [/SL:KB]
+//		return item->getPermissions().allowCopyBy(gAgent.getID()) || InventoryLinksEnabled();
 	}
 	return FALSE;
 }
@@ -3170,6 +3200,19 @@ void LLFolderBridge::pasteFromClipboard()
 							copy_inventory_category(model, vicat, parent_id);
 						}
 					}
+// [SL:KB] - Patch: Inventory-Links | Checked: 2010-04-12 (Catznip-2.2.0a) | Added: Catznip-2.0.0a
+					else if (LLAssetType::lookupIsLinkType(item->getActualType()))
+					{
+						link_inventory_item(
+							gAgent.getID(),
+							item->getLinkedUUID(),
+							parent_id,
+							item->getName(),
+							item->getDescription(),
+							item->getActualType(),
+							LLPointer<LLInventoryCallback>(NULL));
+					}
+// [/SL:KB]
 					else
 					{
 						copy_inventory_item(

From 702eb95b8445aa1eecba4051c67c9121fc2f16cc Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 10 Dec 2012 19:39:55 -0500
Subject: [PATCH 13/14] Add Paste As Copy to inventory menu...

The opposite of Paste As Link, this will make copies of everything in the paste buffer,
allowing the user to copy bunches of items or links and simply paste them to make new copies.

Also appears when not needed... unsure how to go about removing, maybe comment out in release?
---
 indra/newview/llfoldervieweventlistener.h     |  2 +-
 indra/newview/llinventorybridge.cpp           | 32 +++++++++++++++++--
 indra/newview/llinventorybridge.h             |  4 +--
 indra/newview/llpanelobjectinventory.cpp      |  4 +--
 .../default/xui/en-us/menu_inventory.xml      |  4 +++
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/indra/newview/llfoldervieweventlistener.h b/indra/newview/llfoldervieweventlistener.h
index 3bfbf3611..69060653f 100644
--- a/indra/newview/llfoldervieweventlistener.h
+++ b/indra/newview/llfoldervieweventlistener.h
@@ -77,7 +77,7 @@ public:
 	virtual BOOL copyToClipboard() const = 0;
 	virtual void cutToClipboard() = 0;
 	virtual BOOL isClipboardPasteable() const = 0;
-	virtual void pasteFromClipboard() = 0;
+	virtual void pasteFromClipboard(bool only_copies = false) = 0;
 	virtual void pasteLinkFromClipboard() = 0;
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags) = 0;
 	virtual BOOL isUpToDate() const = 0;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ff3a0a3da..ab240c996 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -816,10 +816,14 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 	if (!isCOFFolder() && !isInboxFolder() && !isOutboxFolder())
 	{
 		items.push_back(std::string("Paste"));
+		// Paste as copy if we have links.
+		if (InventoryLinksEnabled() && !LLInventoryClipboard::instance().isCutMode())
+			items.push_back(std::string("Paste As Copy"));
 	}
 	if (!isClipboardPasteable() || ((flags & FIRST_SELECTED_ITEM) == 0))
 	{
 		disabled_items.push_back(std::string("Paste"));
+		disabled_items.push_back(std::string("Paste As Copy"));
 	}
 
 	if(InventoryLinksEnabled())
@@ -1483,6 +1487,18 @@ void LLItemBridge::performAction(LLInventoryModel* model, std::string action)
 		folder_view_itemp->getListener()->pasteFromClipboard();
 		return;
 	}
+	else if ("paste_copies" == action)
+	{
+		// Single item only
+		LLInventoryItem* itemp = model->getItem(mUUID);
+		if (!itemp) return;
+
+		LLFolderViewItem* folder_view_itemp = mRoot->getItemByID(itemp->getParentUUID());
+		if (!folder_view_itemp) return;
+
+		folder_view_itemp->getListener()->pasteFromClipboard(true);
+		return;
+	}
 	else if ("paste_link" == action)
 	{
 		// Single item only
@@ -2854,6 +2870,11 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
 		pasteFromClipboard();
 		return;
 	}
+	else if ("paste_copies" == action)
+	{
+		pasteFromClipboard(true);
+		return;
+	}
 	else if ("paste_link" == action)
 	{
 		pasteLinkFromClipboard();
@@ -3092,7 +3113,7 @@ bool LLFolderBridge::removeItemResponse(const LLSD& notification, const LLSD& re
 	return FALSE;
 }
 
-void LLFolderBridge::pasteFromClipboard()
+void LLFolderBridge::pasteFromClipboard(bool only_copies)
 {
 	LLInventoryModel* model = getInventoryModel();
 	if(model && isClipboardPasteable())
@@ -3165,7 +3186,7 @@ void LLFolderBridge::pasteFromClipboard()
 						dropToOutfit(item, move_is_into_current_outfit);
 					}
 				}
-				else if(LLInventoryClipboard::instance().isCutMode())
+				else if (!only_copies && LLInventoryClipboard::instance().isCutMode())
 				{
 					// Do a move to "paste" a "cut"
 					// move_inventory_item() is not enough, as we have to update inventory locally too
@@ -3190,6 +3211,11 @@ void LLFolderBridge::pasteFromClipboard()
 				}
 				else
 				{
+					if (only_copies)
+					{
+						item = model->getLinkedItem(item_id);
+						obj = model->getObject(item->getUUID());
+					}
 					// Do a "copy" to "paste" a regular copy clipboard
 					if (LLAssetType::AT_CATEGORY == obj->getType())
 					{
@@ -3201,7 +3227,7 @@ void LLFolderBridge::pasteFromClipboard()
 						}
 					}
 // [SL:KB] - Patch: Inventory-Links | Checked: 2010-04-12 (Catznip-2.2.0a) | Added: Catznip-2.0.0a
-					else if (LLAssetType::lookupIsLinkType(item->getActualType()))
+					else if (!only_copies && LLAssetType::lookupIsLinkType(item->getActualType()))
 					{
 						link_inventory_item(
 							gAgent.getID(),
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 945c653ba..ca2c906a3 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -109,7 +109,7 @@ public:
 	virtual void cutToClipboard();
 	virtual BOOL isClipboardPasteable() const;
 	virtual BOOL isClipboardPasteableAsLink() const;
-	virtual void pasteFromClipboard() {}
+	virtual void pasteFromClipboard(bool only_copies = false) {}
 	virtual void pasteLinkFromClipboard() {}
 	void getClipboardEntries(bool show_asset_id, menuentry_vec_t &items, 
 							 menuentry_vec_t &disabled_items, U32 flags);
@@ -261,7 +261,7 @@ public:
 	BOOL removeSystemFolder();
 	bool removeItemResponse(const LLSD& notification, const LLSD& response);
 
-	virtual void pasteFromClipboard();
+	virtual void pasteFromClipboard(bool only_copies = false);
 	virtual void pasteLinkFromClipboard();
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual BOOL hasChildren() const;
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 8929780d5..cd9d17587 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -131,7 +131,7 @@ public:
 	virtual BOOL copyToClipboard() const;
 	virtual void cutToClipboard();
 	virtual BOOL isClipboardPasteable() const;
-	virtual void pasteFromClipboard();
+	virtual void pasteFromClipboard(bool only_copies = false);
 	virtual void pasteLinkFromClipboard();
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual void performAction(LLInventoryModel* model, std::string action);
@@ -604,7 +604,7 @@ BOOL LLTaskInvFVBridge::isClipboardPasteable() const
 	return FALSE;
 }
 
-void LLTaskInvFVBridge::pasteFromClipboard()
+void LLTaskInvFVBridge::pasteFromClipboard(bool only_copies)
 {
 }
 
diff --git a/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 012524098..ee207769a 100644
--- a/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -198,6 +198,10 @@
 	     name="Paste" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="paste" />
 	</menu_item_call>
+	<menu_item_call bottom_delta="-18" height="18" label="Paste As Copy" left="0" mouse_opaque="true"
+	     name="Paste As Copy" width="128">
+		<on_click filter="" function="Inventory.DoToSelected" userdata="paste_copies" />
+	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="Paste As Link" left="0" mouse_opaque="true"
 	     name="Paste As Link" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="paste_link" />

From b1ccb70277b7acf20a1ad2e3149cd6c1a697615f Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 11 Dec 2012 15:15:41 -0500
Subject: [PATCH 14/14] Added isClipboardPasteableAsCopy() to decide when not
 to show Paste As Copy

---
 indra/newview/llinventorybridge.cpp | 44 ++++++++++++++++++++++++++++-
 indra/newview/llinventorybridge.h   |  1 +
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ab240c996..63bb8426a 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -612,6 +612,48 @@ BOOL LLInvFVBridge::isClipboardPasteable() const
 	return TRUE;
 }
 
+bool LLInvFVBridge::isClipboardPasteableAsCopy() const
+{
+	// In cut mode, we don't paste copies.
+	if (LLInventoryClipboard::instance().isCutMode())
+	{
+		return false;
+	}
+
+	LLInventoryModel* model = getInventoryModel();
+	if (!model)
+	{
+		return false;
+	}
+
+	// In copy mode, we need to check each element of the clipboard to know if it's a link
+	LLInventoryPanel* panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get());
+	LLDynamicArray<LLUUID> objects;
+	LLInventoryClipboard::instance().retrieve(objects);
+	const S32 count = objects.count();
+	for(S32 i = 0; i < count; i++)
+	{
+		const LLUUID &item_id = objects.get(i);
+
+		// Folders may be links
+		const LLInventoryCategory *cat = model->getCategory(item_id);
+		if (cat)
+		{
+			const LLFolderBridge cat_br(panel, mRoot, item_id);
+			if (cat_br.isLink())
+				return true;
+			// Skip to the next item in the clipboard
+			continue;
+		}
+
+		// May be link item
+		const LLItemBridge item_br(panel, mRoot, item_id);
+		if (item_br.isLink())
+			return true;
+	}
+	return false;
+}
+
 BOOL LLInvFVBridge::isClipboardPasteableAsLink() const
 {
 	if (!InventoryLinksEnabled())
@@ -817,7 +859,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
 	{
 		items.push_back(std::string("Paste"));
 		// Paste as copy if we have links.
-		if (InventoryLinksEnabled() && !LLInventoryClipboard::instance().isCutMode())
+		if (InventoryLinksEnabled() && isClipboardPasteableAsCopy())
 			items.push_back(std::string("Paste As Copy"));
 	}
 	if (!isClipboardPasteable() || ((flags & FIRST_SELECTED_ITEM) == 0))
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index ca2c906a3..c5e26b752 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -108,6 +108,7 @@ public:
 	virtual BOOL copyToClipboard() const;
 	virtual void cutToClipboard();
 	virtual BOOL isClipboardPasteable() const;
+	bool isClipboardPasteableAsCopy() const;
 	virtual BOOL isClipboardPasteableAsLink() const;
 	virtual void pasteFromClipboard(bool only_copies = false) {}
 	virtual void pasteLinkFromClipboard() {}