Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

2014-03-13 02:04:59 +01:00
parent 1732d6d427 ed8e37ed89
commit 08be65e649
31 changed files with 437 additions and 301 deletions
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -790,6 +790,17 @@
      <key>Value</key>
      <integer>0</integer>
    </map>
+    <key>LiruMiniBuildFloater</key>
+    <map>
+      <key>Comment</key>
+      <string>Whether or not the build tools floater is tinified (except in Land tool)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>0</boolean>
+    </map>
    <key>LiruMouselookHidesFloaters</key>
    <map>
      <key>Comment</key>