diff options
author | Jeff Ames | 2008-09-09 01:26:48 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-09 01:26:48 +0000 |
commit | fae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch) | |
tree | 2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Region/Environment/Modules/World | |
parent | Fix state xxx within state xxx itself triggering a state "change" to (diff) | |
download | opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2 opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to '')
3 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs index a59148b..4a51398 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -176,8 +176,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
176 | /// within this object). | 176 | /// within this object). |
177 | /// </summary> | 177 | /// </summary> |
178 | /// <param name="sceneObject"></param> | 178 | /// <param name="sceneObject"></param> |
179 | /// <param name="assetUuids"></param> | 179 | /// <param name="assetUuids"></param> |
180 | protected void GetSceneObjectAssetUuids(UUID sceneObjectUuid, IDictionary<UUID, int> assetUuids) | 180 | protected void GetSceneObjectAssetUuids(UUID sceneObjectUuid, IDictionary<UUID, int> assetUuids) |
181 | { | 181 | { |
182 | AssetBase objectAsset = GetAsset(sceneObjectUuid); | 182 | AssetBase objectAsset = GetAsset(sceneObjectUuid); |
183 | 183 | ||
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs index 976a634..bec1300 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, UUID texture) | 122 | public void setEstateTerrainBaseTexture(IClientAPI remoteClient, int corner, UUID texture) |
123 | { | 123 | { |
124 | if(texture == UUID.Zero) | 124 | if (texture == UUID.Zero) |
125 | return; | 125 | return; |
126 | 126 | ||
127 | switch (corner) | 127 | switch (corner) |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 541ca18..8bf0d96 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -388,10 +388,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
388 | get { return 0; } | 388 | get { return 0; } |
389 | } | 389 | } |
390 | 390 | ||
391 | public ulong GetGroupPowers(UUID groupID) | 391 | public ulong GetGroupPowers(UUID groupID) |
392 | { | 392 | { |
393 | return 0; | 393 | return 0; |
394 | } | 394 | } |
395 | 395 | ||
396 | public virtual int NextAnimationSequenceNumber | 396 | public virtual int NextAnimationSequenceNumber |
397 | { | 397 | { |