diff options
author | Jeff Ames | 2008-08-15 10:24:04 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-15 10:24:04 +0000 |
commit | dde21314e75acdaeff27af70077f283493401961 (patch) | |
tree | 490ab065895adb41ee4771fce623f99faa60b507 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | Fixes a case where, when inventory is not currently accessible due (diff) | |
download | opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.zip opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.gz opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.bz2 opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.xz |
Update svn properties, formatting cleanup, fix a couple compiler warnings.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 4e7e764..22251e9 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2122,10 +2122,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
2122 | LLVector3 homePostion = new LLVector3(UserProfile.HomeLocationX,UserProfile.HomeLocationY,UserProfile.HomeLocationZ); | 2122 | LLVector3 homePostion = new LLVector3(UserProfile.HomeLocationX,UserProfile.HomeLocationY,UserProfile.HomeLocationZ); |
2123 | LLVector3 homeLookat = new LLVector3(UserProfile.HomeLookAt); | 2123 | LLVector3 homeLookat = new LLVector3(UserProfile.HomeLookAt); |
2124 | ulong homeRegionHandle = UserProfile.HomeRegion; | 2124 | ulong homeRegionHandle = UserProfile.HomeRegion; |
2125 | if(homeRegionID == LLUUID.Zero) | 2125 | if (homeRegionID == LLUUID.Zero) |
2126 | { | 2126 | { |
2127 | RegionInfo info = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion); | 2127 | RegionInfo info = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion); |
2128 | if(info == null) | 2128 | if (info == null) |
2129 | { | 2129 | { |
2130 | // can't find the region: Tell viewer and abort | 2130 | // can't find the region: Tell viewer and abort |
2131 | client.SendTeleportFailed("Your home-region could not be found."); | 2131 | client.SendTeleportFailed("Your home-region could not be found."); |
@@ -2137,7 +2137,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2137 | else | 2137 | else |
2138 | { | 2138 | { |
2139 | RegionInfo info = CommsManager.GridService.RequestNeighbourInfo(homeRegionID); | 2139 | RegionInfo info = CommsManager.GridService.RequestNeighbourInfo(homeRegionID); |
2140 | if(info == null) | 2140 | if (info == null) |
2141 | { | 2141 | { |
2142 | // can't find the region: Tell viewer and abort | 2142 | // can't find the region: Tell viewer and abort |
2143 | client.SendTeleportFailed("Your home-region could not be found."); | 2143 | client.SendTeleportFailed("Your home-region could not be found."); |
@@ -2762,7 +2762,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2762 | public void RequestTeleportLandmark(IClientAPI remoteClient, LLUUID regionID, LLVector3 position) | 2762 | public void RequestTeleportLandmark(IClientAPI remoteClient, LLUUID regionID, LLVector3 position) |
2763 | { | 2763 | { |
2764 | RegionInfo info = CommsManager.GridService.RequestNeighbourInfo(regionID); | 2764 | RegionInfo info = CommsManager.GridService.RequestNeighbourInfo(regionID); |
2765 | if(info == null) | 2765 | if (info == null) |
2766 | { | 2766 | { |
2767 | // can't find the region: Tell viewer and abort | 2767 | // can't find the region: Tell viewer and abort |
2768 | remoteClient.SendTeleportFailed("The teleport destination could not be found."); | 2768 | remoteClient.SendTeleportFailed("The teleport destination could not be found."); |
@@ -3518,10 +3518,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
3518 | // their scripts will actually run. | 3518 | // their scripts will actually run. |
3519 | // -- Leaf, Tue Aug 12 14:17:05 EDT 2008 | 3519 | // -- Leaf, Tue Aug 12 14:17:05 EDT 2008 |
3520 | SceneObjectPart parent = part.ParentGroup.RootPart; | 3520 | SceneObjectPart parent = part.ParentGroup.RootPart; |
3521 | if( parent != null && parent.IsAttachment ) | 3521 | if (parent != null && parent.IsAttachment) |
3522 | return scriptDanger(parent, parent.GetWorldPosition() ); | 3522 | return scriptDanger(parent, parent.GetWorldPosition()); |
3523 | else | 3523 | else |
3524 | return scriptDanger(part, part.GetWorldPosition() ); | 3524 | return scriptDanger(part, part.GetWorldPosition()); |
3525 | } | 3525 | } |
3526 | else | 3526 | else |
3527 | { | 3527 | { |