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

Merge branch 'AlericMaster' into V2Renderer

Browse Source 
Conflicts:
	indra/llcommon/aithreadsafe.h
	indra/newview/pipeline.cpp
This commit is contained in:
Shyotl
2011-05-20 12:56:23 -05:00
parent dff4e97c80 179885d120
commit 77f09744ab
190 changed files with 9247 additions and 3119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/app_settings/logcontrol.xml
View File

@@ -42,6 +42,15 @@
<array>
<string>ShaderLoading</string>
<string>Openjpeg</string>
<!-- Debug output about messages received from plugins: -->
<string>Plugin</string> <!-- Everything except what is listed below -->
<string>Plugin child</string> <!-- Plugin log messages from the plugin child process -->
<!--<string>PluginRaw</string>--> <!-- The raw LLSD data -->
<string>PluginRaw child</string> <!-- The raw LLSD data from the plugin child process -->
<!--<string>PluginHeartbeat</string>--> <!-- One second interval CPU usage reports -->
<!--<string>PluginUpdated</string>--> <!-- The mouse "updated" message -->
<!-- Debug output about messages sent to plugins: -->
<!--<string>PluginMouseEvent</string>--> <!-- Mouse event data sent to plugins -->
</array>
</map>
</array>

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

@@ -1952,7 +1952,7 @@
<key>PluginAttachDebuggerToPlugins</key>
<map>
<key>Comment</key>
<string>TODO: understand what this actually does -.-sg</string>
<string>Opens a terminal window with a debugger and attach it, every time a new SLPlugin process is started.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -12067,6 +12067,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>StateMachineMaxTime</key>
<map>
<key>Comment</key>
<string>Maximum time per frame spent executing AIStateMachine objects, in miliseconds</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>20</integer>
</map>
<key>StatsAutoRun</key>
<map>
<key>Comment</key>