aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLEstateData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteEstateData.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs16
-rw-r--r--OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs12
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs16
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs12
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs10
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandObject.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs8
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs8
-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
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs20
-rw-r--r--OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs16
19 files changed, 82 insertions, 82 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
index 270a8c7..41319ea 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
@@ -212,7 +212,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
212 /// </summary> 212 /// </summary>
213 private void loadTests() 213 private void loadTests()
214 { 214 {
215 lock(tests) 215 lock (tests)
216 { 216 {
217 if (!testsLoaded) 217 if (!testsLoaded)
218 { 218 {
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 07f4c10..70b6d3c 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -744,9 +744,9 @@ namespace OpenSim.Data.MySQL
744 DataRow row = rawsettings[0]; 744 DataRow row = rawsettings[0];
745 745
746 RegionSettings newSettings = buildRegionSettings(row); 746 RegionSettings newSettings = buildRegionSettings(row);
747 newSettings.OnSave += StoreRegionSettings; 747 newSettings.OnSave += StoreRegionSettings;
748 748
749 return newSettings; 749 return newSettings;
750 } 750 }
751 } 751 }
752 752
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs
index e843457..8991e02 100644
--- a/OpenSim/Data/MySQL/MySQLEstateData.cs
+++ b/OpenSim/Data/MySQL/MySQLEstateData.cs
@@ -185,7 +185,7 @@ namespace OpenSim.Data.MySQL
185 else 185 else
186 m_FieldMap[name].SetValue(es, false); 186 m_FieldMap[name].SetValue(es, false);
187 } 187 }
188 else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID) 188 else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
189 { 189 {
190 LLUUID uuid = LLUUID.Zero; 190 LLUUID uuid = LLUUID.Zero;
191 191
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index 092f4d5..dc5ba5e 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Data.SQLite
109 else 109 else
110 m_FieldMap[name].SetValue(es, false); 110 m_FieldMap[name].SetValue(es, false);
111 } 111 }
112 else if(m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID) 112 else if (m_FieldMap[name].GetValue(es) is libsecondlife.LLUUID)
113 { 113 {
114 LLUUID uuid = LLUUID.Zero; 114 LLUUID uuid = LLUUID.Zero;
115 115
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 8d50c30..d7f0ed4 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -318,7 +318,7 @@ namespace OpenSim.Framework
318 318
319 ulong ActiveGroupPowers { get; } 319 ulong ActiveGroupPowers { get; }
320 320
321 ulong GetGroupPowers(LLUUID groupID); 321 ulong GetGroupPowers(LLUUID groupID);
322 322
323 string FirstName { get; } 323 string FirstName { get; }
324 324
diff --git a/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs b/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs
index a984173..1e73152 100644
--- a/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/FunSLUDP/LLClientView.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
115 protected LLUUID m_activeGroupID = LLUUID.Zero; 115 protected LLUUID m_activeGroupID = LLUUID.Zero;
116 protected string m_activeGroupName = String.Empty; 116 protected string m_activeGroupName = String.Empty;
117 protected ulong m_activeGroupPowers = 0; 117 protected ulong m_activeGroupPowers = 0;
118 protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>(); 118 protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>();
119 119
120 /* Instantiated Designated Event Delegates */ 120 /* Instantiated Designated Event Delegates */
121 //- used so we don't create new objects for each incoming packet and then toss it out later */ 121 //- used so we don't create new objects for each incoming packet and then toss it out later */
@@ -293,12 +293,12 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
293 get { return m_activeGroupPowers; } 293 get { return m_activeGroupPowers; }
294 } 294 }
295 295
296 public ulong GetGroupPowers(LLUUID groupID) 296 public ulong GetGroupPowers(LLUUID groupID)
297 { 297 {
298 if(m_groupPowers.ContainsKey(groupID)) 298 if (m_groupPowers.ContainsKey(groupID))
299 return m_groupPowers[groupID]; 299 return m_groupPowers[groupID];
300 return 0; 300 return 0;
301 } 301 }
302 302
303 /// <summary> 303 /// <summary>
304 /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. 304 /// This is a utility method used by single states to not duplicate kicks and blue card of death messages.
@@ -6291,7 +6291,7 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
6291 packet.ObjectData.ObjectID = objectID; 6291 packet.ObjectData.ObjectID = objectID;
6292 SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count]; 6292 SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count];
6293 uint idx = 0; 6293 uint idx = 0;
6294 foreach(KeyValuePair<int, float> pair in parameters) 6294 foreach (KeyValuePair<int, float> pair in parameters)
6295 { 6295 {
6296 SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock(); 6296 SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock();
6297 block.Type = pair.Key; 6297 block.Type = pair.Key;
diff --git a/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs
index 3a0d937..342dd5c 100644
--- a/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/FunSLUDP/LLPacketHandler.cs
@@ -248,12 +248,12 @@ namespace OpenSim.Region.ClientStack.FunSLUDP
248 248
249 private void AddAcks(ref Packet packet) 249 private void AddAcks(ref Packet packet)
250 { 250 {
251 // This packet type has shown to have issues with 251 // This packet type has shown to have issues with
252 // acks being appended to the payload, just don't send 252 // acks being appended to the payload, just don't send
253 // any with this packet type until libsl is fixed. 253 // any with this packet type until libsl is fixed.
254 // 254 //
255 if(packet is libsecondlife.Packets.ViewerEffectPacket) 255 if (packet is libsecondlife.Packets.ViewerEffectPacket)
256 return; 256 return;
257 257
258 // Add acks to outgoing packets 258 // Add acks to outgoing packets
259 // 259 //
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 93cb890..ec945cd 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
115 protected LLUUID m_activeGroupID = LLUUID.Zero; 115 protected LLUUID m_activeGroupID = LLUUID.Zero;
116 protected string m_activeGroupName = String.Empty; 116 protected string m_activeGroupName = String.Empty;
117 protected ulong m_activeGroupPowers = 0; 117 protected ulong m_activeGroupPowers = 0;
118 protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>(); 118 protected Dictionary<LLUUID,ulong> m_groupPowers = new Dictionary<LLUUID, ulong>();
119 119
120 /* Instantiated Designated Event Delegates */ 120 /* Instantiated Designated Event Delegates */
121 //- used so we don't create new objects for each incoming packet and then toss it out later */ 121 //- used so we don't create new objects for each incoming packet and then toss it out later */
@@ -293,12 +293,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
293 get { return m_activeGroupPowers; } 293 get { return m_activeGroupPowers; }
294 } 294 }
295 295
296 public ulong GetGroupPowers(LLUUID groupID) 296 public ulong GetGroupPowers(LLUUID groupID)
297 { 297 {
298 if(m_groupPowers.ContainsKey(groupID)) 298 if (m_groupPowers.ContainsKey(groupID))
299 return m_groupPowers[groupID]; 299 return m_groupPowers[groupID];
300 return 0; 300 return 0;
301 } 301 }
302 302
303 /// <summary> 303 /// <summary>
304 /// This is a utility method used by single states to not duplicate kicks and blue card of death messages. 304 /// This is a utility method used by single states to not duplicate kicks and blue card of death messages.
@@ -6292,7 +6292,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6292 packet.ObjectData.ObjectID = objectID; 6292 packet.ObjectData.ObjectID = objectID;
6293 SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count]; 6293 SetFollowCamPropertiesPacket.CameraPropertyBlock[] camPropBlock = new SetFollowCamPropertiesPacket.CameraPropertyBlock[parameters.Count];
6294 uint idx = 0; 6294 uint idx = 0;
6295 foreach(KeyValuePair<int, float> pair in parameters) 6295 foreach (KeyValuePair<int, float> pair in parameters)
6296 { 6296 {
6297 SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock(); 6297 SetFollowCamPropertiesPacket.CameraPropertyBlock block = new SetFollowCamPropertiesPacket.CameraPropertyBlock();
6298 block.Type = pair.Key; 6298 block.Type = pair.Key;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index e1a9678..b035150 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -248,12 +248,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
248 248
249 private void AddAcks(ref Packet packet) 249 private void AddAcks(ref Packet packet)
250 { 250 {
251 // This packet type has shown to have issues with 251 // This packet type has shown to have issues with
252 // acks being appended to the payload, just don't send 252 // acks being appended to the payload, just don't send
253 // any with this packet type until libsl is fixed. 253 // any with this packet type until libsl is fixed.
254 // 254 //
255 if(packet is libsecondlife.Packets.ViewerEffectPacket) 255 if (packet is libsecondlife.Packets.ViewerEffectPacket)
256 return; 256 return;
257 257
258 // Add acks to outgoing packets 258 // Add acks to outgoing packets
259 // 259 //
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 6b82994..1be587a 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
121 121
122 public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID texture) 122 public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, LLUUID texture)
123 { 123 {
124 if(texture == LLUUID.Zero) 124 if (texture == LLUUID.Zero)
125 return; 125 return;
126 126
127 switch (corner) 127 switch (corner)
@@ -761,10 +761,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
761 if (m_scene.RegionInfo.RegionSettings.Sandbox) 761 if (m_scene.RegionInfo.RegionSettings.Sandbox)
762 flags |= Simulator.RegionFlags.Sandbox; 762 flags |= Simulator.RegionFlags.Sandbox;
763 763
764 // Fudge these to always on, so the menu options activate 764 // Fudge these to always on, so the menu options activate
765 // 765 //
766 flags |= Simulator.RegionFlags.AllowLandmark; 766 flags |= Simulator.RegionFlags.AllowLandmark;
767 flags |= Simulator.RegionFlags.AllowSetHome; 767 flags |= Simulator.RegionFlags.AllowSetHome;
768 768
769 // TODO: SkipUpdateInterestList 769 // TODO: SkipUpdateInterestList
770 770
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
index 15a68c1..305e236 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandObject.cs
@@ -166,8 +166,8 @@ namespace OpenSim.Region.Environment.Modules.World.Land
166 if (estateModule != null) 166 if (estateModule != null)
167 regionFlags = estateModule.GetRegionFlags(); 167 regionFlags = estateModule.GetRegionFlags();
168 168
169 // In a perfect world, this would have worked. 169 // In a perfect world, this would have worked.
170 // 170 //
171// if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0) 171// if ((landData.Flags & (uint)Parcel.ParcelFlags.AllowLandmark) != 0)
172// regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark; 172// regionFlags |= (uint)Simulator.RegionFlags.AllowLandmark;
173// if (landData.OwnerID == remote_client.AgentId) 173// if (landData.OwnerID == remote_client.AgentId)
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 4c28361..e286d23 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -365,10 +365,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
365 get { return 0; } 365 get { return 0; }
366 } 366 }
367 367
368 public ulong GetGroupPowers(LLUUID groupID) 368 public ulong GetGroupPowers(LLUUID groupID)
369 { 369 {
370 return 0; 370 return 0;
371 } 371 }
372 372
373 public virtual int NextAnimationSequenceNumber 373 public virtual int NextAnimationSequenceNumber
374 { 374 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
index 0a16341..5c3eb7d 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainChannel.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
130 set 130 set
131 { 131 {
132 // Will "fix" terrain hole problems. Although not fantastically. 132 // Will "fix" terrain hole problems. Although not fantastically.
133 if(Double.IsNaN(value) || Double.IsInfinity(value)) 133 if (Double.IsNaN(value) || Double.IsInfinity(value))
134 return; 134 return;
135 135
136 if (map[x, y] != value) 136 if (map[x, y] != value)
@@ -231,4 +231,4 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
231 } 231 }
232 } 232 }
233 } 233 }
234} \ No newline at end of file 234}
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 9859dc2..2196dcc 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -277,10 +277,10 @@ namespace OpenSim.Region.Examples.SimpleModule
277 get { return 0; } 277 get { return 0; }
278 } 278 }
279 279
280 public ulong GetGroupPowers(LLUUID groupID) 280 public ulong GetGroupPowers(LLUUID groupID)
281 { 281 {
282 return 0; 282 return 0;
283 } 283 }
284 284
285 public virtual int NextAnimationSequenceNumber 285 public virtual int NextAnimationSequenceNumber
286 { 286 {
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
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 401a5ea..2a1efd4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6702,7 +6702,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6702 6702
6703 // the object we are in 6703 // the object we are in
6704 LLUUID objectID = m_host.ParentUUID; 6704 LLUUID objectID = m_host.ParentUUID;
6705 if(objectID == LLUUID.Zero) return; 6705 if (objectID == LLUUID.Zero) return;
6706 6706
6707 // we need the permission first, to know which avatar we want to set the camera for 6707 // we need the permission first, to know which avatar we want to set the camera for
6708 LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; 6708 LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@@ -6712,16 +6712,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6712 ScenePresence presence = World.GetScenePresence(agentID); 6712 ScenePresence presence = World.GetScenePresence(agentID);
6713 6713
6714 // we are not interested in child-agents 6714 // we are not interested in child-agents
6715 if(presence.IsChildAgent) return; 6715 if (presence.IsChildAgent) return;
6716 6716
6717 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); 6717 SortedDictionary<int, float> parameters = new SortedDictionary<int, float>();
6718 object[] data = rules.Data; 6718 object[] data = rules.Data;
6719 for(int i = 0; i < data.Length; ++i) { 6719 for (int i = 0; i < data.Length; ++i) {
6720 int type = Convert.ToInt32(data[i++]); 6720 int type = Convert.ToInt32(data[i++]);
6721 if(i >= data.Length) break; // odd number of entries => ignore the last 6721 if (i >= data.Length) break; // odd number of entries => ignore the last
6722 6722
6723 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) 6723 // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3)
6724 switch(type) { 6724 switch (type) {
6725 case ScriptBaseClass.CAMERA_FOCUS: 6725 case ScriptBaseClass.CAMERA_FOCUS:
6726 case ScriptBaseClass.CAMERA_FOCUS_OFFSET: 6726 case ScriptBaseClass.CAMERA_FOCUS_OFFSET:
6727 case ScriptBaseClass.CAMERA_POSITION: 6727 case ScriptBaseClass.CAMERA_POSITION:
@@ -6732,15 +6732,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6732 break; 6732 break;
6733 default: 6733 default:
6734 // TODO: clean that up as soon as the implicit casts are in 6734 // TODO: clean that up as soon as the implicit casts are in
6735 if(data[i] is LSL_Types.LSLFloat) 6735 if (data[i] is LSL_Types.LSLFloat)
6736 parameters.Add(type, (float)((LSL_Types.LSLFloat)data[i]).value); 6736 parameters.Add(type, (float)((LSL_Types.LSLFloat)data[i]).value);
6737 else if(data[i] is LSL_Types.LSLInteger) 6737 else if (data[i] is LSL_Types.LSLInteger)
6738 parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value); 6738 parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value);
6739 else parameters.Add(type, Convert.ToSingle(data[i])); 6739 else parameters.Add(type, Convert.ToSingle(data[i]));
6740 break; 6740 break;
6741 } 6741 }
6742 } 6742 }
6743 if(parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters); 6743 if (parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters);
6744 } 6744 }
6745 6745
6746 public void llClearCameraParams() 6746 public void llClearCameraParams()
@@ -6753,7 +6753,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6753 6753
6754 // the object we are in 6754 // the object we are in
6755 LLUUID objectID = m_host.ParentUUID; 6755 LLUUID objectID = m_host.ParentUUID;
6756 if(objectID == LLUUID.Zero) return; 6756 if (objectID == LLUUID.Zero) return;
6757 6757
6758 // we need the permission first, to know which avatar we want to clear the camera for 6758 // we need the permission first, to know which avatar we want to clear the camera for
6759 LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; 6759 LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter;
@@ -6763,7 +6763,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6763 ScenePresence presence = World.GetScenePresence(agentID); 6763 ScenePresence presence = World.GetScenePresence(agentID);
6764 6764
6765 // we are not interested in child-agents 6765 // we are not interested in child-agents
6766 if(presence.IsChildAgent) return; 6766 if (presence.IsChildAgent) return;
6767 6767
6768 presence.ControllingClient.SendClearFollowCamProperties(objectID); 6768 presence.ControllingClient.SendClearFollowCamProperties(objectID);
6769 } 6769 }
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
index 427390b..a6b07bf 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
@@ -1401,7 +1401,7 @@ default
1401{ 1401{
1402 state_entry() 1402 state_entry()
1403 { 1403 {
1404 while(1<0); 1404 while (1<0);
1405 } 1405 }
1406}"; 1406}";
1407 1407
@@ -1426,7 +1426,7 @@ default
1426 state_entry() 1426 state_entry()
1427 { 1427 {
1428 do; 1428 do;
1429 while(1<0); 1429 while (1<0);
1430 } 1430 }
1431}"; 1431}";
1432 1432
@@ -1451,7 +1451,7 @@ default
1451{ 1451{
1452 state_entry() 1452 state_entry()
1453 { 1453 {
1454 if(1<0); 1454 if (1<0);
1455 } 1455 }
1456}"; 1456}";
1457 1457
@@ -1475,7 +1475,7 @@ default
1475{ 1475{
1476 state_entry() 1476 state_entry()
1477 { 1477 {
1478 if(1<0); 1478 if (1<0);
1479 else; 1479 else;
1480 } 1480 }
1481}"; 1481}";
@@ -1502,7 +1502,7 @@ default
1502{ 1502{
1503 state_entry() 1503 state_entry()
1504 { 1504 {
1505 for(x = 4; 1<0; x += 2); 1505 for (x = 4; 1<0; x += 2);
1506 } 1506 }
1507}"; 1507}";
1508 1508
@@ -1528,13 +1528,13 @@ default
1528 { 1528 {
1529 integer x; 1529 integer x;
1530 1530
1531 while(x = 14) llOwnerSay(""x is: "" + (string) x); 1531 while (x = 14) llOwnerSay(""x is: "" + (string) x);
1532 1532
1533 if(x = 24) llOwnerSay(""x is: "" + (string) x); 1533 if (x = 24) llOwnerSay(""x is: "" + (string) x);
1534 1534
1535 do 1535 do
1536 llOwnerSay(""x is: "" + (string) x); 1536 llOwnerSay(""x is: "" + (string) x);
1537 while(x = 44); 1537 while (x = 44);
1538 } 1538 }
1539}"; 1539}";
1540 1540