aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs4
3 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index cd2aa45..696967b 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -2426,7 +2426,7 @@ namespace OpenSim.Region.ScriptEngine.Common
2426 public static readonly vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0); 2426 public static readonly vector ZERO_VECTOR = new vector(0.0, 0.0, 0.0);
2427 public static readonly rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0); 2427 public static readonly rotation ZERO_ROTATION = new rotation(0.0, 0, 0.0, 1.0);
2428 2428
2429 // constants for llSetCameraParams 2429 // constants for llSetCameraParams
2430 public const int CAMERA_PITCH = 0; 2430 public const int CAMERA_PITCH = 0;
2431 public const int CAMERA_FOCUS_OFFSET = 1; 2431 public const int CAMERA_FOCUS_OFFSET = 1;
2432 public const int CAMERA_FOCUS_OFFSET_X = 2; 2432 public const int CAMERA_FOCUS_OFFSET_X = 2;
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 30093eb..baa781e 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -6924,7 +6924,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6924 6924
6925 // the object we are in 6925 // the object we are in
6926 LLUUID objectID = m_host.ParentUUID; 6926 LLUUID objectID = m_host.ParentUUID;
6927 if(objectID == LLUUID.Zero) return; 6927 if (objectID == LLUUID.Zero) return;
6928 6928
6929 // we need the permission first, to know which avatar we want to set the camera for 6929 // we need the permission first, to know which avatar we want to set the camera for
6930 LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; 6930 LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@@ -6934,16 +6934,16 @@ namespace OpenSim.Region.ScriptEngine.Common
6934 ScenePresence presence = World.GetScenePresence(agentID); 6934 ScenePresence presence = World.GetScenePresence(agentID);
6935 6935
6936 // we are not interested in child-agents 6936 // we are not interested in child-agents
6937 if(presence.IsChildAgent) return; 6937 if (presence.IsChildAgent) return;
6938 6938
6939 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 6939 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
6940 object[] data = rules.Data; 6940 object[] data = rules.Data;
6941 for(int i = 0; i < data.Length; ++i) { 6941 for (int i = 0; i < data.Length; ++i) {
6942 int type = Convert.ToInt32(data[i++]); 6942 int type = Convert.ToInt32(data[i++]);
6943 if(i >= data.Length) break; // odd number of entries => ignore the last 6943 if (i >= data.Length) break; // odd number of entries => ignore the last
6944 6944
6945 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 6945 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
6946 switch(type) { 6946 switch (type) {
6947 case BuiltIn_Commands_BaseClass.CAMERA_FOCUS: 6947 case BuiltIn_Commands_BaseClass.CAMERA_FOCUS:
6948 case BuiltIn_Commands_BaseClass.CAMERA_FOCUS_OFFSET: 6948 case BuiltIn_Commands_BaseClass.CAMERA_FOCUS_OFFSET:
6949 case BuiltIn_Commands_BaseClass.CAMERA_POSITION: 6949 case BuiltIn_Commands_BaseClass.CAMERA_POSITION:
@@ -6954,15 +6954,15 @@ namespace OpenSim.Region.ScriptEngine.Common
6954 break; 6954 break;
6955 default: 6955 default:
6956 // TODO: clean that up as soon as the implicit casts are in 6956 // TODO: clean that up as soon as the implicit casts are in
6957 if(data[i] is LSL_Types.LSLFloat) 6957 if (data[i] is LSL_Types.LSLFloat)
6958 parameters.Add(type, (float)((LSL_Types.LSLFloat)data[i]).value); 6958 parameters.Add(type, (float)((LSL_Types.LSLFloat)data[i]).value);
6959 else if(data[i] is LSL_Types.LSLInteger) 6959 else if (data[i] is LSL_Types.LSLInteger)
6960 parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value); 6960 parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value);
6961 else parameters.Add(type, Convert.ToSingle(data[i])); 6961 else parameters.Add(type, Convert.ToSingle(data[i]));
6962 break; 6962 break;
6963 } 6963 }
6964 } 6964 }
6965 if(parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters); 6965 if (parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters);
6966 } 6966 }
6967 6967
6968 public void llClearCameraParams() 6968 public void llClearCameraParams()
@@ -6975,7 +6975,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6975 6975
6976 // the object we are in 6976 // the object we are in
6977 LLUUID objectID = m_host.ParentUUID; 6977 LLUUID objectID = m_host.ParentUUID;
6978 if(objectID == LLUUID.Zero) return; 6978 if (objectID == LLUUID.Zero) return;
6979 6979
6980 // we need the permission first, to know which avatar we want to clear the camera for 6980 // we need the permission first, to know which avatar we want to clear the camera for
6981 LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; 6981 LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@@ -6985,7 +6985,7 @@ namespace OpenSim.Region.ScriptEngine.Common
6985 ScenePresence presence = World.GetScenePresence(agentID); 6985 ScenePresence presence = World.GetScenePresence(agentID);
6986 6986
6987 // we are not interested in child-agents 6987 // we are not interested in child-agents
6988 if(presence.IsChildAgent) return; 6988 if (presence.IsChildAgent) return;
6989 6989
6990 presence.ControllingClient.SendClearFollowCamProperties(objectID); 6990 presence.ControllingClient.SendClearFollowCamProperties(objectID);
6991 } 6991 }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
index dabb128..4969df0 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
@@ -158,8 +158,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
158 /// </summary> 158 /// </summary>
159 private void EventQueueThreadLoop() 159 private void EventQueueThreadLoop()
160 { 160 {
161 CultureInfo USCulture = new CultureInfo("en-US"); 161 CultureInfo USCulture = new CultureInfo("en-US");
162 Thread.CurrentThread.CurrentCulture = USCulture; 162 Thread.CurrentThread.CurrentCulture = USCulture;
163 163
164 //myScriptEngine.Log.Info("[" + ScriptEngineName + "]: EventQueueManager Worker thread spawned"); 164 //myScriptEngine.Log.Info("[" + ScriptEngineName + "]: EventQueueManager Worker thread spawned");
165 try 165 try