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

* minor: remove some mono compiler warnings

0.6.5-rc1
Justin Clarke Casey 2009-04-29 18:11:41 +00:00
parent 23aa85b75d
commit c320dca2db
6 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
View File

@ -62,7 +62,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
if (pos == -1) m_name = id; if (pos == -1) m_name = id;
else m_name = id.Substring(pos + 1); else m_name = id.Substring(pos + 1);
ExtensionNodeList list = AddinManager.GetExtensionNodes("/OpenSim/RegionModules"); //ExtensionNodeList list = AddinManager.GetExtensionNodes("/OpenSim/RegionModules");
// load all the (new) region-module classes // load all the (new) region-module classes
foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes("/OpenSim/RegionModules")) foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes("/OpenSim/RegionModules"))
{ {

5
OpenSim/Data/SQLite/SQLiteUserData.cs
View File

@ -61,7 +61,6 @@ namespace OpenSim.Data.SQLite
private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname"; private const string AvatarPickerAndSQL = "select * from users where username like :username and surname like :surname";
private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname"; private const string AvatarPickerOrSQL = "select * from users where username like :username or surname like :surname";
private Dictionary<UUID, AvatarAppearance> aplist = new Dictionary<UUID, AvatarAppearance>();
private DataSet ds; private DataSet ds;
private SqliteDataAdapter da; private SqliteDataAdapter da;
private SqliteDataAdapter daf; private SqliteDataAdapter daf;
@ -162,7 +161,6 @@ namespace OpenSim.Data.SQLite
daa.Dispose(); daa.Dispose();
daa = null; daa = null;
} }
aplist = null;
} }
/// <summary> /// <summary>
@ -659,7 +657,6 @@ namespace OpenSim.Data.SQLite
AvatarAppearance aa = new AvatarAppearance(user); AvatarAppearance aa = new AvatarAppearance(user);
//try { //try {
aa.Owner = user; aa.Owner = user;
//aplist[user] = appearance;
DataTable aap = ds.Tables["avatarappearance"]; DataTable aap = ds.Tables["avatarappearance"];
lock (ds) lock (ds)
@ -726,7 +723,6 @@ namespace OpenSim.Data.SQLite
} }
} }
// aa = aplist[user];
// m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString()); // m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
// } catch (KeyNotFoundException) { // } catch (KeyNotFoundException) {
// m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString()); // m_log.InfoFormat("[APPEARANCE] No appearance found for {0}", user.ToString());
@ -742,7 +738,6 @@ namespace OpenSim.Data.SQLite
override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance) override public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
{ {
appearance.Owner = user; appearance.Owner = user;
//aplist[user] = appearance;
DataTable aap = ds.Tables["avatarappearance"]; DataTable aap = ds.Tables["avatarappearance"];
lock (ds) lock (ds)
{ {

1
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
View File

@ -251,7 +251,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
= scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
// Currently, creator and ownership both revert to the loader
Assert.That(foundItem.CreatorId, Is.EqualTo(user2Uuid.ToString())); Assert.That(foundItem.CreatorId, Is.EqualTo(user2Uuid.ToString()));
Assert.That(foundItem.Owner, Is.EqualTo(userUuid)); Assert.That(foundItem.Owner, Is.EqualTo(userUuid));

3
OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
View File

@ -39,8 +39,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
{ {
public class HGWorldMapModule : WorldMapModule public class HGWorldMapModule : WorldMapModule
{ {
private static readonly ILog m_log = //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
#region INonSharedRegionModule Members #region INonSharedRegionModule Members

6
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private const bool UseProxy = false; private bool UseProxy = false;
// Capability string prefixes // Capability string prefixes
private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; private static readonly string m_parcelVoiceInfoRequestPath = "0007/";
@ -598,7 +598,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
string auth_token = (string)requestBody["auth_token"]; string auth_token = (string)requestBody["auth_token"];
string[] auth_tokenvals = auth_token.Split(':'); string[] auth_tokenvals = auth_token.Split(':');
string username = auth_tokenvals[0]; //string username = auth_tokenvals[0];
int strcount = 0; int strcount = 0;
string[] ids = new string[strcount]; string[] ids = new string[strcount];
@ -667,7 +667,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
Hashtable requestBody = parseRequestBody((string)request["body"]); Hashtable requestBody = parseRequestBody((string)request["body"]);
string pwd = (string) requestBody["pwd"]; //string pwd = (string) requestBody["pwd"];
string userid = (string) requestBody["userid"]; string userid = (string) requestBody["userid"];
string avatarName = string.Empty; string avatarName = string.Empty;

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs
View File

@ -228,7 +228,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
public GroupRecord GetGroupRecord(UUID GroupID, string GroupName) public GroupRecord GetGroupRecord(UUID GroupID, string GroupName)
{ {
Hashtable param = new Hashtable(); Hashtable param = new Hashtable();
if ((GroupID != null) && (GroupID != UUID.Zero)) if (GroupID != UUID.Zero)
{ {
param["GroupID"] = GroupID.ToString(); param["GroupID"] = GroupID.ToString();
} }