diff options
Diffstat (limited to 'OpenSim/Region/Environment')
4 files changed, 13 insertions, 13 deletions
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 | } |