aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorJacek Antonelli2009-09-26 23:03:39 -0500
committerJacek Antonelli2009-09-26 23:03:59 -0500
commit5d5e6d47d1ca47daefa8342ad060529ca0b64787 (patch)
tree1b0152d6d73abe4471dfaee99d226bf4be8e4205 /linden/indra/newview/app_settings/settings.xml
parentRemoved the multiple accounts tip from grid manager. (diff)
parentMerge remote branch 'mccabe/1.2.0-next' into next (diff)
downloadmeta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.zip
meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.gz
meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.bz2
meta-impy-5d5e6d47d1ca47daefa8342ad060529ca0b64787.tar.xz
Merge branch 'gridmanager' into next
Diffstat (limited to 'linden/indra/newview/app_settings/settings.xml')
-rw-r--r--linden/indra/newview/app_settings/settings.xml16
1 files changed, 16 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index efe32e7..e9705de 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2776,6 +2776,22 @@
2776 <integer>0</integer> 2776 <integer>0</integer>
2777 </array> 2777 </array>
2778 </map> 2778 </map>
2779 <key>FloaterAnimationListRect</key>
2780 <map>
2781 <key>Comment</key>
2782 <string>Rectangle for Animation List</string>
2783 <key>Persist</key>
2784 <integer>1</integer>
2785 <key>Type</key>
2786 <string>Rect</string>
2787 <key>Value</key>
2788 <array>
2789 <integer>0</integer>
2790 <integer>275</integer>
2791 <integer>1000</integer>
2792 <integer>0</integer>
2793 </array>
2794 </map>
2779 <key>FloaterAudioVolumeRect</key> 2795 <key>FloaterAudioVolumeRect</key>
2780 <map> 2796 <map>
2781 <key>Comment</key> 2797 <key>Comment</key>