diff options
author | Justin Clarke Casey | 2008-09-06 00:09:24 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-06 00:09:24 +0000 |
commit | de467f4903ea41374382cf8a005b3fdeeae280e7 (patch) | |
tree | 43a6cce4d4f0e26d22d8c6525dfc5871745f06d2 /OpenSim/Region/Environment/Modules | |
parent | Mantis#2093. Thank you kindly, Ewe Loon for a patch that: (diff) | |
download | opensim-SC-de467f4903ea41374382cf8a005b3fdeeae280e7.zip opensim-SC-de467f4903ea41374382cf8a005b3fdeeae280e7.tar.gz opensim-SC-de467f4903ea41374382cf8a005b3fdeeae280e7.tar.bz2 opensim-SC-de467f4903ea41374382cf8a005b3fdeeae280e7.tar.xz |
* Remove lots of warnings from the CMS module
* Remove a few other miscellaneous warnings
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
5 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs index b34f9b3..9e39088 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
80 | //Scale size of particles to distance objects are apart (for better visibility) | 80 | //Scale size of particles to distance objects are apart (for better visibility) |
81 | LLVector3 FromPos = From.GetWorldPosition(); | 81 | LLVector3 FromPos = From.GetWorldPosition(); |
82 | LLVector3 ToPos = From.GetWorldPosition(); | 82 | LLVector3 ToPos = From.GetWorldPosition(); |
83 | LLUUID toUUID = To.UUID; | 83 | // LLUUID toUUID = To.UUID; |
84 | float distance = (float) (Math.Sqrt(Math.Pow(FromPos.X-ToPos.X, 2) + | 84 | float distance = (float) (Math.Sqrt(Math.Pow(FromPos.X-ToPos.X, 2) + |
85 | Math.Pow(FromPos.X-ToPos.Y, 2) + | 85 | Math.Pow(FromPos.X-ToPos.Y, 2) + |
86 | Math.Pow(FromPos.X-ToPos.Z, 2) | 86 | Math.Pow(FromPos.X-ToPos.Z, 2) |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs index c5c1600..6ccb646 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
72 | 72 | ||
73 | #region Fields | 73 | #region Fields |
74 | 74 | ||
75 | bool init = false; | 75 | //bool init = false; |
76 | int m_channel = -1; | 76 | int m_channel = -1; |
77 | 77 | ||
78 | /// <value> | 78 | /// <value> |
@@ -122,9 +122,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
122 | #region Private Methods | 122 | #region Private Methods |
123 | 123 | ||
124 | //------------------------------------------------ EVENTS ----------------------------------------------------// | 124 | //------------------------------------------------ EVENTS ----------------------------------------------------// |
125 | private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, LLUUID regionID) | 125 | // private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, LLUUID regionID) |
126 | { | 126 | // { |
127 | } | 127 | // } |
128 | 128 | ||
129 | /// <summary> | 129 | /// <summary> |
130 | /// 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. | 130 | /// 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 | |||
384 | { | 384 | { |
385 | m_log.Debug("[CONTENT MANAGEMENT] Registering channel with chat services."); | 385 | m_log.Debug("[CONTENT MANAGEMENT] Registering channel with chat services."); |
386 | client.OnChatFromViewer += SimChatSent; | 386 | client.OnChatFromViewer += SimChatSent; |
387 | init = true; | 387 | //init = true; |
388 | 388 | ||
389 | OnNewClient(client); | 389 | OnNewClient(client); |
390 | 390 | ||
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs index ff4e678..92ae0d7 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs | |||
@@ -193,10 +193,10 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
193 | System.Collections.ArrayList xmllist = null; | 193 | System.Collections.ArrayList xmllist = null; |
194 | SceneObjectGroup temp = null; | 194 | SceneObjectGroup temp = null; |
195 | System.Collections.Hashtable deleteListUUIDs = new Hashtable(); | 195 | System.Collections.Hashtable deleteListUUIDs = new Hashtable(); |
196 | Dictionary<LLUUID, EntityBase> SearchList = new Dictionary<LLUUID,EntityBase>(); | 196 | // Dictionary<LLUUID, EntityBase> SearchList = new Dictionary<LLUUID,EntityBase>(); |
197 | Dictionary<LLUUID, EntityBase> ReplacementList = new Dictionary<LLUUID,EntityBase>(); | 197 | Dictionary<LLUUID, EntityBase> ReplacementList = new Dictionary<LLUUID,EntityBase>(); |
198 | int revision = m_database.GetMostRecentRevision(scene.RegionInfo.RegionID); | 198 | int revision = m_database.GetMostRecentRevision(scene.RegionInfo.RegionID); |
199 | EntityBase[] searchArray; | 199 | // EntityBase[] searchArray; |
200 | 200 | ||
201 | xmllist = m_database.GetRegionObjectXMLList(scene.RegionInfo.RegionID, revision); | 201 | xmllist = m_database.GetRegionObjectXMLList(scene.RegionInfo.RegionID, revision); |
202 | if (xmllist == null) | 202 | if (xmllist == null) |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs index 1fa4ffc..8e0dd33 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs | |||
@@ -57,8 +57,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
57 | { | 57 | { |
58 | #region Static Fields | 58 | #region Static Fields |
59 | 59 | ||
60 | static float TimeToDiff = 0; | 60 | // static float TimeToDiff = 0; |
61 | static float TimeToCreateEntities = 0; | 61 | // static float TimeToCreateEntities = 0; |
62 | 62 | ||
63 | #endregion Static Fields | 63 | #endregion Static Fields |
64 | 64 | ||
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs index 58f6eea..38938c6 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
93 | #region Static Fields | 93 | #region Static Fields |
94 | 94 | ||
95 | static float TimeToDiff = 0; | 95 | static float TimeToDiff = 0; |
96 | private static readonly ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 96 | // private static readonly ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
97 | 97 | ||
98 | #endregion Static Fields | 98 | #endregion Static Fields |
99 | 99 | ||