aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSignpostMarv2012-10-23 15:29:40 +0100
committerJustin Clark-Casey (justincc)2012-10-26 02:08:00 +0100
commit18b1ee6f379f4d34f72a9056bf6cdf185311fd05 (patch)
treed66d2e8f14594d22d2ea5197fa00ee3475b8755a
parentminor: Add comment as to why we are pulcking plain old ints out of the LSL_Li... (diff)
downloadopensim-SC_OLD-18b1ee6f379f4d34f72a9056bf6cdf185311fd05.zip
opensim-SC_OLD-18b1ee6f379f4d34f72a9056bf6cdf185311fd05.tar.gz
opensim-SC_OLD-18b1ee6f379f4d34f72a9056bf6cdf185311fd05.tar.bz2
opensim-SC_OLD-18b1ee6f379f4d34f72a9056bf6cdf185311fd05.tar.xz
Formatting and casing correction in WorldCommModule, trailing new line in OSSL to get git diff to not complain
-rw-r--r--OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs6
-rw-r--r--OpenSim/Region/Framework/Interfaces/IWorldComm.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 8358bc0..c68ed6b 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -472,8 +472,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
472 472
473 if (coll.Count > 0) 473 if (coll.Count > 0)
474 { 474 {
475 // special case, called with same filter settings, return same handle 475 // special case, called with same filter settings, return same
476 // (2008-05-02, tested on 1.21.1 server, still holds) 476 // handle (2008-05-02, tested on 1.21.1 server, still holds)
477 return coll[0].GetHandle(); 477 return coll[0].GetHandle();
478 } 478 }
479 479
@@ -712,7 +712,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
712 } 712 }
713 } 713 }
714 714
715 public class ListenerInfo: IWorldCommListenerInfo 715 public class ListenerInfo : IWorldCommListenerInfo
716 { 716 {
717 private bool m_active; // Listener is active or not 717 private bool m_active; // Listener is active or not
718 private int m_handle; // Assigned handle of this listener 718 private int m_handle; // Assigned handle of this listener
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index 4e74781..8d88065 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Interfaces
60 /// the script during 'peek' time. Parameter hostID is needed to 60 /// the script during 'peek' time. Parameter hostID is needed to
61 /// determine the position of the script. 61 /// determine the position of the script.
62 /// </summary> 62 /// </summary>
63 /// <param name="localID">localID of the script engine</param> 63 /// <param name="LocalID">localID of the script engine</param>
64 /// <param name="itemID">UUID of the script engine</param> 64 /// <param name="itemID">UUID of the script engine</param>
65 /// <param name="hostID">UUID of the SceneObjectPart</param> 65 /// <param name="hostID">UUID of the SceneObjectPart</param>
66 /// <param name="channel">channel to listen on</param> 66 /// <param name="channel">channel to listen on</param>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 0811519..0650b90 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -3648,4 +3648,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3648 DropAttachmentAt(false, pos, rot); 3648 DropAttachmentAt(false, pos, rot);
3649 } 3649 }
3650 } 3650 }
3651} \ No newline at end of file 3651}