diff options
author | Melanie | 2013-07-24 04:45:07 +0100 |
---|---|---|
committer | Melanie | 2013-07-24 04:45:07 +0100 |
commit | e82d4154a2e348e4a38f01cb1877878c94569bba (patch) | |
tree | 7b27e6d30d04f6089fd17d5779cfb0a81e50d508 /OpenSim/Region/CoreModules/Framework | |
parent | Merge branch 'master' into careminster (diff) | |
parent | For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what... (diff) | |
download | opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.zip opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.gz opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.bz2 opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 21 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index e0c8ea6..8f9800f 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 | } |
@@ -348,7 +351,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
348 | InventoryFolderBase root = m_Scene.InventoryService.GetRootFolder(client.AgentId); | 351 | InventoryFolderBase root = m_Scene.InventoryService.GetRootFolder(client.AgentId); |
349 | InventoryCollection content = m_Scene.InventoryService.GetFolderContent(client.AgentId, root.ID); | 352 | InventoryCollection content = m_Scene.InventoryService.GetFolderContent(client.AgentId, root.ID); |
350 | 353 | ||
351 | inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray()); | 354 | List<InventoryFolderBase> keep = new List<InventoryFolderBase>(); |
355 | |||
356 | foreach (InventoryFolderBase f in content.Folders) | ||
357 | { | ||
358 | if (f.Name != "My Suitcase" && f.Name != "Current Outfit") | ||
359 | keep.Add(f); | ||
360 | } | ||
361 | |||
362 | inv.SendBulkUpdateInventory(keep.ToArray(), content.Items.ToArray()); | ||
352 | } | 363 | } |
353 | } | 364 | } |
354 | } | 365 | } |
@@ -381,7 +392,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
381 | 392 | ||
382 | foreach (InventoryFolderBase f in content.Folders) | 393 | foreach (InventoryFolderBase f in content.Folders) |
383 | { | 394 | { |
384 | if (f.Name != "My Suitcase") | 395 | if (f.Name != "My Suitcase" && f.Name != "Current Outfit") |
385 | { | 396 | { |
386 | f.Name = f.Name + " (Unavailable)"; | 397 | f.Name = f.Name + " (Unavailable)"; |
387 | keep.Add(f); | 398 | keep.Add(f); |
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index a91adfa..53bd2e2 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -389,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
389 | } | 389 | } |
390 | 390 | ||
391 | names[0] = "Unknown"; | 391 | names[0] = "Unknown"; |
392 | names[1] = "UserUMMTGUN7"; | 392 | names[1] = "UserUMMTGUN8"; |
393 | 393 | ||
394 | return false; | 394 | return false; |
395 | } | 395 | } |
@@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
601 | // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or | 601 | // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or |
602 | // disappeared. | 602 | // disappeared. |
603 | user.FirstName = "Unknown"; | 603 | user.FirstName = "Unknown"; |
604 | user.LastName = "UserUMMAU3"; | 604 | user.LastName = "UserUMMAU4"; |
605 | } | 605 | } |
606 | 606 | ||
607 | AddUserInternal(user); | 607 | AddUserInternal(user); |