Merge branch 'exp' of github.com:onefang/meta-impy into libotr

author: Jay Threeth 2011-04-05 03:09:17 -0700
committer: Jay Threeth 2011-04-05 03:09:17 -0700
commit: 7843f404157f43cb35f976e60438a4eace089ae1 (patch)
tree: d8deb6f999d8aeded128baca4e307916f2667866 /linden/indra/newview/app_settings/settings.xml
parent: Gui fix (diff)
parent: Shift the console up by a magic number to not cover the login panel. (diff)
download: meta-impy-7843f404157f43cb35f976e60438a4eace089ae1.zip
meta-impy-7843f404157f43cb35f976e60438a4eace089ae1.tar.gz
meta-impy-7843f404157f43cb35f976e60438a4eace089ae1.tar.bz2
meta-impy-7843f404157f43cb35f976e60438a4eace089ae1.tar.xz
1 files changed, 57 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index b7e7196..024296b 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -717,6 +717,17 @@
    <key>Value</key>
    <string>Random</string>
  </map>
+  <key>LastConnectedGrid</key>
+  <map>
+    <key>Comment</key>
+    <string>Last grid actually connected to</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string />
+  </map>
  <key>LastSelectedGrid</key>
  <map>
    <key>Comment</key>
@@ -2340,6 +2351,41 @@
    <key>Value</key>
    <integer>0</integer>
  </map>
+  <key>XMLRPCProxyAddress</key>
+  <map>
+    <key>Comment</key>
+    <string>Address for the XMLRPC Web Proxy</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string />
+  </map>
+  <key>XMLRPCProxyEnabled</key>
+  <map>
+    <key>Comment</key>
+    <string>Use XMLRPC Proxy</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>XMLRPCProxyPort</key>
+  <map>
+    <key>Comment</key>
+    <string>Port of the XMLRPC Proxy</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <integer>3128</integer>
+  </map>
  <key>AllowIdleAFK</key>
  <map>
    <key>Comment</key>
@@ -8080,6 +8126,17 @@
      <integer>100</integer>
    </array>
  </map>
+  <key>MediaFilterOnlyRemoteCommands</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether Media Filter should only filter actions initiated remotely</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
  <key>MediaOnAPrimUI</key>
  <map>
    <key>Comment</key>
author	Jay Threeth	2011-04-05 03:09:17 -0700
committer	Jay Threeth	2011-04-05 03:09:17 -0700
commit	7843f404157f43cb35f976e60438a4eace089ae1 (patch)
tree	d8deb6f999d8aeded128baca4e307916f2667866 /linden/indra/newview/app_settings/settings.xml
parent	Gui fix (diff)
parent	Shift the console up by a magic number to not cover the login panel. (diff)
download	meta-impy-7843f404157f43cb35f976e60438a4eace089ae1.zip meta-impy-7843f404157f43cb35f976e60438a4eace089ae1.tar.gz meta-impy-7843f404157f43cb35f976e60438a4eace089ae1.tar.bz2 meta-impy-7843f404157f43cb35f976e60438a4eace089ae1.tar.xz

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index b7e7196..024296b 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml
@@ -717,6 +717,17 @@
717	<key>Value</key>	717	<key>Value</key>
718	<string>Random</string>	718	<string>Random</string>
719	</map>	719	</map>
		720	<key>LastConnectedGrid</key>
		721	<map>
		722	<key>Comment</key>
		723	<string>Last grid actually connected to</string>
		724	<key>Persist</key>
		725	<integer>1</integer>
		726	<key>Type</key>
		727	<string>String</string>
		728	<key>Value</key>
		729	<string />
		730	</map>
720	<key>LastSelectedGrid</key>	731	<key>LastSelectedGrid</key>
721	<map>	732	<map>
722	<key>Comment</key>	733	<key>Comment</key>
@@ -2340,6 +2351,41 @@
2340	<key>Value</key>	2351	<key>Value</key>
2341	<integer>0</integer>	2352	<integer>0</integer>
2342	</map>	2353	</map>
		2354
		2355	<key>XMLRPCProxyAddress</key>
		2356	<map>
		2357	<key>Comment</key>
		2358	<string>Address for the XMLRPC Web Proxy</string>
		2359	<key>Persist</key>
		2360	<integer>1</integer>
		2361	<key>Type</key>
		2362	<string>String</string>
		2363	<key>Value</key>
		2364	<string />
		2365	</map>
		2366	<key>XMLRPCProxyEnabled</key>
		2367	<map>
		2368	<key>Comment</key>
		2369	<string>Use XMLRPC Proxy</string>
		2370	<key>Persist</key>
		2371	<integer>1</integer>
		2372	<key>Type</key>
		2373	<string>Boolean</string>
		2374	<key>Value</key>
		2375	<integer>0</integer>
		2376	</map>
		2377	<key>XMLRPCProxyPort</key>
		2378	<map>
		2379	<key>Comment</key>
		2380	<string>Port of the XMLRPC Proxy</string>
		2381	<key>Persist</key>
		2382	<integer>1</integer>
		2383	<key>Type</key>
		2384	<string>S32</string>
		2385	<key>Value</key>
		2386	<integer>3128</integer>
		2387	</map>
		2388
2343	<key>AllowIdleAFK</key>	2389	<key>AllowIdleAFK</key>
2344	<map>	2390	<map>
2345	<key>Comment</key>	2391	<key>Comment</key>
@@ -8080,6 +8126,17 @@
8080	<integer>100</integer>	8126	<integer>100</integer>
8081	</array>	8127	</array>
8082	</map>	8128	</map>
		8129	<key>MediaFilterOnlyRemoteCommands</key>
		8130	<map>
		8131	<key>Comment</key>
		8132	<string>Whether Media Filter should only filter actions initiated remotely</string>
		8133	<key>Persist</key>
		8134	<integer>1</integer>
		8135	<key>Type</key>
		8136	<string>Boolean</string>
		8137	<key>Value</key>
		8138	<integer>1</integer>
		8139	</map>
8083	<key>MediaOnAPrimUI</key>	8140	<key>MediaOnAPrimUI</key>
8084	<map>	8141	<map>
8085	<key>Comment</key>	8142	<key>Comment</key>