diff options
author | Justin Clarke Casey | 2009-04-29 18:11:41 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-29 18:11:41 +0000 |
commit | c320dca2db5c841976f5a36dab47cd3a8250c825 (patch) | |
tree | 4f52a315e0b3737aecd84cfc4f9a402fe9804a99 /OpenSim/Region | |
parent | * Make scene.oar the default oar target rather than scene.oar.tar.gz, in an a... (diff) | |
download | opensim-SC_OLD-c320dca2db5c841976f5a36dab47cd3a8250c825.zip opensim-SC_OLD-c320dca2db5c841976f5a36dab47cd3a8250c825.tar.gz opensim-SC_OLD-c320dca2db5c841976f5a36dab47cd3a8250c825.tar.bz2 opensim-SC_OLD-c320dca2db5c841976f5a36dab47cd3a8250c825.tar.xz |
* minor: remove some mono compiler warnings
Diffstat (limited to 'OpenSim/Region')
4 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index f0653b4..20d4e47 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -251,7 +251,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
251 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); | 251 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); |
252 | InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); | 252 | InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); |
253 | 253 | ||
254 | // Currently, creator and ownership both revert to the loader | ||
255 | Assert.That(foundItem.CreatorId, Is.EqualTo(user2Uuid.ToString())); | 254 | Assert.That(foundItem.CreatorId, Is.EqualTo(user2Uuid.ToString())); |
256 | Assert.That(foundItem.Owner, Is.EqualTo(userUuid)); | 255 | Assert.That(foundItem.Owner, Is.EqualTo(userUuid)); |
257 | 256 | ||
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs index 440765a..ce1fe2d 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | |||
@@ -39,8 +39,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid | |||
39 | { | 39 | { |
40 | public class HGWorldMapModule : WorldMapModule | 40 | public class HGWorldMapModule : WorldMapModule |
41 | { | 41 | { |
42 | private static readonly ILog m_log = | 42 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
44 | 43 | ||
45 | #region INonSharedRegionModule Members | 44 | #region INonSharedRegionModule Members |
46 | 45 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 513d169..f7001ef 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
59 | private static readonly ILog m_log = | 59 | private static readonly ILog m_log = |
60 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 60 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
61 | 61 | ||
62 | private const bool UseProxy = false; | 62 | private bool UseProxy = false; |
63 | 63 | ||
64 | // Capability string prefixes | 64 | // Capability string prefixes |
65 | private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; | 65 | private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; |
@@ -598,7 +598,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
598 | 598 | ||
599 | string auth_token = (string)requestBody["auth_token"]; | 599 | string auth_token = (string)requestBody["auth_token"]; |
600 | string[] auth_tokenvals = auth_token.Split(':'); | 600 | string[] auth_tokenvals = auth_token.Split(':'); |
601 | string username = auth_tokenvals[0]; | 601 | //string username = auth_tokenvals[0]; |
602 | int strcount = 0; | 602 | int strcount = 0; |
603 | 603 | ||
604 | string[] ids = new string[strcount]; | 604 | string[] ids = new string[strcount]; |
@@ -667,7 +667,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
667 | 667 | ||
668 | Hashtable requestBody = parseRequestBody((string)request["body"]); | 668 | Hashtable requestBody = parseRequestBody((string)request["body"]); |
669 | 669 | ||
670 | string pwd = (string) requestBody["pwd"]; | 670 | //string pwd = (string) requestBody["pwd"]; |
671 | string userid = (string) requestBody["userid"]; | 671 | string userid = (string) requestBody["userid"]; |
672 | 672 | ||
673 | string avatarName = string.Empty; | 673 | string avatarName = string.Empty; |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs index 27cffd6..23dd52d 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs | |||
@@ -228,7 +228,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
228 | public GroupRecord GetGroupRecord(UUID GroupID, string GroupName) | 228 | public GroupRecord GetGroupRecord(UUID GroupID, string GroupName) |
229 | { | 229 | { |
230 | Hashtable param = new Hashtable(); | 230 | Hashtable param = new Hashtable(); |
231 | if ((GroupID != null) && (GroupID != UUID.Zero)) | 231 | if (GroupID != UUID.Zero) |
232 | { | 232 | { |
233 | param["GroupID"] = GroupID.ToString(); | 233 | param["GroupID"] = GroupID.ToString(); |
234 | } | 234 | } |