Merge branch 'next' of github.com:onefang/meta-impy into nextHEAD next

author: David Walter Seikel 2014-02-03 15:23:22 +1000
committer: David Walter Seikel 2014-02-03 15:23:22 +1000
commit: d056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree: 07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/newview/app_settings/settings.xml
parent: Updating tree and volume LOD. These go to eleven. (diff)
parent: Fix up OTR prefs to not crash. (diff)
download: meta-impy-next.zip
meta-impy-next.tar.gz
meta-impy-next.tar.bz2
meta-impy-next.tar.xz
1 files changed, 128 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e701c3e..5534ecc 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2,6 +2,123 @@
 <llsd>
 <map>
+  <!-- begin RC hacking -->
+        <key>PrimMediaMasterEnabled</key>
+        <map>
+                <key>Comment</key>
+                <string>Whether or not Media on a Prim is enabled.</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>1</integer>
+        </map>
+        <key>PrimMediaMaxRetries</key>
+        <map>
+                <key>Comment</key>
+                <string>Maximum number of retries for media queries.</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>U32</string>
+                <key>Value</key>
+                <integer>4</integer>
+        </map>
+        <key>PrimMediaRequestQueueDelay</key>
+        <map>
+                <key>Comment</key>
+                <string>Timer delay for fetching media from the queue (in seconds).</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>F32</string>
+                <key>Value</key>
+                <real>1.0</real>
+        </map>
+        <key>PrimMediaRetryTimerDelay</key>
+        <map>
+                <key>Comment</key>
+                <string>Timer delay for retrying on media queries (in seconds).</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>F32</string>
+                <key>Value</key>
+                <real>5.0</real>
+        </map>
+        <key>PrimMediaMaxSortedQueueSize</key>
+        <map>
+                <key>Comment</key>
+                <string>Maximum number of objects the viewer will load media for initially</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>U32</string>
+                <key>Value</key>
+                <integer>100000</integer>
+        </map>
+        <key>PrimMediaMaxRoundRobinQueueSize</key>
+        <map>
+                <key>Comment</key>
+                <string>Maximum number of objects the viewer will continuously update media for</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>U32</string>
+                <key>Value</key>
+                <integer>100000</integer>
+        </map>
+        <key>ShowMOAPRadar</key>
+        <map>
+                <key>Comment</key>
+                <string>Show the MOAP radar</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+        </map>
+        <key>FloaterMOAPRadarRect</key>
+        <map>
+                <key>Comment</key>
+                <string>Rectangle for MOAP Radar</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Rect</string>
+                <key>Value</key>
+                <array>
+                        <integer>0</integer>
+                        <integer>400</integer>
+                        <integer>200</integer>
+                        <integer>0</integer>
+                </array>
+        </map>
+        <key>MOAPRadarKeepOpen</key>
+        <map>
+                <key>Comment</key>
+                <string>Keeps MOAP radar updates running in background</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+        </map>
+        <key>MOAPRadarUpdateRate</key>
+        <map>
+                <key>Comment</key>
+                <string>MOAP Radar update rate (0 = high, 1 = medium, 2 = low)</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>U32</string>
+                <key>Value</key>
+                <integer>1</integer>
+        </map>
  <!-- BEGIN IMPRUDENCE-SPECIFIC SETTINGS -->
  
  <!-- begin Aurora-specific settings -->
@@ -14694,6 +14811,17 @@
        <real>1.0</real>
      </array>
    </map>
+        <key>moapbeacon</key>
+        <map>
+                <key>Comment</key>
+                <string>Beacon / Highlight MOAP sources</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+        </map>
    <key>particlesbeacon</key>
    <map>
      <key>Comment</key>
