From 02e319ff343e3e45633de81ba048c930ae0c23ab Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 4 Jun 2010 10:14:38 -0700
Subject: Default name tags to Display Names only

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

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4178b91fcf..c05c08168a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7445,7 +7445,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>RenderInitError</key>
     <map>
-- 
cgit v1.2.3


From 9696e94b2453e631f2c3bbb437e34196bc34652b Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 4 Jun 2010 12:19:11 -0700
Subject: Comment out code that won't compile, fix later

---
 indra/newview/llavataractions.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index f6d104cf0a..f7db30e023 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -643,11 +643,12 @@ namespace action_give_inventory
 //static
 void LLAvatarActions::shareWithAvatars()
 {
-	using namespace action_give_inventory;
-
-	LLFloaterAvatarPicker* picker =
-		LLFloaterAvatarPicker::show(boost::bind(give_inventory, _1, _2), TRUE, FALSE);
-	picker->setOkBtnEnableCb(boost::bind(is_give_inventory_acceptable));
+	llerrs << "Needs to be fixed to work with LLAvatarName" << llendl;
+//	using namespace action_give_inventory;
+//
+//	LLFloaterAvatarPicker* picker =
+//		LLFloaterAvatarPicker::show(boost::bind(give_inventory, _1, _2), TRUE, FALSE);
+//	picker->setOkBtnEnableCb(boost::bind(is_give_inventory_acceptable));
 }
 
 // static
-- 
cgit v1.2.3