From 7d7f0c9dace25b67f8d01de99a61816a9ffae753 Mon Sep 17 00:00:00 2001
From: Frederick Martian
Date: Tue, 24 Aug 2010 08:54:38 +0200
Subject: Added column in friends list to display the fact if they let us map
 them

---
 linden/indra/newview/llfloaterfriends.cpp               | 17 +++++++++++++++++
 linden/indra/newview/llfloaterfriends.h                 |  2 ++
 .../newview/skins/default/xui/de/panel_friends.xml      |  2 ++
 .../newview/skins/default/xui/en-us/panel_friends.xml   |  2 ++
 4 files changed, 23 insertions(+)

diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index d7b00d6..e18e705 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -265,6 +265,18 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
 	edit_my_object_column["type"] = "checkbox";
 	edit_my_object_column["value"] = relationInfo->isRightGrantedTo(LLRelationship::GRANT_MODIFY_OBJECTS);
 
+//	LLSD& online_their_column = element["columns"][LIST_VISIBLE_ONLINE_THEIRS];
+//	online_their_column["column"] = "icon_visible_online_theirs";
+//	online_their_column["type"] = "checkbox";
+//	online_their_column["enabled"] = "";
+//	online_their_column["value"] = relationInfo->isRightGrantedFrom(LLRelationship::GRANT_ONLINE_STATUS);
+
+	LLSD& map_their_column = element["columns"][LIST_VISIBLE_MAP_THEIRS];
+	map_their_column["column"] = "icon_visible_map_theirs";
+	map_their_column["type"] = "checkbox";
+	map_their_column["enabled"] = "";
+	map_their_column["value"] = relationInfo->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION);
+
 	LLSD& edit_their_object_column = element["columns"][LIST_EDIT_THEIRS];
 	edit_their_object_column["column"] = "icon_edit_theirs";
 	edit_their_object_column["type"] = "checkbox";
@@ -313,6 +325,11 @@ BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh
 	itemp->getColumn(LIST_VISIBLE_ONLINE)->setValue(info->isRightGrantedTo(LLRelationship::GRANT_ONLINE_STATUS));
 	itemp->getColumn(LIST_VISIBLE_MAP)->setValue(info->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION));
 	itemp->getColumn(LIST_EDIT_MINE)->setValue(info->isRightGrantedTo(LLRelationship::GRANT_MODIFY_OBJECTS));
+
+//	itemp->getColumn(LIST_VISIBLE_ONLINE_THEIRS)->setValue(info->isRightGrantedFrom(LLRelationship::GRANT_ONLINE_STATUS));
+	itemp->getColumn(LIST_VISIBLE_MAP_THEIRS)->setValue(info->isRightGrantedFrom(LLRelationship::GRANT_MAP_LOCATION));
+	itemp->getColumn(LIST_EDIT_THEIRS)->setValue(info->isRightGrantedFrom(LLRelationship::GRANT_MODIFY_OBJECTS));
+
 	S32 change_generation = have_name ? info->getChangeSerialNum() : -1;
 	itemp->getColumn(LIST_FRIEND_UPDATE_GEN)->setValue(change_generation);
 
diff --git a/linden/indra/newview/llfloaterfriends.h b/linden/indra/newview/llfloaterfriends.h
index a5c94ee..f7f0b32 100644
--- a/linden/indra/newview/llfloaterfriends.h
+++ b/linden/indra/newview/llfloaterfriends.h
@@ -92,6 +92,8 @@ private:
 		LIST_VISIBLE_ONLINE,
 		LIST_VISIBLE_MAP,
 		LIST_EDIT_MINE,
+//		LIST_VISIBLE_ONLINE_THEIRS,
+		LIST_VISIBLE_MAP_THEIRS,
 		LIST_EDIT_THEIRS,
 		LIST_FRIEND_UPDATE_GEN
 	};
diff --git a/linden/indra/newview/skins/default/xui/de/panel_friends.xml b/linden/indra/newview/skins/default/xui/de/panel_friends.xml
index bb2adb3..cd56366 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_friends.xml
@@ -11,6 +11,8 @@
 		<column name="icon_visible_map" tool_tip="Freund kann Sie auf der Karte finden" />
 		<column name="icon_edit_mine"
 		     tool_tip="Freunde können Objekte bearbeiten, löschen und an sich nehmen" />
+		<column name="icon_visible_map_theirs"
+		     tool_tip="Sie können den Freund auf der Karte finden" width="20" />
 		<column name="icon_edit_theirs"
 		     tool_tip="Sie können die Objekte dieses Freunds bearbeiten" />
 	</scroll_list>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
index bf7acd4..0854c99 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -17,6 +17,8 @@
 		     tool_tip="Friend can locate you on the map" width="20" />
 		<column image="ff_edit_mine_button.tga" name="icon_edit_mine"
 		     tool_tip="Friend can edit, delete or take objects" width="20" />
+		<column image="ff_visible_map_button.tga" name="icon_visible_map_theirs"
+		     tool_tip="You can  locate this friend on the map" width="20" />
 		<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
 		     tool_tip="You can edit this friend&apos;s objects" width="20" />
 		<column name="friend_last_update_generation" width="0" />
-- 
cgit v1.1