* Rolled back a few changes.

1 files changed, 12 insertions, 12 deletions

diff --git a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
index 4f6808e..a039d42 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -78,20 +78,20 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
     public class XMLRPCModule : IRegionModule, IXMLRPC
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly List<Scene> m_scenes = new List<Scene>();
-        private readonly object XMLRPCListLock = new object();
 
         private string m_name = "XMLRPCModule";
 
         // <channel id, RPCChannelInfo>
         private Dictionary<LLUUID, RPCChannelInfo> m_openChannels;
         private Dictionary<LLUUID, SendRemoteDataRequest> m_pendingSRDResponses;
-        private int m_remoteDataPort;
+        private int m_remoteDataPort = 0;
 
         private Dictionary<LLUUID, RPCRequestInfo> m_rpcPending;
         private Dictionary<LLUUID, RPCRequestInfo> m_rpcPendingResponses;
+        private List<Scene> m_scenes = new List<Scene>();
         private int RemoteReplyScriptTimeout = 9000;
         private int RemoteReplyScriptWait = 300;
+        private object XMLRPCListLock = new object();
 
         #region IRegionModule Members
 
@@ -428,15 +428,15 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
 
     public class RPCRequestInfo
     {
-        private readonly LLUUID m_ChannelKey;
-        private readonly string m_IntVal;
-        private readonly LLUUID m_ItemID;
-        private readonly uint m_localID;
-        private readonly LLUUID m_MessageID;
-        private readonly string m_StrVal;
+        private LLUUID m_ChannelKey;
+        private string m_IntVal;
+        private LLUUID m_ItemID;
+        private uint m_localID;
+        private LLUUID m_MessageID;
         private bool m_processed;
         private int m_respInt;
         private string m_respStr;
+        private string m_StrVal;
 
         public RPCRequestInfo(uint localID, LLUUID itemID, LLUUID channelKey, string strVal, string intVal)
         {
@@ -514,9 +514,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
 
     public class RPCChannelInfo
     {
-        private readonly LLUUID m_ChannelKey;
-        private readonly LLUUID m_itemID;
-        private readonly uint m_localID;
+        private LLUUID m_ChannelKey;
+        private LLUUID m_itemID;
+        private uint m_localID;
 
         public RPCChannelInfo(uint localID, LLUUID itemID, LLUUID channelID)
         {