aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2009-02-23 10:36:16 +0000
committerJeff Ames2009-02-23 10:36:16 +0000
commitf175cb7e8cde5029eeb15f82dbe1613dc9f161c9 (patch)
treeecf38c3a7defae6431d8bd4f38d890bf7d1f2725 /OpenSim/Region
parent* Commenting out threaded Scene update for the moment. (diff)
downloadopensim-SC-f175cb7e8cde5029eeb15f82dbe1613dc9f161c9.zip
opensim-SC-f175cb7e8cde5029eeb15f82dbe1613dc9f161c9.tar.gz
opensim-SC-f175cb7e8cde5029eeb15f82dbe1613dc9f161c9.tar.bz2
opensim-SC-f175cb7e8cde5029eeb15f82dbe1613dc9f161c9.tar.xz
Update svn properties, add copyright headers, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3cf3038..36b9702 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -863,7 +863,7 @@ namespace OpenSim.Region.Framework.Scenes
863 ThreadTracker.Add(m_updateEntitiesThread); 863 ThreadTracker.Add(m_updateEntitiesThread);
864 } 864 }
865 865
866 if(m_updateEntitiesThread.ThreadState == ThreadState.Stopped) 866 if (m_updateEntitiesThread.ThreadState == ThreadState.Stopped)
867 m_updateEntitiesThread.Start(); 867 m_updateEntitiesThread.Start();
868 */ 868 */
869 m_sceneGraph.UpdateEntities(); 869 m_sceneGraph.UpdateEntities();
@@ -2131,7 +2131,7 @@ namespace OpenSim.Region.Framework.Scenes
2131 { 2131 {
2132 AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); 2132 AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode);
2133 2133
2134 if(aCircuit == null) 2134 if (aCircuit == null)
2135 { 2135 {
2136 m_log.DebugFormat("[APPEARANCE] Client did not supply a circuit. Non-Linden? Creating default appearance."); 2136 m_log.DebugFormat("[APPEARANCE] Client did not supply a circuit. Non-Linden? Creating default appearance.");
2137 appearance = new AvatarAppearance(client.AgentId); 2137 appearance = new AvatarAppearance(client.AgentId);
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 59d862d..5b851f6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -339,7 +339,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
339 compileScript = LSL_Converter.Convert(Script); 339 compileScript = LSL_Converter.Convert(Script);
340 340
341 // copy converter warnings into our warnings. 341 // copy converter warnings into our warnings.
342 foreach(string warning in LSL_Converter.GetWarnings()) 342 foreach (string warning in LSL_Converter.GetWarnings())
343 { 343 {
344 AddWarning(warning); 344 AddWarning(warning);
345 } 345 }