aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces
diff options
context:
space:
mode:
authorMelanie2010-01-10 22:41:42 +0000
committerMelanie2010-01-10 22:41:42 +0000
commit3c90d834eac382af5edf091e83aea1ffcce91792 (patch)
tree60662b0f13fab4e0d7a7ab93533e5e66edbecf68 /OpenSim/Services/Interfaces
parent* Last reference to CommsManager.UserProfileCacheService removed (diff)
downloadopensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.zip
opensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.tar.gz
opensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.tar.bz2
opensim-SC_OLD-3c90d834eac382af5edf091e83aea1ffcce91792.tar.xz
Remove all references to master avatar, replacing with estate owner where
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's region creation process.
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs6
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 5ea136f..cd27145 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -204,12 +204,6 @@ namespace OpenSim.Services.Interfaces
204 Maturity = ConvertFrom.RegionSettings.Maturity; 204 Maturity = ConvertFrom.RegionSettings.Maturity;
205 RegionSecret = ConvertFrom.regionSecret; 205 RegionSecret = ConvertFrom.regionSecret;
206 EstateOwner = ConvertFrom.EstateSettings.EstateOwner; 206 EstateOwner = ConvertFrom.EstateSettings.EstateOwner;
207 if (EstateOwner == UUID.Zero)
208 {
209 EstateOwner = ConvertFrom.MasterAvatarAssignedUUID;
210 ConvertFrom.EstateSettings.EstateOwner = EstateOwner;
211 ConvertFrom.EstateSettings.Save();
212 }
213 } 207 }
214 208
215 public GridRegion(GridRegion ConvertFrom) 209 public GridRegion(GridRegion ConvertFrom)