Comment out unused private functions to avoid compiler warnings.

author: Jeff Ames 2009-06-04 01:37:31 +0000
committer: Jeff Ames 2009-06-04 01:37:31 +0000
commit: 2a855a6457307bd5a017272c745137c4a339e25a (patch)
tree: 26b53ff2b01be301c614168fa36ad60c1fbd9c5c /OpenSim/Grid
parent: Fix comparison of UUID with null. (diff)
download: opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.zip
opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.tar.gz
opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.tar.bz2
opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.tar.xz
1 files changed, 53 insertions, 53 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
index 213df5e..6077298 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)
+        // TODO: unused
-        {
+        // private void UpdateAvatarAppearance(UUID avatarID, int wearableType, UUID itemID, UUID assetID)
-            AvatarAppearance appearance = GetAppearance(avatarID);
+        // {
+        //     AvatarAppearance appearance = GetAppearance(avatarID);
-            appearance.Wearables[wearableType].AssetID = assetID;
+        //     appearance.Wearables[wearableType].AssetID = assetID;
-            appearance.Wearables[wearableType].ItemID = itemID;
+        //     appearance.Wearables[wearableType].ItemID = itemID;
+        //     m_userDataBaseService.UpdateUserAppearance(avatarID, appearance);
-            m_userDataBaseService.UpdateUserAppearance(avatarID, appearance);
+        // }
-        }
+        // TODO: unused
+        // private void UpdateAvatarAttachment(UUID avatarID, int attachmentPoint, UUID itemID, UUID assetID)
-        private void UpdateAvatarAttachment(UUID avatarID, int attachmentPoint, UUID itemID, UUID assetID)
+        // {
-        {
+        //     AvatarAppearance appearance = GetAppearance(avatarID);
-            AvatarAppearance appearance = GetAppearance(avatarID);
+        //     appearance.SetAttachment(attachmentPoint, itemID, assetID);
+        //     m_userDataBaseService.UpdateUserAppearance(avatarID, appearance);
-            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)
+        // TODO: unused
-        {
+        // private UUID FindFolderID(string name, List<InventoryFolderBase> folders)
-            foreach (InventoryFolderBase folder in folders)
+        // {
-            {
+        //     foreach (InventoryFolderBase folder in folders)
-                if (folder.Name == name)
+        //     {
-                {
+        //         if (folder.Name == name)
-                    return folder.ID;
+        //         {
-                }
+        //             return folder.ID;
-            }
+        //         }
-            return UUID.Zero;
+        //     }
-        }
+        //     return UUID.Zero;
+        // }
-        private InventoryFolderBase FindFolder(string name, List<InventoryFolderBase> folders)
-        {
+        // TODO: unused
-            foreach (InventoryFolderBase folder in folders)
+        // private InventoryFolderBase FindFolder(string name, List<InventoryFolderBase> folders)
-            {
+        // {
-                if (folder.Name == name)
+        //     foreach (InventoryFolderBase folder in folders)
-                {
+        //     {
-                    return folder;
+        //         if (folder.Name == name)
-                }
+        //         {
-            }
+        //             return folder;
-            return null;
+        //         }
-        }
+        //     }
+        //     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)
+        // TODO: unused
-        {
+        // private InventoryItemBase GetItem(string itemName, List<InventoryItemBase> items)
-            foreach (InventoryItemBase item in items)
+        // {
-            {
+        //     foreach (InventoryItemBase item in items)
-                if (item.Name.ToLower() == itemName.ToLower())
+        //     {
-                {
+        //         if (item.Name.ToLower() == itemName.ToLower())
-                    return item;
+        //         {
-                }
+        //             return item;
-            }
+        //         }
-            return null;
+        //     }
-        }
+        //     return null;
+        // }
        private List<InventoryFolderBase> FindSubFolders(Guid parentFolderID, List<InventoryFolderBase> folders)
        {
author	Jeff Ames	2009-06-04 01:37:31 +0000
committer	Jeff Ames	2009-06-04 01:37:31 +0000
commit	2a855a6457307bd5a017272c745137c4a339e25a (patch)
tree	26b53ff2b01be301c614168fa36ad60c1fbd9c5c /OpenSim/Grid
parent	Fix comparison of UUID with null. (diff)
download	opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.zip opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.tar.gz opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.tar.bz2 opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.tar.xz

diff --git a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs index 213df5e..6077298 100644 --- a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs +++ b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
@@ -314,25 +314,22 @@ namespace OpenSim.Grid.UserServer.Modules
314	return UUID.Zero;	314	return UUID.Zero;
315	}	315	}
316		316
317	private void UpdateAvatarAppearance(UUID avatarID, int wearableType, UUID itemID, UUID assetID)	317	// TODO: unused
318	{	318	// private void UpdateAvatarAppearance(UUID avatarID, int wearableType, UUID itemID, UUID assetID)
319	AvatarAppearance appearance = GetAppearance(avatarID);	319	// {
320		320	// AvatarAppearance appearance = GetAppearance(avatarID);
321	appearance.Wearables[wearableType].AssetID = assetID;	321	// appearance.Wearables[wearableType].AssetID = assetID;
322	appearance.Wearables[wearableType].ItemID = itemID;	322	// appearance.Wearables[wearableType].ItemID = itemID;
323		323	// m_userDataBaseService.UpdateUserAppearance(avatarID, appearance);
324	m_userDataBaseService.UpdateUserAppearance(avatarID, appearance);	324	// }
325	}	325
326		326	// TODO: unused
327		327	// private void UpdateAvatarAttachment(UUID avatarID, int attachmentPoint, UUID itemID, UUID assetID)
328	private void UpdateAvatarAttachment(UUID avatarID, int attachmentPoint, UUID itemID, UUID assetID)	328	// {
329	{	329	// AvatarAppearance appearance = GetAppearance(avatarID);
330	AvatarAppearance appearance = GetAppearance(avatarID);	330	// appearance.SetAttachment(attachmentPoint, itemID, assetID);
331		331	// m_userDataBaseService.UpdateUserAppearance(avatarID, appearance);
332	appearance.SetAttachment(attachmentPoint, itemID, assetID);	332	// }
333
334	m_userDataBaseService.UpdateUserAppearance(avatarID, appearance);
335	}
336		333
337	private void RemoveClothesAndAttachments(UUID avatarID)	334	private void RemoveClothesAndAttachments(UUID avatarID)
338	{	335	{
@@ -354,29 +351,31 @@ namespace OpenSim.Grid.UserServer.Modules
354	return appearance;	351	return appearance;
355	}	352	}
356		353
357	private UUID FindFolderID(string name, List<InventoryFolderBase> folders)	354	// TODO: unused
358	{	355	// private UUID FindFolderID(string name, List<InventoryFolderBase> folders)
359	foreach (InventoryFolderBase folder in folders)	356	// {
360	{	357	// foreach (InventoryFolderBase folder in folders)
361	if (folder.Name == name)	358	// {
362	{	359	// if (folder.Name == name)
363	return folder.ID;	360	// {
364	}	361	// return folder.ID;
365	}	362	// }
366	return UUID.Zero;	363	// }
367	}	364	// return UUID.Zero;
368		365	// }
369	private InventoryFolderBase FindFolder(string name, List<InventoryFolderBase> folders)	366
370	{	367	// TODO: unused
371	foreach (InventoryFolderBase folder in folders)	368	// private InventoryFolderBase FindFolder(string name, List<InventoryFolderBase> folders)
372	{	369	// {
373	if (folder.Name == name)	370	// foreach (InventoryFolderBase folder in folders)
374	{	371	// {
375	return folder;	372	// if (folder.Name == name)
376	}	373	// {
377	}	374	// return folder;
378	return null;	375	// }
379	}	376	// }
		377	// return null;
		378	// }
