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

* Remove lots of warnings from the CMS module 

* Remove a few other miscellaneous warnings
0.6.0-stable
Justin Clarke Casey 2008-09-06 00:09:24 +00:00
parent 0054bce5ae
commit de467f4903
8 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/MSSQL/MSSQLEstateData.cs
View File

@ -209,9 +209,9 @@ namespace OpenSim.Data.MSSQL
{ {
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
} }
catch (Exception Ex) catch (Exception e)
{ {
_Log.Debug("[ESTATE DB]: Error inserting regionID and EstateID in estate_map"); _Log.DebugFormat("[ESTATE DB]: Error inserting regionID and EstateID in estate_map: {0}", e);
} }
} }

1
OpenSim/Data/MSSQL/MSSQLRegionData.cs
View File

@ -548,7 +548,6 @@ namespace OpenSim.Data.MSSQL
while (readerLandData.Read()) while (readerLandData.Read())
{ {
LandData data = buildLandData(readerLandData); LandData data = buildLandData(readerLandData);
} }
} }
} }

2
OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs
View File

@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
//Scale size of particles to distance objects are apart (for better visibility) //Scale size of particles to distance objects are apart (for better visibility)
LLVector3 FromPos = From.GetWorldPosition(); LLVector3 FromPos = From.GetWorldPosition();
LLVector3 ToPos = From.GetWorldPosition(); LLVector3 ToPos = From.GetWorldPosition();
LLUUID toUUID = To.UUID; // LLUUID toUUID = To.UUID;
float distance = (float) (Math.Sqrt(Math.Pow(FromPos.X-ToPos.X, 2) + float distance = (float) (Math.Sqrt(Math.Pow(FromPos.X-ToPos.X, 2) +
Math.Pow(FromPos.X-ToPos.Y, 2) + Math.Pow(FromPos.X-ToPos.Y, 2) +
Math.Pow(FromPos.X-ToPos.Z, 2) Math.Pow(FromPos.X-ToPos.Z, 2)

10
OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs
View File

@ -72,7 +72,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
#region Fields #region Fields
bool init = false; //bool init = false;
int m_channel = -1; int m_channel = -1;
/// <value> /// <value>
@ -122,9 +122,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
#region Private Methods #region Private Methods
//------------------------------------------------ EVENTS ----------------------------------------------------// //------------------------------------------------ EVENTS ----------------------------------------------------//
private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, LLUUID regionID) // private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, LLUUID regionID)
{ // {
} // }
/// <summary> /// <summary>
/// Searches in all scenes for a SceneObjectGroup that contains a part with a specific localID. If found, the object is returned. Else null is returned. /// Searches in all scenes for a SceneObjectGroup that contains a part with a specific localID. If found, the object is returned. Else null is returned.
@ -384,7 +384,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
{ {
m_log.Debug("[CONTENT MANAGEMENT] Registering channel with chat services."); m_log.Debug("[CONTENT MANAGEMENT] Registering channel with chat services.");
client.OnChatFromViewer += SimChatSent; client.OnChatFromViewer += SimChatSent;
init = true; //init = true;
OnNewClient(client); OnNewClient(client);

4
OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs
View File

@ -193,10 +193,10 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
System.Collections.ArrayList xmllist = null; System.Collections.ArrayList xmllist = null;
SceneObjectGroup temp = null; SceneObjectGroup temp = null;
System.Collections.Hashtable deleteListUUIDs = new Hashtable(); System.Collections.Hashtable deleteListUUIDs = new Hashtable();
Dictionary<LLUUID, EntityBase> SearchList = new Dictionary<LLUUID,EntityBase>(); // Dictionary<LLUUID, EntityBase> SearchList = new Dictionary<LLUUID,EntityBase>();
Dictionary<LLUUID, EntityBase> ReplacementList = new Dictionary<LLUUID,EntityBase>(); Dictionary<LLUUID, EntityBase> ReplacementList = new Dictionary<LLUUID,EntityBase>();
int revision = m_database.GetMostRecentRevision(scene.RegionInfo.RegionID); int revision = m_database.GetMostRecentRevision(scene.RegionInfo.RegionID);
EntityBase[] searchArray; // EntityBase[] searchArray;
xmllist = m_database.GetRegionObjectXMLList(scene.RegionInfo.RegionID, revision); xmllist = m_database.GetRegionObjectXMLList(scene.RegionInfo.RegionID, revision);
if (xmllist == null) if (xmllist == null)

4
OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs
View File

@ -57,8 +57,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
{ {
#region Static Fields #region Static Fields
static float TimeToDiff = 0; // static float TimeToDiff = 0;
static float TimeToCreateEntities = 0; // static float TimeToCreateEntities = 0;
#endregion Static Fields #endregion Static Fields

2
OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs
View File

@ -93,7 +93,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
#region Static Fields #region Static Fields
static float TimeToDiff = 0; static float TimeToDiff = 0;
private static readonly ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
#endregion Static Fields #endregion Static Fields

2
OpenSim/Region/Environment/Scenes/EntityList.cs
View File

@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Scenes
ScenePresence sp = (ScenePresence)m_pres_by_uuid[uuid]; ScenePresence sp = (ScenePresence)m_pres_by_uuid[uuid];
return sp; return sp;
} }
catch (Exception e) catch (Exception)
{ {
return null; return null;
} }