author	David Walter Seikel	2014-02-03 15:23:22 +1000
committer	David Walter Seikel	2014-02-03 15:23:22 +1000
commit	d056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree	07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/newview/app_settings/settings.xml
parent	Updating tree and volume LOD. These go to eleven. (diff)
parent	Fix up OTR prefs to not crash. (diff)
download	meta-impy-next.zip meta-impy-next.tar.gz meta-impy-next.tar.bz2 meta-impy-next.tar.xz

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index e701c3e..5534ecc 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml
@@ -2,6 +2,123 @@
2	<llsd>	2	<llsd>
3	<map>	3	<map>
4		4
		5	<!-- begin RC hacking -->
		6	<key>PrimMediaMasterEnabled</key>
		7	<map>
		8	<key>Comment</key>
		9	<string>Whether or not Media on a Prim is enabled.</string>
		10	<key>Persist</key>
		11	<integer>1</integer>
		12	<key>Type</key>
		13	<string>Boolean</string>
		14	<key>Value</key>
		15	<integer>1</integer>
		16	</map>
		17	<key>PrimMediaMaxRetries</key>
		18	<map>
		19	<key>Comment</key>
		20	<string>Maximum number of retries for media queries.</string>
		21	<key>Persist</key>
		22	<integer>1</integer>
		23	<key>Type</key>
		24	<string>U32</string>
		25	<key>Value</key>
		26	<integer>4</integer>
		27	</map>
		28	<key>PrimMediaRequestQueueDelay</key>
		29	<map>
		30	<key>Comment</key>
		31	<string>Timer delay for fetching media from the queue (in seconds).</string>
		32	<key>Persist</key>
		33	<integer>1</integer>
		34	<key>Type</key>
		35	<string>F32</string>
		36	<key>Value</key>
		37	<real>1.0</real>
		38	</map>
		39	<key>PrimMediaRetryTimerDelay</key>
		40	<map>
		41	<key>Comment</key>
		42	<string>Timer delay for retrying on media queries (in seconds).</string>
		43	<key>Persist</key>
		44	<integer>1</integer>
		45	<key>Type</key>
		46	<string>F32</string>
		47	<key>Value</key>
		48	<real>5.0</real>
		49	</map>
		50	<key>PrimMediaMaxSortedQueueSize</key>
		51	<map>
		52	<key>Comment</key>
		53	<string>Maximum number of objects the viewer will load media for initially</string>
		54	<key>Persist</key>
		55	<integer>1</integer>
		56	<key>Type</key>
		57	<string>U32</string>
		58	<key>Value</key>
		59	<integer>100000</integer>
		60	</map>
		61	<key>PrimMediaMaxRoundRobinQueueSize</key>
		62	<map>
		63	<key>Comment</key>
		64	<string>Maximum number of objects the viewer will continuously update media for</string>
		65	<key>Persist</key>
		66	<integer>1</integer>
		67	<key>Type</key>
		68	<string>U32</string>
		69	<key>Value</key>
		70	<integer>100000</integer>
		71	</map>
		72	<key>ShowMOAPRadar</key>
		73	<map>
		74	<key>Comment</key>
		75	<string>Show the MOAP radar</string>
		76	<key>Persist</key>
		77	<integer>1</integer>
		78	<key>Type</key>
		79	<string>Boolean</string>
		80	<key>Value</key>
		81	<integer>0</integer>
		82	</map>
		83	<key>FloaterMOAPRadarRect</key>
		84	<map>
		85	<key>Comment</key>
		86	<string>Rectangle for MOAP Radar</string>
		87	<key>Persist</key>
		88	<integer>1</integer>
		89	<key>Type</key>
		90	<string>Rect</string>
		91	<key>Value</key>
		92	<array>
		93	<integer>0</integer>
		94	<integer>400</integer>
		95	<integer>200</integer>
		96	<integer>0</integer>
		97	</array>
		98	</map>
		99	<key>MOAPRadarKeepOpen</key>
		100	<map>
		101	<key>Comment</key>
		102	<string>Keeps MOAP radar updates running in background</string>
		103	<key>Persist</key>
		104	<integer>1</integer>
		105	<key>Type</key>
		106	<string>Boolean</string>
		107	<key>Value</key>
		108	<integer>0</integer>
		109	</map>
		110	<key>MOAPRadarUpdateRate</key>
		111	<map>
		112	<key>Comment</key>
		113	<string>MOAP Radar update rate (0 = high, 1 = medium, 2 = low)</string>
		114	<key>Persist</key>
		115	<integer>1</integer>
		116	<key>Type</key>
		117	<string>U32</string>
		118	<key>Value</key>
		119	<integer>1</integer>
		120	</map>
		121
5	<!-- BEGIN IMPRUDENCE-SPECIFIC SETTINGS -->	122	<!-- BEGIN IMPRUDENCE-SPECIFIC SETTINGS -->
6		123
7	<!-- begin Aurora-specific settings -->	124	<!-- begin Aurora-specific settings -->
@@ -14694,6 +14811,17 @@
14694	<real>1.0</real>	14811	<real>1.0</real>
14695	</array>	14812	</array>
14696	</map>	14813	</map>
		14814	<key>moapbeacon</key>
		14815	<map>
		14816	<key>Comment</key>
		14817	<string>Beacon / Highlight MOAP sources</string>
		14818	<key>Persist</key>
		14819	<integer>1</integer>
		14820	<key>Type</key>
		14821	<string>Boolean</string>
		14822	<key>Value</key>
		14823	<integer>0</integer>
		14824	</map>
14697	<key>particlesbeacon</key>	14825	<key>particlesbeacon</key>
14698	<map>	14826	<map>
14699	<key>Comment</key>	14827	<key>Comment</key>