From f5ba6df4c2dc5a5e0842ed028dd4de01406dca3b Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Fri, 24 Jul 2009 16:20:15 +0000
Subject: svn merge -r 127369:127511
 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/landmark-permissions__merge__viewer2.0.0.3-r127280
 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
 includes post-merge fix for DEV-36563 : Remove mAcceptsCallingCardNames

For DEV-36496 : Viewer merge for Landmark & Callingcard Permissions [VIEWER]
For DEV-36563 : Remove mAcceptsCallingCardNames

Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various permissions operations - both on items in inventory, and rezzed items and items that are embedded in objects.
* Test creating landmarks.

Test plans - INTERNAL
* Test against any inventory permissions smoke tests.
* See test plans in QAR-1644 for full Landmark&Callingcard Permissions test plan.
---
 .../skins/default/xui/en/floater_about_land.xml    |  8 -------
 .../skins/default/xui/en/floater_bulk_perms.xml    | 28 ++++------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 0a4aa12faa..aec4de7e0d 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1232,14 +1232,6 @@ Only large parcels can be listed in search.
              tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."
              top="24"
              width="268" />
-            <check_box
-             height="16"
-             label="Create Landmarks"
-             layout="topleft"
-             left_delta="0"
-             name="check landmark"
-             top_pad="4"
-             width="268" />
             <check_box
              height="16"
              label="Fly"
diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
index 843a8848bf..0414ab5fa6 100644
--- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml
@@ -107,24 +107,6 @@
      name="check_gesture"
      top_delta="0"
      width="126" />
-    <icon
-     height="16"
-     image_name="inv_item_landmark_visited.tga"
-     layout="topleft"
-     left="12"
-     mouse_opaque="true"
-     name="icon_landmark"
-     top="134"
-     width="16" />
-    <check_box
-     control_name="BulkChangeIncludeLandmarks"
-     height="16"
-     label="Landmarks"
-     layout="topleft"
-     left_pad="2"
-     name="check_landmark"
-     top_delta="0"
-     width="126" />
     <icon
      height="16"
      image_name="inv_item_notecard.tga"
@@ -132,7 +114,7 @@
      left="12"
      mouse_opaque="true"
      name="icon_notecard"
-     top="154"
+     top="134"
      width="16" />
     <check_box
      control_name="BulkChangeIncludeNotecards"
@@ -150,7 +132,7 @@
      left="12"
      mouse_opaque="true"
      name="icon_object"
-     top="174"
+     top="154"
      width="16" />
     <check_box
      control_name="BulkChangeIncludeObjects"
@@ -168,7 +150,7 @@
      left="12"
      mouse_opaque="true"
      name="icon_script"
-     top="194"
+     top="174"
      width="16" />
     <check_box
      control_name="BulkChangeIncludeScripts"
@@ -186,7 +168,7 @@
      left="12"
      mouse_opaque="true"
      name="icon_sound"
-     top="214"
+     top="194"
      width="16" />
     <check_box
      control_name="BulkChangeIncludeSounds"
@@ -204,7 +186,7 @@
      left="12"
      mouse_opaque="true"
      name="icon_texture"
-     top="234"
+     top="214"
      width="16" />
     <check_box
      control_name="BulkChangeIncludeTextures"
-- 
cgit v1.2.3