diff options
author | John Hurliman | 2009-10-14 11:44:17 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-14 11:44:17 -0700 |
commit | 4b5a2f8c024b63f75b122916f6322f2f04d79f42 (patch) | |
tree | e4c3b1d086a70c6d50b91bca6f61a08b77b65188 /OpenSim/Services | |
parent | * Minimized the number of times textures are pulled off the priority queue (diff) | |
parent | Merge branch 'master' into htb-throttle (diff) | |
download | opensim-SC-4b5a2f8c024b63f75b122916f6322f2f04d79f42.zip opensim-SC-4b5a2f8c024b63f75b122916f6322f2f04d79f42.tar.gz opensim-SC-4b5a2f8c024b63f75b122916f6322f2f04d79f42.tar.bz2 opensim-SC-4b5a2f8c024b63f75b122916f6322f2f04d79f42.tar.xz |
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs | 1 | ||||
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs index 1004fb9..9878855 100644 --- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs | |||
@@ -299,6 +299,7 @@ namespace OpenSim.Services.Connectors.Inventory | |||
299 | 299 | ||
300 | if (StringToUrlAndUserID(id, out url, out userID)) | 300 | if (StringToUrlAndUserID(id, out url, out userID)) |
301 | { | 301 | { |
302 | //m_log.DebugFormat("[HGInventory CONNECTOR]: calling {0}", url); | ||
302 | ISessionAuthInventoryService connector = GetConnector(url); | 303 | ISessionAuthInventoryService connector = GetConnector(url); |
303 | return connector.QueryItem(userID, item, sessionID); | 304 | return connector.QueryItem(userID, item, sessionID); |
304 | } | 305 | } |
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 14560b1..e69e4cd 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -200,6 +200,12 @@ namespace OpenSim.Services.Interfaces | |||
200 | Maturity = ConvertFrom.RegionSettings.Maturity; | 200 | Maturity = ConvertFrom.RegionSettings.Maturity; |
201 | RegionSecret = ConvertFrom.regionSecret; | 201 | RegionSecret = ConvertFrom.regionSecret; |
202 | EstateOwner = ConvertFrom.EstateSettings.EstateOwner; | 202 | EstateOwner = ConvertFrom.EstateSettings.EstateOwner; |
203 | if (EstateOwner == UUID.Zero) | ||
204 | { | ||
205 | EstateOwner = ConvertFrom.MasterAvatarAssignedUUID; | ||
206 | ConvertFrom.EstateSettings.EstateOwner = EstateOwner; | ||
207 | ConvertFrom.EstateSettings.Save(); | ||
208 | } | ||
203 | } | 209 | } |
204 | 210 | ||
205 | public GridRegion(GridRegion ConvertFrom) | 211 | public GridRegion(GridRegion ConvertFrom) |