Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

Browse Source 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp
This commit is contained in:
Shyotl
2012-02-24 13:21:59 -06:00
parent 5c66c70546 0bdf54e6d9
commit a6a69caa4f
177 changed files with 9551 additions and 2012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/app_settings/default_grids.xml
View File

@@ -2,15 +2,16 @@
<array>
<map>
<key>default_grids_version</key><string>2</string>
<key>default_grids_version</key><string>20</string>
</map>
<!-- Second Life -->
<map>
<key>gridnick</key><string>secondlife</string>
<key>gridname</key><string>Second Life</string>
<key>platform</key><string>SecondLife</string>
<key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
<key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
<key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
<key>helperuri</key><string>https://secondlife.com/helpers/</string>
<key>website</key><string>http://secondlife.com/</string>
<key>support</key><string>http://secondlife.com/support/</string>
@@ -18,30 +19,34 @@
<key>password</key><string>http://secondlife.com/account/request.php</string>
<key>render_compat</key><boolean>1</boolean>
<key>inventory_links</key><boolean>1</boolean>
<key>auto_update</key><boolean>0</boolean>
</map>
<map>
<key>gridnick</key><string>secondlife_beta</string>
<key>gridname</key><string>Second Life BETA</string>
<key>helperuri</key><string>http://aditi-secondlife.webdev.lindenlab.com/helpers/</string>
<key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
<key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
<key>loginuri</key><string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
<key>password</key><string>http://secondlife.com/account/request.php</string>
<key>platform</key><string>SecondLife</string>
<key>website</key><string>http://secondlife.com/</string>
<key>support</key><string>http://secondlife.com/support/</string>
<key>register</key><string>http://secondlife.com/registration/</string>
<key>render_compat</key><boolean>0</boolean>
<key>inventory_links</key><boolean>1</boolean>
<key>support</key><string>http://secondlife.com/support/</string>
<key>version</key><integer>0</integer>
<key>website</key><string>http://secondlife.com/</string>
<key>auto_update</key><boolean>0</boolean>
</map>
<!-- Local Host -->
<map>
<key>gridnick</key><string>local</string>
<key>gridname</key><string>Local Host</string>
<key>platform</key><string>OpenSim</string>
<key>loginuri</key><string>http://127.0.0.1:9000/</string>
<key>helperuri</key><string>http://127.0.0.1:9000/</string>
<key>auto_update</key><boolean>0</boolean>
</map>
</array>

37
indra/newview/app_settings/settings.xml
View File

@@ -8,6 +8,30 @@
<string>settings_sh.xml</string>
<string>settings_rlv.xml</string>
</array>
<key>SianaRenderDeferredInvisiprim</key>
<map>
<key>Comment</key>
<string>Support invisiprims in deferred mode</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SGAbsolutePointer</key>
<map>
<key>Comment</key>
<string>Support pen tablets and absolute pointer devices by disabling mouse wrapping</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>WaterPresetName</key>
<map>
@@ -4225,6 +4249,17 @@
<key>Value</key>
<integer>-1</integer>
</map>
<key>DebugStatModeMalloc</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>-1</integer>
</map>
<key>DebugStatModeFormattedMem</key>
<map>
<key>Comment</key>
@@ -8198,7 +8233,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
<integer>0</integer>
</map>
<key>MemoryPrivatePoolSize</key>
<map>

25
indra/newview/app_settings/settings_ascent.xml
View File

@@ -84,7 +84,7 @@
<key>AscentAutoCloseOOC</key>
<map>
<key>Comment</key>
<string>Auto-close OOC chat (i.e. add \"))\" if not found and \"((\" was used)</string>
<string>Auto-close OOC chat (i.e. add "))" if not found and "((" was used)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -150,7 +150,7 @@
<key>AscentShowSelfTagColor</key>
<map>
<key>Comment</key>
<string>Show your own tag</string>
<string>Show your own tagcolor to yourself(instead of default linden viewer color).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -293,7 +293,7 @@
<key>AscentShowIdleTime</key>
<map>
<key>Comment</key>
<string>Show client tags for others.</string>
<string>Show idle time of others in tags.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -403,7 +403,7 @@
<key>AscentBuildPrefs_PivotIsPercent</key>
<map>
<key>Comment</key>
<string>Would you like the chatbar to be able to be used for command line functions?</string>
<string>Pivot points are based on percentages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -414,7 +414,7 @@
<key>AscentBuildPrefs_PivotX</key>
<map>
<key>Comment</key>
<string>idfk</string>
<string>Pivot point on X-axis for new objects</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -425,7 +425,7 @@
<key>AscentBuildPrefs_PivotY</key>
<map>
<key>Comment</key>
<string>idfk</string>
<string>Pivot point on Y-axis for new objects</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -436,7 +436,7 @@
<key>AscentBuildPrefs_PivotZ</key>
<map>
<key>Comment</key>
<string>idfk</string>
<string>Pivot point on Z-axis for new objects</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -620,5 +620,16 @@
<key>Value</key>
<string>tp2</string>
</map>
<key>SinguCmdLineAway</key>
<map>
<key>Comment</key>
<string>Toggle Fake Away Status.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>/away</string>
</map>
</map>
</llsd>