diff options
author | Jeff Ames | 2008-05-14 05:11:23 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-14 05:11:23 +0000 |
commit | c995d60d37032db3198b8496e186aa7a892dc7a8 (patch) | |
tree | 826147e66f61c812897d9b0acdb16ebfeb30d4d3 /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase | |
parent | * Added 3 warnings in response to the warnings. Adam, read the warnings. (diff) | |
download | opensim-SC-c995d60d37032db3198b8496e186aa7a892dc7a8.zip opensim-SC-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.gz opensim-SC-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.bz2 opensim-SC-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase')
4 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs index 1210b77..4311836 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/SensorRepeat.cs | |||
@@ -235,7 +235,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
235 | // dot=dot(forward_dir,obj_dir) | 235 | // dot=dot(forward_dir,obj_dir) |
236 | // mag_fwd = mag(forward_dir) | 236 | // mag_fwd = mag(forward_dir) |
237 | // mag_obj = mag(obj_dir) | 237 | // mag_obj = mag(obj_dir) |
238 | // ang = acos( dot /(mag_fwd*mag_obj)) | 238 | // ang = acos(dot /(mag_fwd*mag_obj)) |
239 | double ang_obj = 0; | 239 | double ang_obj = 0; |
240 | try | 240 | try |
241 | { | 241 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 214f7c9..f2afe0f 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | |||
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
76 | 76 | ||
77 | // TODO: HOOK ALL EVENTS UP TO SERVER! | 77 | // TODO: HOOK ALL EVENTS UP TO SERVER! |
78 | IMoneyModule money=myScriptEngine.World.RequestModuleInterface<IMoneyModule>(); | 78 | IMoneyModule money=myScriptEngine.World.RequestModuleInterface<IMoneyModule>(); |
79 | if(money != null) | 79 | if (money != null) |
80 | { | 80 | { |
81 | money.OnObjectPaid+=HandleObjectPaid; | 81 | money.OnObjectPaid+=HandleObjectPaid; |
82 | } | 82 | } |
@@ -91,7 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
91 | private void HandleObjectPaid(LLUUID objectID, LLUUID agentID, int amount) | 91 | private void HandleObjectPaid(LLUUID objectID, LLUUID agentID, int amount) |
92 | { | 92 | { |
93 | SceneObjectPart part=myScriptEngine.World.GetSceneObjectPart(objectID); | 93 | SceneObjectPart part=myScriptEngine.World.GetSceneObjectPart(objectID); |
94 | if(part != null) | 94 | if (part != null) |
95 | { | 95 | { |
96 | money(part.LocalId, agentID, amount); | 96 | money(part.LocalId, agentID, amount); |
97 | } | 97 | } |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index 3dbd88c..997f46f 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | |||
@@ -297,10 +297,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
297 | // Send inner exception | 297 | // Send inner exception |
298 | string[] lines=e.InnerException.ToString().Replace("\r", "").Split('\n'); | 298 | string[] lines=e.InnerException.ToString().Replace("\r", "").Split('\n'); |
299 | int line=0; | 299 | int line=0; |
300 | foreach(string t in lines) | 300 | foreach (string t in lines) |
301 | { | 301 | { |
302 | int idx=t.IndexOf("SecondLife.Script."); | 302 | int idx=t.IndexOf("SecondLife.Script."); |
303 | if(idx != -1) | 303 | if (idx != -1) |
304 | { | 304 | { |
305 | int colon=t.IndexOf(":"); | 305 | int colon=t.IndexOf(":"); |
306 | line=Convert.ToInt32(t.Substring(colon+1)); | 306 | line=Convert.ToInt32(t.Substring(colon+1)); |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 3320ddb..715e465 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | |||
@@ -182,7 +182,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
182 | if (DateTime.Now.Ticks - Last_ReReadConfigFilens > | 182 | if (DateTime.Now.Ticks - Last_ReReadConfigFilens > |
183 | m_ScriptEngine.RefreshConfigFilens) | 183 | m_ScriptEngine.RefreshConfigFilens) |
184 | { | 184 | { |
185 | //Console.WriteLine("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens ); | 185 | //Console.WriteLine("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens); |
186 | // Its time to re-read config file | 186 | // Its time to re-read config file |
187 | m_ScriptEngine.ReadConfig(); | 187 | m_ScriptEngine.ReadConfig(); |
188 | Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time | 188 | Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time |