diff options
author | Melanie | 2009-10-15 21:14:13 +0100 |
---|---|---|
committer | Melanie | 2009-10-15 21:14:13 +0100 |
commit | 6deef7d0f3e9657bdc7bc4c41011dba15fea944b (patch) | |
tree | ffa84d5963afbb5390b132278c95df20b21681d5 /OpenSim/Services | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into h... (diff) | |
download | opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.zip opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.gz opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.bz2 opensim-SC_OLD-6deef7d0f3e9657bdc7bc4c41011dba15fea944b.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to '')
5 files changed, 22 insertions, 10 deletions
diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs index ebfd47a..df33db2 100644 --- a/OpenSim/Services/AssetService/AssetService.cs +++ b/OpenSim/Services/AssetService/AssetService.cs | |||
@@ -64,12 +64,17 @@ namespace OpenSim.Services.AssetService | |||
64 | string loaderArgs = assetConfig.GetString("AssetLoaderArgs", | 64 | string loaderArgs = assetConfig.GetString("AssetLoaderArgs", |
65 | String.Empty); | 65 | String.Empty); |
66 | 66 | ||
67 | m_log.InfoFormat("[ASSET]: Loading default asset set from {0}", loaderArgs); | 67 | bool assetLoaderEnabled = assetConfig.GetBoolean("AssetLoaderEnabled", true); |
68 | m_AssetLoader.ForEachDefaultXmlAsset(loaderArgs, | 68 | |
69 | delegate(AssetBase a) | 69 | if (assetLoaderEnabled) |
70 | { | 70 | { |
71 | Store(a); | 71 | m_log.InfoFormat("[ASSET]: Loading default asset set from {0}", loaderArgs); |
72 | }); | 72 | m_AssetLoader.ForEachDefaultXmlAsset(loaderArgs, |
73 | delegate(AssetBase a) | ||
74 | { | ||
75 | Store(a); | ||
76 | }); | ||
77 | } | ||
73 | 78 | ||
74 | m_log.Info("[ASSET CONNECTOR]: Local asset service enabled"); | 79 | m_log.Info("[ASSET CONNECTOR]: Local asset service enabled"); |
75 | } | 80 | } |
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 6f7c90f..ecda85a 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
@@ -298,7 +298,7 @@ namespace OpenSim.Services.Connectors | |||
298 | return; | 298 | return; |
299 | } | 299 | } |
300 | 300 | ||
301 | AssetBase asset = asset = m_Cache.Get(assetID.ToString()); | 301 | AssetBase asset = m_Cache.Get(assetID.ToString()); |
302 | 302 | ||
303 | if (asset == null) | 303 | if (asset == null) |
304 | { | 304 | { |
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/Connectors/User/UserServiceConnector.cs b/OpenSim/Services/Connectors/User/UserServiceConnector.cs index d418938..683990f 100644 --- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs +++ b/OpenSim/Services/Connectors/User/UserServiceConnector.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Services.Connectors | |||
45 | LogManager.GetLogger( | 45 | LogManager.GetLogger( |
46 | MethodBase.GetCurrentMethod().DeclaringType); | 46 | MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | private string m_ServerURI = String.Empty; | 48 | // private string m_ServerURI = String.Empty; |
49 | 49 | ||
50 | public UserServicesConnector() | 50 | public UserServicesConnector() |
51 | { | 51 | { |
@@ -53,7 +53,7 @@ namespace OpenSim.Services.Connectors | |||
53 | 53 | ||
54 | public UserServicesConnector(string serverURI) | 54 | public UserServicesConnector(string serverURI) |
55 | { | 55 | { |
56 | m_ServerURI = serverURI.TrimEnd('/'); | 56 | // m_ServerURI = serverURI.TrimEnd('/'); |
57 | } | 57 | } |
58 | 58 | ||
59 | public UserServicesConnector(IConfigSource source) | 59 | public UserServicesConnector(IConfigSource source) |
@@ -78,7 +78,7 @@ namespace OpenSim.Services.Connectors | |||
78 | m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService"); | 78 | m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService"); |
79 | throw new Exception("User connector init error"); | 79 | throw new Exception("User connector init error"); |
80 | } | 80 | } |
81 | m_ServerURI = serviceURI; | 81 | //m_ServerURI = serviceURI; |
82 | } | 82 | } |
83 | 83 | ||
84 | public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) | 84 | public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName) |
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) |