diff --git a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs index 213df5e0c6..6077298cad 100644 --- a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs +++ b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs @@ -314,25 +314,22 @@ namespace OpenSim.Grid.UserServer.Modules return UUID.Zero; } - private void UpdateAvatarAppearance(UUID avatarID, int wearableType, UUID itemID, UUID assetID) - { - AvatarAppearance appearance = GetAppearance(avatarID); + // TODO: unused + // private void UpdateAvatarAppearance(UUID avatarID, int wearableType, UUID itemID, UUID assetID) + // { + // AvatarAppearance appearance = GetAppearance(avatarID); + // appearance.Wearables[wearableType].AssetID = assetID; + // appearance.Wearables[wearableType].ItemID = itemID; + // m_userDataBaseService.UpdateUserAppearance(avatarID, appearance); + // } - appearance.Wearables[wearableType].AssetID = assetID; - appearance.Wearables[wearableType].ItemID = itemID; - - m_userDataBaseService.UpdateUserAppearance(avatarID, appearance); - } - - - private void UpdateAvatarAttachment(UUID avatarID, int attachmentPoint, UUID itemID, UUID assetID) - { - AvatarAppearance appearance = GetAppearance(avatarID); - - appearance.SetAttachment(attachmentPoint, itemID, assetID); - - m_userDataBaseService.UpdateUserAppearance(avatarID, appearance); - } + // TODO: unused + // private void UpdateAvatarAttachment(UUID avatarID, int attachmentPoint, UUID itemID, UUID assetID) + // { + // AvatarAppearance appearance = GetAppearance(avatarID); + // appearance.SetAttachment(attachmentPoint, itemID, assetID); + // m_userDataBaseService.UpdateUserAppearance(avatarID, appearance); + // } private void RemoveClothesAndAttachments(UUID avatarID) { @@ -354,29 +351,31 @@ namespace OpenSim.Grid.UserServer.Modules return appearance; } - private UUID FindFolderID(string name, List folders) - { - foreach (InventoryFolderBase folder in folders) - { - if (folder.Name == name) - { - return folder.ID; - } - } - return UUID.Zero; - } + // TODO: unused + // private UUID FindFolderID(string name, List folders) + // { + // foreach (InventoryFolderBase folder in folders) + // { + // if (folder.Name == name) + // { + // return folder.ID; + // } + // } + // return UUID.Zero; + // } - private InventoryFolderBase FindFolder(string name, List folders) - { - foreach (InventoryFolderBase folder in folders) - { - if (folder.Name == name) - { - return folder; - } - } - return null; - } + // TODO: unused + // private InventoryFolderBase FindFolder(string name, List folders) + // { + // foreach (InventoryFolderBase folder in folders) + // { + // if (folder.Name == name) + // { + // return folder; + // } + // } + // return null; + // } private InventoryFolderBase FindFolder(string name, Guid parentFolderID, List folders) { @@ -390,17 +389,18 @@ namespace OpenSim.Grid.UserServer.Modules return null; } - private InventoryItemBase GetItem(string itemName, List items) - { - foreach (InventoryItemBase item in items) - { - if (item.Name.ToLower() == itemName.ToLower()) - { - return item; - } - } - return null; - } + // TODO: unused + // private InventoryItemBase GetItem(string itemName, List items) + // { + // foreach (InventoryItemBase item in items) + // { + // if (item.Name.ToLower() == itemName.ToLower()) + // { + // return item; + // } + // } + // return null; + // } private List FindSubFolders(Guid parentFolderID, List folders) { diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs index 756c517af3..4224198da7 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs @@ -155,13 +155,14 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid } - private void Dump(Dictionary lst) - { - m_log.Debug("XXX -------- UUID DUMP ------- XXX"); - foreach (KeyValuePair kvp in lst) - m_log.Debug(" >> " + kvp.Key + " (texture? " + kvp.Value + ")"); - m_log.Debug("XXX -------- UUID DUMP ------- XXX"); - } + // TODO: unused + // private void Dump(Dictionary lst) + // { + // m_log.Debug("XXX -------- UUID DUMP ------- XXX"); + // foreach (KeyValuePair kvp in lst) + // m_log.Debug(" >> " + kvp.Key + " (texture? " + kvp.Value + ")"); + // m_log.Debug("XXX -------- UUID DUMP ------- XXX"); + // } #endregion diff --git a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs index 1feebe7f3f..aeca7b94e8 100644 --- a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs +++ b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs @@ -67,15 +67,14 @@ namespace OpenSim.Server.Handlers.Tests.Asset BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH); } - private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response) - { - AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); - - IAssetService assetDataPlugin = new TestAssetService(); - handler = new AssetServerGetHandler(assetDataPlugin); - - assetDataPlugin.Store(asset); - return asset; - } + // TODO: unused + // private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response) + // { + // AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); + // IAssetService assetDataPlugin = new TestAssetService(); + // handler = new AssetServerGetHandler(assetDataPlugin); + // assetDataPlugin.Store(asset); + // return asset; + // } } } \ No newline at end of file