OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Comment out unused private functions to avoid compiler warnings.

0.6.6-post-fixes
Jeff Ames 2009-06-04 01:37:31 +00:00
parent 1e3f378c57
commit 2a855a6457
3 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
View File

@ -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<InventoryFolderBase> folders)
{
foreach (InventoryFolderBase folder in folders)
{
if (folder.Name == name)
{
return folder.ID;
}
}
return UUID.Zero;
}
// TODO: unused
// private UUID FindFolderID(string name, List<InventoryFolderBase> folders)
// {
// foreach (InventoryFolderBase folder in folders)
// {
// if (folder.Name == name)
// {
// return folder.ID;
// }
// }
// return UUID.Zero;
// }
private InventoryFolderBase FindFolder(string name, List<InventoryFolderBase> folders)
{
foreach (InventoryFolderBase folder in folders)
{
if (folder.Name == name)
{
return folder;
}
}
return null;
}
// TODO: unused
// private InventoryFolderBase FindFolder(string name, List<InventoryFolderBase> folders)
// {
// foreach (InventoryFolderBase folder in folders)
// {
// if (folder.Name == name)
// {
// return folder;
// }
// }
// return null;
// }
private InventoryFolderBase FindFolder(string name, Guid parentFolderID, List<InventoryFolderBase> folders)
{
@ -390,17 +389,18 @@ namespace OpenSim.Grid.UserServer.Modules
return null;
}
private InventoryItemBase GetItem(string itemName, List<InventoryItemBase> items)
{
foreach (InventoryItemBase item in items)
{
if (item.Name.ToLower() == itemName.ToLower())
{
return item;
}
}
return null;
}
// TODO: unused
// private InventoryItemBase GetItem(string itemName, List<InventoryItemBase> items)
// {
// foreach (InventoryItemBase item in items)
// {
// if (item.Name.ToLower() == itemName.ToLower())
// {
// return item;
// }
// }
// return null;
// }
private List<InventoryFolderBase> FindSubFolders(Guid parentFolderID, List<InventoryFolderBase> folders)
{

15
OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
View File

@ -155,13 +155,14 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
}
private void Dump(Dictionary<UUID, bool> lst)
{
m_log.Debug("XXX -------- UUID DUMP ------- XXX");
foreach (KeyValuePair<UUID, bool> kvp in lst)
m_log.Debug(" >> " + kvp.Key + " (texture? " + kvp.Value + ")");
m_log.Debug("XXX -------- UUID DUMP ------- XXX");
}
// TODO: unused
// private void Dump(Dictionary<UUID, bool> lst)
// {
// m_log.Debug("XXX -------- UUID DUMP ------- XXX");
// foreach (KeyValuePair<UUID, bool> kvp in lst)
// m_log.Debug(" >> " + kvp.Key + " (texture? " + kvp.Value + ")");
// m_log.Debug("XXX -------- UUID DUMP ------- XXX");
// }
#endregion

19
OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs
View File

@ -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;
// }
}
}