aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2013-07-21 15:46:00 -0700
committerDiva Canto2013-07-23 14:28:53 -0700
commit7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931 (patch)
tree4f7452e9931ab5724da28df381b22975db1e6b51 /OpenSim/Region
parentImprove spacing between data and units on console stats display (diff)
downloadopensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.zip
opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.tar.gz
opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.tar.bz2
opensim-SC_OLD-7c1eb86c7df2e9c9ccfcf4fe6811af29adbef931.tar.xz
Don't post Link asset types back to the home grid
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs9
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs4
3 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index e0c8ea6..460d147 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -185,8 +185,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
185 } 185 }
186 } 186 }
187 187
188 public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel) 188 public void UploadInventoryItem(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel)
189 { 189 {
190 if (type == AssetType.Link)
191 return;
192
190 string userAssetServer = string.Empty; 193 string userAssetServer = string.Empty;
191 if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission) 194 if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission)
192 { 195 {
@@ -221,7 +224,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
221 { 224 {
222 UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data); 225 UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data);
223 226
224 UploadInventoryItem(remoteClient.AgentId, newAssetID, "", 0); 227 UploadInventoryItem(remoteClient.AgentId, AssetType.Unknown, newAssetID, "", 0);
225 228
226 return newAssetID; 229 return newAssetID;
227 } 230 }
@@ -232,7 +235,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
232 protected override void ExportAsset(UUID agentID, UUID assetID) 235 protected override void ExportAsset(UUID agentID, UUID assetID)
233 { 236 {
234 if (!assetID.Equals(UUID.Zero)) 237 if (!assetID.Equals(UUID.Zero))
235 UploadInventoryItem(agentID, assetID, "", 0); 238 UploadInventoryItem(agentID, AssetType.Unknown, assetID, "", 0);
236 else 239 else
237 m_log.Debug("[HGScene]: Scene.Inventory did not create asset"); 240 m_log.Debug("[HGScene]: Scene.Inventory did not create asset");
238 } 241 }
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 61b0ebd..39d7512 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -742,7 +742,7 @@ namespace OpenSim.Region.Framework.Scenes
742 public event OnIncomingSceneObjectDelegate OnIncomingSceneObject; 742 public event OnIncomingSceneObjectDelegate OnIncomingSceneObject;
743 public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so); 743 public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so);
744 744
745 public delegate void NewInventoryItemUploadComplete(UUID avatarID, UUID assetID, string name, int userlevel); 745 public delegate void NewInventoryItemUploadComplete(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel);
746 746
747 public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete; 747 public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete;
748 748
@@ -2146,7 +2146,7 @@ namespace OpenSim.Region.Framework.Scenes
2146 } 2146 }
2147 } 2147 }
2148 2148
2149 public void TriggerOnNewInventoryItemUploadComplete(UUID agentID, UUID AssetID, String AssetName, int userlevel) 2149 public void TriggerOnNewInventoryItemUploadComplete(UUID agentID, AssetType type, UUID AssetID, String AssetName, int userlevel)
2150 { 2150 {
2151 NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = OnNewInventoryItemUploadComplete; 2151 NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = OnNewInventoryItemUploadComplete;
2152 if (handlerNewInventoryItemUpdateComplete != null) 2152 if (handlerNewInventoryItemUpdateComplete != null)
@@ -2155,7 +2155,7 @@ namespace OpenSim.Region.Framework.Scenes
2155 { 2155 {
2156 try 2156 try
2157 { 2157 {
2158 d(agentID, AssetID, AssetName, userlevel); 2158 d(agentID, type, AssetID, AssetName, userlevel);
2159 } 2159 }
2160 catch (Exception e) 2160 catch (Exception e)
2161 { 2161 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 1e4d558..58fa18c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Framework.Scenes
139 { 139 {
140 userlevel = 1; 140 userlevel = 1;
141 } 141 }
142 EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, item.AssetID, item.Name, userlevel); 142 EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel);
143 143
144 return true; 144 return true;
145 } 145 }
@@ -178,7 +178,7 @@ namespace OpenSim.Region.Framework.Scenes
178 { 178 {
179 userlevel = 1; 179 userlevel = 1;
180 } 180 }
181 EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, item.AssetID, item.Name, userlevel); 181 EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel);
182 182
183 if (originalFolder != UUID.Zero) 183 if (originalFolder != UUID.Zero)
184 { 184 {