380		379
381	private InventoryFolderBase FindFolder(string name, Guid parentFolderID, List<InventoryFolderBase> folders)	380	private InventoryFolderBase FindFolder(string name, Guid parentFolderID, List<InventoryFolderBase> folders)
382	{	381	{
@@ -390,17 +389,18 @@ namespace OpenSim.Grid.UserServer.Modules
390	return null;	389	return null;
391	}	390	}
392		391
393	private InventoryItemBase GetItem(string itemName, List<InventoryItemBase> items)	392	// TODO: unused
394	{	393	// private InventoryItemBase GetItem(string itemName, List<InventoryItemBase> items)
395	foreach (InventoryItemBase item in items)	394	// {
396	{	395	// foreach (InventoryItemBase item in items)
397	if (item.Name.ToLower() == itemName.ToLower())	396	// {
398	{	397	// if (item.Name.ToLower() == itemName.ToLower())
399	return item;	398	// {
400	}	399	// return item;
401	}	400	// }
402	return null;	401	// }
403	}	402	// return null;
		403	// }
404		404
405	private List<InventoryFolderBase> FindSubFolders(Guid parentFolderID, List<InventoryFolderBase> folders)	405	private List<InventoryFolderBase> FindSubFolders(Guid parentFolderID, List<InventoryFolderBase> folders)
406	{	406	{