aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDr Scofield2008-06-27 16:58:21 +0000
committerDr Scofield2008-06-27 16:58:21 +0000
commitfeb30217de48f4b3d869bf13453a945a04ee2524 (patch)
tree9da974ca87997d2bdfdda8c027314b01eb8c299a /OpenSim/Framework
parent* restore suppression of mono addins manager warnings (diff)
downloadopensim-SC_OLD-feb30217de48f4b3d869bf13453a945a04ee2524.zip
opensim-SC_OLD-feb30217de48f4b3d869bf13453a945a04ee2524.tar.gz
opensim-SC_OLD-feb30217de48f4b3d869bf13453a945a04ee2524.tar.bz2
opensim-SC_OLD-feb30217de48f4b3d869bf13453a945a04ee2524.tar.xz
dr scofield's warning safari:
* commented out [Obsolete(....)] attributes where no replacement feature was available: if we want to attribute code that we think needs to be reworked, we should define a new attribute and use that instead (together with a little tool to retrieve all the attributed code then) * commenting out unused variables
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ClientManager.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs10
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs6
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs9
-rw-r--r--OpenSim/Framework/Communications/XMPP/XmppSerializer.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs20
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs4
-rw-r--r--OpenSim/Framework/Servers/RestObjectPosterResponse.cs3
-rw-r--r--OpenSim/Framework/Statistics/AssetStatsCollector.cs2
-rw-r--r--OpenSim/Framework/Statistics/UserStatsCollector.cs2
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs2
-rw-r--r--OpenSim/Framework/Util.cs2
13 files changed, 35 insertions, 33 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index b557ec1..85dafef 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -138,7 +138,7 @@ namespace OpenSim.Framework
138 } 138 }
139 } 139 }
140 140
141 [Obsolete("Using Obsolete to drive development is invalid. Obsolete presumes that something new has already been created to replace this.")] 141 // [Obsolete("Using Obsolete to drive development is invalid. Obsolete presumes that something new has already been created to replace this.")]
142 public uint[] GetAllCircuits(LLUUID agentId) 142 public uint[] GetAllCircuits(LLUUID agentId)
143 { 143 {
144 List<uint> circuits = new List<uint>(); 144 List<uint> circuits = new List<uint>();
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 5249aa2..5aba086 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -79,17 +79,17 @@ namespace OpenSim.Framework.Communications.Capabilities
79 private CapsHandlers m_capsHandlers; 79 private CapsHandlers m_capsHandlers;
80 80
81 private static readonly string m_requestPath = "0000/"; 81 private static readonly string m_requestPath = "0000/";
82 private static readonly string m_mapLayerPath = "0001/"; 82 // private static readonly string m_mapLayerPath = "0001/";
83 private static readonly string m_newInventory = "0002/"; 83 private static readonly string m_newInventory = "0002/";
84 //private static readonly string m_requestTexture = "0003/"; 84 //private static readonly string m_requestTexture = "0003/";
85 private static readonly string m_notecardUpdatePath = "0004/"; 85 private static readonly string m_notecardUpdatePath = "0004/";
86 private static readonly string m_notecardTaskUpdatePath = "0005/"; 86 private static readonly string m_notecardTaskUpdatePath = "0005/";
87 private static readonly string m_fetchInventoryPath = "0006/"; 87 // private static readonly string m_fetchInventoryPath = "0006/";
88 88
89 // The following two entries are in a module, however, there also here so that we don't re-assign 89 // The following two entries are in a module, however, there also here so that we don't re-assign
90 // the path to another cap by mistake. 90 // the path to another cap by mistake.
91 private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module. 91 // private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module.
92 private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module. 92 // private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module.
93 93
94 //private string eventQueue = "0100/"; 94 //private string eventQueue = "0100/";
95 private BaseHttpServer m_httpListener; 95 private BaseHttpServer m_httpListener;
@@ -246,7 +246,7 @@ namespace OpenSim.Framework.Communications.Capabilities
246 // multiple fetch-folder maps are allowed within the larger folders map. 246 // multiple fetch-folder maps are allowed within the larger folders map.
247 public string FetchInventoryRequest(string request, string path, string param) 247 public string FetchInventoryRequest(string request, string path, string param)
248 { 248 {
249 string unmodifiedRequest = request.ToString(); 249 // string unmodifiedRequest = request.ToString();
250 250
251 //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest); 251 //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest);
252 m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName); 252 m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName);
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index e8353b4..5de0c71 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -282,7 +282,7 @@ namespace OpenSim.Framework.Communications
282 if (profileData != null) 282 if (profileData != null)
283 { 283 {
284 returnstring = new string[2]; 284 returnstring = new string[2];
285 LLUUID profileId = profileData.ID; 285 // LLUUID profileId = profileData.ID;
286 returnstring[0] = profileData.FirstName; 286 returnstring[0] = profileData.FirstName;
287 returnstring[1] = profileData.SurName; 287 returnstring[1] = profileData.SurName;
288 lock (m_nameRequestCache) 288 lock (m_nameRequestCache)
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 6fdd06a..113e3f0 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Communications
95 95
96 // Response 96 // Response
97 private XmlRpcResponse xmlRpcResponse; 97 private XmlRpcResponse xmlRpcResponse;
98 private XmlRpcResponse defaultXmlRpcResponse; 98 // private XmlRpcResponse defaultXmlRpcResponse;
99 99
100 private string welcomeMessage; 100 private string welcomeMessage;
101 private string startLocation; 101 private string startLocation;
@@ -117,7 +117,7 @@ namespace OpenSim.Framework.Communications
117 loginError = new Hashtable(); 117 loginError = new Hashtable();
118 uiConfigHash = new Hashtable(); 118 uiConfigHash = new Hashtable();
119 119
120 defaultXmlRpcResponse = new XmlRpcResponse(); 120 // defaultXmlRpcResponse = new XmlRpcResponse();
121 userProfile = new UserInfo(); 121 userProfile = new UserInfo();
122 inventoryRoot = new ArrayList(); 122 inventoryRoot = new ArrayList();
123 initialOutfit = new ArrayList(); 123 initialOutfit = new ArrayList();
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Communications
126 inventoryLibraryOwner = new ArrayList(); 126 inventoryLibraryOwner = new ArrayList();
127 127
128 xmlRpcResponse = new XmlRpcResponse(); 128 xmlRpcResponse = new XmlRpcResponse();
129 defaultXmlRpcResponse = new XmlRpcResponse(); 129 // defaultXmlRpcResponse = new XmlRpcResponse();
130 130
131 SetDefaultValues(); 131 SetDefaultValues();
132 } 132 }
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index f6c33a8..b71a590 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Communications
58 { 58 {
59 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 59 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
60 60
61 private string realuri; 61 // private string realuri;
62 62
63 #region member variables 63 #region member variables
64 64
@@ -229,7 +229,7 @@ namespace OpenSim.Framework.Communications
229 sb.Append(kv.Value); 229 sb.Append(kv.Value);
230 } 230 }
231 } 231 }
232 realuri = sb.ToString(); 232 // realuri = sb.ToString();
233 //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri); 233 //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri);
234 return new Uri(sb.ToString()); 234 return new Uri(sb.ToString());
235 } 235 }
@@ -250,8 +250,9 @@ namespace OpenSim.Framework.Communications
250 if (read > 0) 250 if (read > 0)
251 { 251 {
252 _resource.Write(_readbuf, 0, read); 252 _resource.Write(_readbuf, 0, read);
253 IAsyncResult asynchronousResult = 253 // IAsyncResult asynchronousResult =
254 s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s); 254 // s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
255 s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s);
255 256
256 // TODO! Implement timeout, without killing the server 257 // TODO! Implement timeout, without killing the server
257 //ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true); 258 //ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true);
diff --git a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
index 30a9eac..eb9dabe 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
+++ b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs
@@ -38,8 +38,8 @@ namespace OpenSim.Framework.Communications.XMPP
38{ 38{
39 public class XmppSerializer 39 public class XmppSerializer
40 { 40 {
41 private static readonly ILog _log = 41 // private static readonly ILog _log =
42 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 // need to do it this way, as XmlSerializer(type, extratypes) 44 // need to do it this way, as XmlSerializer(type, extratypes)
45 // does not work on mono (at least). 45 // does not work on mono (at least).
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 5b0726b..7541c32 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -664,7 +664,7 @@ namespace OpenSim.Framework
664 664
665 string LastName { get; } 665 string LastName { get; }
666 666
667 [Obsolete("LLClientView Specific - Replace with ???")] 667 // [Obsolete("LLClientView Specific - Replace with ???")]
668 int NextAnimationSequenceNumber { get; } 668 int NextAnimationSequenceNumber { get; }
669 669
670 /// <summary> 670 /// <summary>
@@ -680,22 +680,22 @@ namespace OpenSim.Framework
680 set; 680 set;
681 } 681 }
682 682
683 [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")] 683 // [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
684 uint CircuitCode { get; } 684 uint CircuitCode { get; }
685 [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")] 685 // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")]
686 event ImprovedInstantMessage OnInstantMessage; 686 event ImprovedInstantMessage OnInstantMessage;
687 [Obsolete("LLClientView Specific - Replace with more bare-bones arguments. Rename OnChat.")] 687 // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments. Rename OnChat.")]
688 event ChatFromViewer OnChatFromViewer; 688 event ChatFromViewer OnChatFromViewer;
689 [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")] 689 // [Obsolete("LLClientView Specific - Replace with more bare-bones arguments.")]
690 event TextureRequest OnRequestTexture; 690 event TextureRequest OnRequestTexture;
691 [Obsolete("LLClientView Specific - Remove bitbuckets. Adam, can you be more specific here.. as I don't see any bit buckets.")] 691 // [Obsolete("LLClientView Specific - Remove bitbuckets. Adam, can you be more specific here.. as I don't see any bit buckets.")]
692 event RezObject OnRezObject; 692 event RezObject OnRezObject;
693 [Obsolete("LLClientView Specific - Replace with more suitable arguments.")] 693 // [Obsolete("LLClientView Specific - Replace with more suitable arguments.")]
694 event ModifyTerrain OnModifyTerrain; 694 event ModifyTerrain OnModifyTerrain;
695 event BakeTerrain OnBakeTerrain; 695 event BakeTerrain OnBakeTerrain;
696 [Obsolete("LLClientView Specific.")] 696 // [Obsolete("LLClientView Specific.")]
697 event SetAppearance OnSetAppearance; 697 event SetAppearance OnSetAppearance;
698 [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")] 698 // [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")]
699 event AvatarNowWearing OnAvatarNowWearing; 699 event AvatarNowWearing OnAvatarNowWearing;
700 event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; 700 event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
701 event UUIDNameRequest OnDetachAttachmentIntoInv; 701 event UUIDNameRequest OnDetachAttachmentIntoInv;
@@ -841,7 +841,7 @@ namespace OpenSim.Framework
841 event ScriptReset OnScriptReset; 841 event ScriptReset OnScriptReset;
842 event UpdateVector OnAutoPilotGo; 842 event UpdateVector OnAutoPilotGo;
843 843
844 [Obsolete("IClientAPI.OutPacket SHOULD NOT EXIST outside of LLClientView please refactor appropriately.")] 844 // [Obsolete("IClientAPI.OutPacket SHOULD NOT EXIST outside of LLClientView please refactor appropriately.")]
845 void OutPacket(Packet newPack, ThrottleOutPacketType packType); 845 void OutPacket(Packet newPack, ThrottleOutPacketType packType);
846 void SendWearables(AvatarWearable[] wearables, int serial); 846 void SendWearables(AvatarWearable[] wearables, int serial);
847 void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry); 847 void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry);
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 503830b..12ca688 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -341,7 +341,7 @@ namespace OpenSim.Framework
341 byte[] returnbytes = new byte[TotalBytesLength]; 341 byte[] returnbytes = new byte[TotalBytesLength];
342 342
343 343
344 uint paramlength = ExtraParamsNum; 344 // uint paramlength = ExtraParamsNum;
345 345
346 // Stick in the number of parameters 346 // Stick in the number of parameters
347 returnbytes[i++] = (byte)ExtraParamsNum; 347 returnbytes[i++] = (byte)ExtraParamsNum;
@@ -462,7 +462,7 @@ namespace OpenSim.Framework
462 ushort epType = Helpers.BytesToUInt16(data, i); 462 ushort epType = Helpers.BytesToUInt16(data, i);
463 463
464 i += 2; 464 i += 2;
465 uint paramLength = Helpers.BytesToUIntBig(data, i); 465 // uint paramLength = Helpers.BytesToUIntBig(data, i);
466 466
467 i += 4; 467 i += 4;
468 switch (epType) 468 switch (epType)
diff --git a/OpenSim/Framework/Servers/RestObjectPosterResponse.cs b/OpenSim/Framework/Servers/RestObjectPosterResponse.cs
index 05bfaa1..cbc8be4 100644
--- a/OpenSim/Framework/Servers/RestObjectPosterResponse.cs
+++ b/OpenSim/Framework/Servers/RestObjectPosterResponse.cs
@@ -76,7 +76,8 @@ namespace OpenSim.Framework.Servers
76 76
77 Stream requestStream = request.GetRequestStream(); 77 Stream requestStream = request.GetRequestStream();
78 requestStream.Write(buffer.ToArray(), 0, length); 78 requestStream.Write(buffer.ToArray(), 0, length);
79 IAsyncResult result = request.BeginGetResponse(AsyncCallback, request); 79 // IAsyncResult result = request.BeginGetResponse(AsyncCallback, request);
80 request.BeginGetResponse(AsyncCallback, request);
80 } 81 }
81 82
82 private void AsyncCallback(IAsyncResult result) 83 private void AsyncCallback(IAsyncResult result)
diff --git a/OpenSim/Framework/Statistics/AssetStatsCollector.cs b/OpenSim/Framework/Statistics/AssetStatsCollector.cs
index f2b765f..526132a 100644
--- a/OpenSim/Framework/Statistics/AssetStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/AssetStatsCollector.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Statistics
86 /// Report back collected statistical information. 86 /// Report back collected statistical information.
87 /// </summary> 87 /// </summary>
88 /// <returns></returns> 88 /// <returns></returns>
89 public string Report() 89 override public string Report()
90 { 90 {
91 double elapsedHours = (DateTime.Now - startTime).TotalHours; 91 double elapsedHours = (DateTime.Now - startTime).TotalHours;
92 if (elapsedHours <= 0) { elapsedHours = 1; } // prevent divide by zero 92 if (elapsedHours <= 0) { elapsedHours = 1; } // prevent divide by zero
diff --git a/OpenSim/Framework/Statistics/UserStatsCollector.cs b/OpenSim/Framework/Statistics/UserStatsCollector.cs
index e094d91..9ff44ca 100644
--- a/OpenSim/Framework/Statistics/UserStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/UserStatsCollector.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Statistics
81 /// Report back collected statistical information. 81 /// Report back collected statistical information.
82 /// </summary> 82 /// </summary>
83 /// <returns></returns> 83 /// <returns></returns>
84 public string Report() 84 override public string Report()
85 { 85 {
86 return string.Format( 86 return string.Format(
87@"Successful logins total : {0}, today : {1}, yesterday : {2} 87@"Successful logins total : {0}, today : {1}, yesterday : {2}
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 1105242..a383242 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Framework
44 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>, 44 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>,
45 ICloneable, IXmlSerializable 45 ICloneable, IXmlSerializable
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem)); 49 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
50 50
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 5b529da..d72e03e 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -637,7 +637,7 @@ namespace OpenSim.Framework
637 } 637 }
638 638
639 memory.Position = 0; 639 memory.Position = 0;
640 MemoryStream outStream = new MemoryStream(); 640 // MemoryStream outStream = new MemoryStream();
641 641
642 byte[] compressed = new byte[memory.Length]; 642 byte[] compressed = new byte[memory.Length];
643 memory.Read(compressed, 0, compressed.Length); 643 memory.Read(compressed, 0, compressed.Length);