diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 54b95f7..1337143 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
243 | } | 243 | } |
244 | catch (Exception e) | 244 | catch (Exception e) |
245 | { | 245 | { |
246 | m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0}\n{1}", e.Message, e.StackTrace); | 246 | m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0} {1}", e.Message, e.StackTrace); |
247 | sp.ControllingClient.SendTeleportFailed("Internal error"); | 247 | sp.ControllingClient.SendTeleportFailed("Internal error"); |
248 | } | 248 | } |
249 | } | 249 | } |
@@ -983,7 +983,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
983 | /// </summary> | 983 | /// </summary> |
984 | public void EnableChildAgent(ScenePresence sp, GridRegion region) | 984 | public void EnableChildAgent(ScenePresence sp, GridRegion region) |
985 | { | 985 | { |
986 | m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighour {0}", region.RegionName); | 986 | m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighbour {0}", region.RegionName); |
987 | 987 | ||
988 | AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); | 988 | AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); |
989 | AgentCircuitData agent = sp.ControllingClient.RequestClientInfo(); | 989 | AgentCircuitData agent = sp.ControllingClient.RequestClientInfo(); |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index 34b8114..4565d10 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -55,6 +55,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
55 | } | 55 | } |
56 | 56 | ||
57 | private string m_ProfileServerURI; | 57 | private string m_ProfileServerURI; |
58 | private bool m_OutboundPermission; | ||
58 | 59 | ||
59 | // private bool m_Initialized = false; | 60 | // private bool m_Initialized = false; |
60 | 61 | ||
@@ -78,7 +79,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
78 | 79 | ||
79 | IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"]; | 80 | IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"]; |
80 | if (thisModuleConfig != null) | 81 | if (thisModuleConfig != null) |
82 | { | ||
81 | m_ProfileServerURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty); | 83 | m_ProfileServerURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty); |
84 | m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); | ||
85 | } | ||
82 | else | 86 | else |
83 | m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!"); | 87 | m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!"); |
84 | } | 88 | } |
@@ -103,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
103 | public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel) | 107 | public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel) |
104 | { | 108 | { |
105 | string userAssetServer = string.Empty; | 109 | string userAssetServer = string.Empty; |
106 | if (IsForeignUser(avatarID, out userAssetServer)) | 110 | if (IsForeignUser(avatarID, out userAssetServer) && m_OutboundPermission) |
107 | { | 111 | { |
108 | Util.FireAndForget(delegate { m_assMapper.Post(assetID, avatarID, userAssetServer); }); | 112 | Util.FireAndForget(delegate { m_assMapper.Post(assetID, avatarID, userAssetServer); }); |
109 | } | 113 | } |
@@ -197,7 +201,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
197 | if (IsForeignUser(sender, out userAssetServer)) | 201 | if (IsForeignUser(sender, out userAssetServer)) |
198 | m_assMapper.Get(item.AssetID, sender, userAssetServer); | 202 | m_assMapper.Get(item.AssetID, sender, userAssetServer); |
199 | 203 | ||
200 | if (IsForeignUser(receiver, out userAssetServer)) | 204 | if (IsForeignUser(receiver, out userAssetServer) && m_OutboundPermission) |
201 | m_assMapper.Post(item.AssetID, receiver, userAssetServer); | 205 | m_assMapper.Post(item.AssetID, receiver, userAssetServer); |
202 | } | 206 | } |
203 | 207 | ||