aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2009-06-04 01:37:31 +0000
committerJeff Ames2009-06-04 01:37:31 +0000
commit2a855a6457307bd5a017272c745137c4a339e25a (patch)
tree26b53ff2b01be301c614168fa36ad60c1fbd9c5c /OpenSim
parentFix comparison of UUID with null. (diff)
downloadopensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.zip
opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.tar.gz
opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.tar.bz2
opensim-SC_OLD-2a855a6457307bd5a017272c745137c4a339e25a.tar.xz
Comment out unused private functions to avoid compiler warnings.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs106
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs15
-rw-r--r--OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs19
3 files changed, 70 insertions, 70 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
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 {
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 756c517a..4224198 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
155 155
156 } 156 }
157 157
158 private void Dump(Dictionary<UUID, bool> lst) 158 // TODO: unused
159 { 159 // private void Dump(Dictionary<UUID, bool> lst)
160 m_log.Debug("XXX -------- UUID DUMP ------- XXX"); 160 // {
161 foreach (KeyValuePair<UUID, bool> kvp in lst) 161 // m_log.Debug("XXX -------- UUID DUMP ------- XXX");
162 m_log.Debug(" >> " + kvp.Key + " (texture? " + kvp.Value + ")"); 162 // foreach (KeyValuePair<UUID, bool> kvp in lst)
163 m_log.Debug("XXX -------- UUID DUMP ------- XXX"); 163 // m_log.Debug(" >> " + kvp.Key + " (texture? " + kvp.Value + ")");
164 } 164 // m_log.Debug("XXX -------- UUID DUMP ------- XXX");
165 // }
165 166
166 #endregion 167 #endregion
167 168
diff --git a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs
index 1feebe7..aeca7b9 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
67 BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH); 67 BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH);
68 } 68 }
69 69
70 private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response) 70 // TODO: unused
71 { 71 // private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response)
72 AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); 72 // {
73 73 // AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response);
74 IAssetService assetDataPlugin = new TestAssetService(); 74 // IAssetService assetDataPlugin = new TestAssetService();
75 handler = new AssetServerGetHandler(assetDataPlugin); 75 // handler = new AssetServerGetHandler(assetDataPlugin);
76 76 // assetDataPlugin.Store(asset);
77 assetDataPlugin.Store(asset); 77 // return asset;
78 return asset; 78 // }
79 }
80 } 79 }
81} \ No newline at end of file 80} \ No newline at end of file