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/Environment/Scenes | |
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/Environment/Scenes')
7 files changed, 15 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 49ce341..efd258d 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -596,7 +596,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
596 | ScenePresence presence; | 596 | ScenePresence presence; |
597 | TryGetAvatar(remoteClient.AgentId, out presence); | 597 | TryGetAvatar(remoteClient.AgentId, out presence); |
598 | byte[] data = null; | 598 | byte[] data = null; |
599 | if(invType == 3 && presence != null) // libsecondlife.asset.assettype.landmark = 3 - needs to be turned into an enum | 599 | if (invType == 3 && presence != null) // libsecondlife.asset.assettype.landmark = 3 - needs to be turned into an enum |
600 | { | 600 | { |
601 | LLVector3 pos=presence.AbsolutePosition; | 601 | LLVector3 pos=presence.AbsolutePosition; |
602 | string strdata=String.Format("Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\n", | 602 | string strdata=String.Format("Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\n", |
@@ -996,7 +996,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
996 | permissionToDelete = false; //Just taking copy! | 996 | permissionToDelete = false; //Just taking copy! |
997 | 997 | ||
998 | } | 998 | } |
999 | else if(DeRezPacket.AgentBlock.Destination == 4) //Take | 999 | else if (DeRezPacket.AgentBlock.Destination == 4) //Take |
1000 | { | 1000 | { |
1001 | // Take | 1001 | // Take |
1002 | permissionToTake = ExternalChecks.ExternalChecksCanTakeObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); | 1002 | permissionToTake = ExternalChecks.ExternalChecksCanTakeObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); |
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index c9274dd..f922f1f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -452,7 +452,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
452 | d); | 452 | d); |
453 | } | 453 | } |
454 | 454 | ||
455 | public delegate void SendCloseChildAgentDelegate( LLUUID agentID, List<ulong> regionlst); | 455 | public delegate void SendCloseChildAgentDelegate(LLUUID agentID, List<ulong> regionlst); |
456 | 456 | ||
457 | /// <summary> | 457 | /// <summary> |
458 | /// This Closes child agents on neighboring regions | 458 | /// This Closes child agents on neighboring regions |
@@ -568,7 +568,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
568 | // assume local regions are always up | 568 | // assume local regions are always up |
569 | destRegionUp = true; | 569 | destRegionUp = true; |
570 | } | 570 | } |
571 | if(destRegionUp) | 571 | |
572 | if (destRegionUp) | ||
572 | { | 573 | { |
573 | avatar.Close(); | 574 | avatar.Close(); |
574 | 575 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs index 285ee0d..99d19df 100644 --- a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs +++ b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
51 | 51 | ||
52 | public void addCheckRezObject(CanRezObject delegateFunc) | 52 | public void addCheckRezObject(CanRezObject delegateFunc) |
53 | { | 53 | { |
54 | if(!CanRezObjectCheckFunctions.Contains(delegateFunc)) | 54 | if (!CanRezObjectCheckFunctions.Contains(delegateFunc)) |
55 | CanRezObjectCheckFunctions.Add(delegateFunc); | 55 | CanRezObjectCheckFunctions.Add(delegateFunc); |
56 | } | 56 | } |
57 | public void removeCheckRezObject(CanRezObject delegateFunc) | 57 | public void removeCheckRezObject(CanRezObject delegateFunc) |
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index 8603ccc..1f1f39f 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs | |||
@@ -313,7 +313,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
313 | { | 313 | { |
314 | foreach (Scene mscene in m_localScenes) | 314 | foreach (Scene mscene in m_localScenes) |
315 | { | 315 | { |
316 | if((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) && | 316 | if ((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) && |
317 | (mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port)) | 317 | (mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port)) |
318 | { | 318 | { |
319 | scene = mscene; | 319 | scene = mscene; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 1dbac52..9a9314c 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |||
@@ -263,7 +263,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
263 | { | 263 | { |
264 | foreach (TaskInventoryItem item in m_taskInventory.Values) | 264 | foreach (TaskInventoryItem item in m_taskInventory.Values) |
265 | { | 265 | { |
266 | if(item.Name == name) | 266 | if (item.Name == name) |
267 | return true; | 267 | return true; |
268 | } | 268 | } |
269 | return false; | 269 | return false; |
@@ -271,14 +271,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
271 | 271 | ||
272 | private string FindAvailableInventoryName(string name) | 272 | private string FindAvailableInventoryName(string name) |
273 | { | 273 | { |
274 | if(!InventoryContainsName(name)) | 274 | if (!InventoryContainsName(name)) |
275 | return name; | 275 | return name; |
276 | 276 | ||
277 | int suffix=1; | 277 | int suffix=1; |
278 | while(suffix < 256) | 278 | while (suffix < 256) |
279 | { | 279 | { |
280 | string tryName=String.Format("{0} {1}", name, suffix); | 280 | string tryName=String.Format("{0} {1}", name, suffix); |
281 | if(!InventoryContainsName(tryName)) | 281 | if (!InventoryContainsName(tryName)) |
282 | return tryName; | 282 | return tryName; |
283 | suffix++; | 283 | suffix++; |
284 | } | 284 | } |
@@ -296,7 +296,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
296 | item.ParentPartID = UUID; | 296 | item.ParentPartID = UUID; |
297 | 297 | ||
298 | string name=FindAvailableInventoryName(item.Name); | 298 | string name=FindAvailableInventoryName(item.Name); |
299 | if(name == String.Empty) | 299 | if (name == String.Empty) |
300 | return; | 300 | return; |
301 | 301 | ||
302 | item.Name=name; | 302 | item.Name=name; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 9502627..6c5a68d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -2049,7 +2049,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2049 | data[pos] = (byte)pTexAnim.SizeY; pos++; | 2049 | data[pos] = (byte)pTexAnim.SizeY; pos++; |
2050 | 2050 | ||
2051 | Helpers.FloatToBytes(pTexAnim.Start).CopyTo(data, pos); | 2051 | Helpers.FloatToBytes(pTexAnim.Start).CopyTo(data, pos); |
2052 | Helpers.FloatToBytes(pTexAnim.Length ).CopyTo(data, pos + 4); | 2052 | Helpers.FloatToBytes(pTexAnim.Length).CopyTo(data, pos + 4); |
2053 | Helpers.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8); | 2053 | Helpers.FloatToBytes(pTexAnim.Rate).CopyTo(data, pos + 8); |
2054 | 2054 | ||
2055 | m_TextureAnimation = data; | 2055 | m_TextureAnimation = data; |
@@ -2495,7 +2495,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2495 | (int) (color.x*0xff), | 2495 | (int) (color.x*0xff), |
2496 | (int) (color.y*0xff), | 2496 | (int) (color.y*0xff), |
2497 | (int) (color.z*0xff)); | 2497 | (int) (color.z*0xff)); |
2498 | SetText( text ); | 2498 | SetText(text); |
2499 | } | 2499 | } |
2500 | 2500 | ||
2501 | public int registerTargetWaypoint(LLVector3 target, float tolerance) | 2501 | public int registerTargetWaypoint(LLVector3 target, float tolerance) |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 6f0fbdf..2901a97 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1263,7 +1263,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1263 | //bool colliding = (m_physicsActor.IsColliding==true); | 1263 | //bool colliding = (m_physicsActor.IsColliding==true); |
1264 | //if (controlland) | 1264 | //if (controlland) |
1265 | // m_log.Info("[AGENT]: landCommand"); | 1265 | // m_log.Info("[AGENT]: landCommand"); |
1266 | //if (colliding ) | 1266 | //if (colliding) |
1267 | // m_log.Info("[AGENT]: colliding"); | 1267 | // m_log.Info("[AGENT]: colliding"); |
1268 | //if (m_physicsActor.Flying && colliding && controlland) | 1268 | //if (m_physicsActor.Flying && colliding && controlland) |
1269 | //{ | 1269 | //{ |