aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs2
-rw-r--r--OpenSim/Framework/Cache.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs14
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetServerBase.cs10
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs6
-rw-r--r--OpenSim/Framework/Communications/Cache/GridAssetClient.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs34
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs4
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs2
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs32
-rw-r--r--OpenSim/Framework/Communications/IGridServices.cs6
-rw-r--r--OpenSim/Framework/Communications/IInterServiceInventoryServices.cs8
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs4
-rw-r--r--OpenSim/Framework/Communications/ISecureInventoryService.cs8
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs6
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs9
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs4
-rw-r--r--OpenSim/Framework/Configuration/XML/XmlConfiguration.cs4
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs4
-rw-r--r--OpenSim/Framework/Console/ConsolePluginCommand.cs20
-rw-r--r--OpenSim/Framework/Console/OpenSimAppender.cs4
-rw-r--r--OpenSim/Framework/IAssetProvider.cs2
-rw-r--r--OpenSim/Framework/IClientAPI.cs14
-rw-r--r--OpenSim/Framework/IInventoryData.cs2
-rw-r--r--OpenSim/Framework/IPlugin.cs8
-rw-r--r--OpenSim/Framework/IUserData.cs2
-rw-r--r--OpenSim/Framework/LandData.cs6
-rw-r--r--OpenSim/Framework/LandStatReportItem.cs2
-rw-r--r--OpenSim/Framework/PluginLoader.cs98
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs28
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs6
-rw-r--r--OpenSim/Framework/RegionInfo.cs21
-rw-r--r--OpenSim/Framework/RegionSettings.cs68
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs4
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs46
-rw-r--r--OpenSim/Framework/Servers/OSHttpHandler.cs16
-rw-r--r--OpenSim/Framework/Servers/OSHttpHttpHandler.cs10
-rw-r--r--OpenSim/Framework/Servers/OSHttpRequest.cs22
-rw-r--r--OpenSim/Framework/Servers/OSHttpRequestPump.cs39
-rw-r--r--OpenSim/Framework/Servers/OSHttpRequestQueue.cs6
-rw-r--r--OpenSim/Framework/Servers/OSHttpResponse.cs74
-rw-r--r--OpenSim/Framework/Servers/OSHttpServer.cs8
-rw-r--r--OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs28
-rw-r--r--OpenSim/Framework/Servers/RestSessionService.cs4
-rw-r--r--OpenSim/Framework/Statistics/BaseStatsCollector.cs6
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsCollector.cs46
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs4
-rw-r--r--OpenSim/Framework/Util.cs4
49 files changed, 369 insertions, 394 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 4456138..3133f83 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -371,7 +371,7 @@ namespace OpenSim.Framework
371 VisualParams = (byte[])h["visual_params"]; 371 VisualParams = (byte[])h["visual_params"];
372 Texture = new LLObject.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length); 372 Texture = new LLObject.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length);
373 AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); 373 AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]);
374 374
375 m_wearables = new AvatarWearable[MAX_WEARABLES]; 375 m_wearables = new AvatarWearable[MAX_WEARABLES];
376 for (int i = 0; i < MAX_WEARABLES; i++) 376 for (int i = 0; i < MAX_WEARABLES; i++)
377 { 377 {
diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs
index d002530..427072d 100644
--- a/OpenSim/Framework/Cache.cs
+++ b/OpenSim/Framework/Cache.cs
@@ -380,7 +380,7 @@ namespace Opensim.Framework
380 default: 380 default:
381 return; 381 return;
382 } 382 }
383 383
384 Store(index, data, container); 384 Store(index, data, container);
385 } 385 }
386 386
@@ -403,7 +403,7 @@ namespace Opensim.Framework
403 if ((m_Flags & CacheFlags.AllowUpdate) != 0) 403 if ((m_Flags & CacheFlags.AllowUpdate) != 0)
404 { 404 {
405 item = GetItem(index); 405 item = GetItem(index);
406 406
407 item.hits++; 407 item.hits++;
408 item.lastUsed = DateTime.Now; 408 item.lastUsed = DateTime.Now;
409 if (m_DefaultTTL.Ticks != 0) 409 if (m_DefaultTTL.Ticks != 0)
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 6eff690..e924b3f 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -143,10 +143,10 @@ namespace OpenSim.Framework.Communications.Cache
143 public void Clear() 143 public void Clear()
144 { 144 {
145 m_log.Info("[ASSET CACHE]: Clearing Asset cache"); 145 m_log.Info("[ASSET CACHE]: Clearing Asset cache");
146 146
147 if (StatsManager.SimExtraStats != null) 147 if (StatsManager.SimExtraStats != null)
148 StatsManager.SimExtraStats.ClearAssetCacheStatistics(); 148 StatsManager.SimExtraStats.ClearAssetCacheStatistics();
149 149
150 Initialize(); 150 Initialize();
151 } 151 }
152 152
@@ -365,9 +365,9 @@ namespace OpenSim.Framework.Communications.Cache
365 } 365 }
366 } 366 }
367 else 367 else
368 { 368 {
369 if (!Assets.ContainsKey(asset.FullID)) 369 if (!Assets.ContainsKey(asset.FullID))
370 { 370 {
371 AssetInfo assetInf = new AssetInfo(asset); 371 AssetInfo assetInf = new AssetInfo(asset);
372 Assets.Add(assetInf.FullID, assetInf); 372 Assets.Add(assetInf.FullID, assetInf);
373 373
@@ -382,7 +382,7 @@ namespace OpenSim.Framework.Communications.Cache
382 } 382 }
383 } 383 }
384 384
385 /// <summary> 385 /// <summary>
386 /// Allows you to clear a specific asset by uuid out 386 /// Allows you to clear a specific asset by uuid out
387 /// of the asset cache. This is needed because the osdynamic 387 /// of the asset cache. This is needed because the osdynamic
388 /// texture code grows the asset cache without bounds. The 388 /// texture code grows the asset cache without bounds. The
@@ -399,8 +399,8 @@ namespace OpenSim.Framework.Communications.Cache
399 if (Textures.ContainsKey(uuid)) 399 if (Textures.ContainsKey(uuid))
400 { 400 {
401 Textures.Remove(uuid); 401 Textures.Remove(uuid);
402 } 402 }
403 else if (Assets.ContainsKey(uuid)) 403 else if (Assets.ContainsKey(uuid))
404 { 404 {
405 Assets.Remove(uuid); 405 Assets.Remove(uuid);
406 } 406 }
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
index ed5b896..2c8e685 100644
--- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Communications.Cache
57 /// <param name="req"></param> 57 /// <param name="req"></param>
58 /// <returns></returns> 58 /// <returns></returns>
59 /// <exception cref="System.Exception"> 59 /// <exception cref="System.Exception">
60 /// Thrown if the request failed for some other reason than that the 60 /// Thrown if the request failed for some other reason than that the
61 /// asset cannot be found. 61 /// asset cannot be found.
62 /// </exception> 62 /// </exception>
63 protected abstract AssetBase GetAsset(AssetRequest req); 63 protected abstract AssetBase GetAsset(AssetRequest req);
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Communications.Cache
70 protected virtual void ProcessRequest(AssetRequest req) 70 protected virtual void ProcessRequest(AssetRequest req)
71 { 71 {
72 AssetBase asset; 72 AssetBase asset;
73 73
74 try 74 try
75 { 75 {
76 asset = GetAsset(req); 76 asset = GetAsset(req);
@@ -78,12 +78,12 @@ namespace OpenSim.Framework.Communications.Cache
78 catch (Exception e) 78 catch (Exception e)
79 { 79 {
80 m_log.ErrorFormat("[ASSET]: Asset request for {0} threw exception {1}", req.AssetID, e); 80 m_log.ErrorFormat("[ASSET]: Asset request for {0} threw exception {1}", req.AssetID, e);
81 81
82 if (StatsManager.SimExtraStats != null) 82 if (StatsManager.SimExtraStats != null)
83 StatsManager.SimExtraStats.AddAssetServiceRequestFailure(); 83 StatsManager.SimExtraStats.AddAssetServiceRequestFailure();
84 84
85 m_receiver.AssetNotFound(req.AssetID, req.IsTexture); 85 m_receiver.AssetNotFound(req.AssetID, req.IsTexture);
86 86
87 return; 87 return;
88 } 88 }
89 89
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 57f5e76..c337907 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -91,8 +91,8 @@ namespace OpenSim.Framework.Communications.Cache
91 get { return m_session_id; } 91 get { return m_session_id; }
92 set { m_session_id = value; } 92 set { m_session_id = value; }
93 } 93 }
94 private LLUUID m_session_id = LLUUID.Zero; 94 private LLUUID m_session_id = LLUUID.Zero;
95 95
96 /// <summary> 96 /// <summary>
97 /// Constructor 97 /// Constructor
98 /// </summary> 98 /// </summary>
@@ -172,7 +172,7 @@ namespace OpenSim.Framework.Communications.Cache
172 } 172 }
173 } 173 }
174 } 174 }
175 175
176 /// <summary> 176 /// <summary>
177 /// Drop all cached inventory. 177 /// Drop all cached inventory.
178 /// </summary> 178 /// </summary>
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
index 4206cae..9cccf66 100644
--- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
+++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache
60 rc.AddQueryParameter("texture"); 60 rc.AddQueryParameter("texture");
61 61
62 rc.RequestMethod = "GET"; 62 rc.RequestMethod = "GET";
63 63
64 Stream s = rc.Request(); 64 Stream s = rc.Request();
65 65
66 if (s.Length > 0) 66 if (s.Length > 0)
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index d7de9d6..61cfc1a 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -37,19 +37,19 @@ namespace OpenSim.Framework.Communications.Cache
37 public class InventoryFolderImpl : InventoryFolderBase 37 public class InventoryFolderImpl : InventoryFolderBase
38 { 38 {
39 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 39 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 40
41 public static readonly string PATH_DELIMITER = "/"; 41 public static readonly string PATH_DELIMITER = "/";
42 42
43 /// <summary> 43 /// <summary>
44 /// Items that are contained in this folder 44 /// Items that are contained in this folder
45 /// </summary> 45 /// </summary>
46 public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); 46 public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>();
47 47
48 /// <summary> 48 /// <summary>
49 /// Child folders that are contained in this folder 49 /// Child folders that are contained in this folder
50 /// </summary> 50 /// </summary>
51 public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>(); 51 public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>();
52 52
53 // Constructors 53 // Constructors
54 public InventoryFolderImpl(InventoryFolderBase folderbase) 54 public InventoryFolderImpl(InventoryFolderBase folderbase)
55 { 55 {
@@ -195,15 +195,15 @@ namespace OpenSim.Framework.Communications.Cache
195 195
196 return null; 196 return null;
197 } 197 }
198 198
199 /// <summary> 199 /// <summary>
200 /// Find a folder given a PATH_DELIMITOR delimited path starting from this folder 200 /// Find a folder given a PATH_DELIMITOR delimited path starting from this folder
201 /// 201 ///
202 /// This method does not handle paths that contain multiple delimitors 202 /// This method does not handle paths that contain multiple delimitors
203 /// 203 ///
204 /// FIXME: We do not yet handle situations where folders have the same name. We could handle this by some 204 /// FIXME: We do not yet handle situations where folders have the same name. We could handle this by some
205 /// XPath like expression 205 /// XPath like expression
206 /// 206 ///
207 /// FIXME: Delimitors which occur in names themselves are not currently escapable. 207 /// FIXME: Delimitors which occur in names themselves are not currently escapable.
208 /// </summary> 208 /// </summary>
209 /// <param name="path"> 209 /// <param name="path">
@@ -214,7 +214,7 @@ namespace OpenSim.Framework.Communications.Cache
214 { 214 {
215 if (path == string.Empty) 215 if (path == string.Empty)
216 return this; 216 return this;
217 217
218 string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); 218 string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
219 219
220 lock (SubFolders) 220 lock (SubFolders)
@@ -228,19 +228,19 @@ namespace OpenSim.Framework.Communications.Cache
228 return folder; 228 return folder;
229 } 229 }
230 } 230 }
231 231
232 // We didn't find a folder with the given name 232 // We didn't find a folder with the given name
233 return null; 233 return null;
234 } 234 }
235 235
236 /// <summary> 236 /// <summary>
237 /// Find an item given a PATH_DELIMITOR delimited path starting from this folder. 237 /// Find an item given a PATH_DELIMITOR delimited path starting from this folder.
238 /// 238 ///
239 /// This method does not handle paths that contain multiple delimitors 239 /// This method does not handle paths that contain multiple delimitors
240 /// 240 ///
241 /// FIXME: We do not yet handle situations where folders or items have the same name. We could handle this by some 241 /// FIXME: We do not yet handle situations where folders or items have the same name. We could handle this by some
242 /// XPath like expression 242 /// XPath like expression
243 /// 243 ///
244 /// FIXME: Delimitors which occur in names themselves are not currently escapable. 244 /// FIXME: Delimitors which occur in names themselves are not currently escapable.
245 /// </summary> 245 /// </summary>
246 /// <param name="path"> 246 /// <param name="path">
@@ -248,7 +248,7 @@ namespace OpenSim.Framework.Communications.Cache
248 /// </param> 248 /// </param>
249 /// <returns>null if the item is not found</returns> 249 /// <returns>null if the item is not found</returns>
250 public InventoryItemBase FindItemByPath(string path) 250 public InventoryItemBase FindItemByPath(string path)
251 { 251 {
252 string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); 252 string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
253 253
254 if (components.Length == 1) 254 if (components.Length == 1)
@@ -263,7 +263,7 @@ namespace OpenSim.Framework.Communications.Cache
263 } 263 }
264 } 264 }
265 else 265 else
266 { 266 {
267 lock (SubFolders) 267 lock (SubFolders)
268 { 268 {
269 foreach (InventoryFolderImpl folder in SubFolders.Values) 269 foreach (InventoryFolderImpl folder in SubFolders.Values)
@@ -273,10 +273,10 @@ namespace OpenSim.Framework.Communications.Cache
273 } 273 }
274 } 274 }
275 } 275 }
276 276
277 // We didn't find an item or intermediate folder with the given name 277 // We didn't find an item or intermediate folder with the given name
278 return null; 278 return null;
279 } 279 }
280 280
281 /// <summary> 281 /// <summary>
282 /// Return a copy of the list of child items in this folder 282 /// Return a copy of the list of child items in this folder
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 1360aa3..4e3840b 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework.Communications.Cache
90 90
91 m_log.WarnFormat( 91 m_log.WarnFormat(
92 "[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userId); 92 "[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userId);
93 93
94 return false; 94 return false;
95 } 95 }
96 96
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 1aa8eb0..24fe0f4 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -422,7 +422,7 @@ namespace OpenSim.Framework.Communications.Capabilities
422 mapLayer.Right = 5000; 422 mapLayer.Right = 5000;
423 mapLayer.Top = 5000; 423 mapLayer.Top = 5000;
424 mapLayer.ImageID = new LLUUID("00000000-0000-1111-9999-000000000006"); 424 mapLayer.ImageID = new LLUUID("00000000-0000-1111-9999-000000000006");
425 425
426 return mapLayer; 426 return mapLayer;
427 } 427 }
428 428
@@ -783,7 +783,7 @@ namespace OpenSim.Framework.Communications.Capabilities
783 783
784 // TODO: probably make this a better set of extensions here 784 // TODO: probably make this a better set of extensions here
785 string extension = ".jp2"; 785 string extension = ".jp2";
786 if (m_invType != "image") 786 if (m_invType != "image")
787 { 787 {
788 extension = ".dat"; 788 extension = ".dat";
789 } 789 }
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs
index 1c8f27f..b0e2b8f 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Communications.Capabilities
34 public class LLSDRemoteParcelResponse 34 public class LLSDRemoteParcelResponse
35 { 35 {
36 public LLUUID parcel_id; 36 public LLUUID parcel_id;
37 37
38 public LLSDRemoteParcelResponse() 38 public LLSDRemoteParcelResponse()
39 { 39 {
40 } 40 }
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 2bfe045..08dbc80 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -41,26 +41,26 @@ namespace OpenSim.Framework.Communications
41 public class CommunicationsManager 41 public class CommunicationsManager
42 { 42 {
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 44
45 protected Dictionary<LLUUID, string[]> m_nameRequestCache = new Dictionary<LLUUID, string[]>(); 45 protected Dictionary<LLUUID, string[]> m_nameRequestCache = new Dictionary<LLUUID, string[]>();
46 46
47 public IUserService UserService 47 public IUserService UserService
48 { 48 {
49 get { return m_userService; } 49 get { return m_userService; }
50 } 50 }
51 protected IUserService m_userService; 51 protected IUserService m_userService;
52 52
53 public IGridServices GridService 53 public IGridServices GridService
54 { 54 {
55 get { return m_gridService; } 55 get { return m_gridService; }
56 } 56 }
57 protected IGridServices m_gridService; 57 protected IGridServices m_gridService;
58 58
59 public IInterRegionCommunications InterRegion 59 public IInterRegionCommunications InterRegion
60 { 60 {
61 get { return m_interRegion; } 61 get { return m_interRegion; }
62 } 62 }
63 protected IInterRegionCommunications m_interRegion; 63 protected IInterRegionCommunications m_interRegion;
64 64
65 public UserProfileCacheService UserProfileCacheService 65 public UserProfileCacheService UserProfileCacheService
66 { 66 {
@@ -68,36 +68,36 @@ namespace OpenSim.Framework.Communications
68 } 68 }
69 protected UserProfileCacheService m_userProfileCacheService; 69 protected UserProfileCacheService m_userProfileCacheService;
70 70
71 // protected AgentAssetTransactionsManager m_transactionsManager; 71 // protected AgentAssetTransactionsManager m_transactionsManager;
72 72
73 // public AgentAssetTransactionsManager TransactionsManager 73 // public AgentAssetTransactionsManager TransactionsManager
74 // { 74 // {
75 // get { return m_transactionsManager; } 75 // get { return m_transactionsManager; }
76 // } 76 // }
77 77
78 public IAvatarService AvatarService 78 public IAvatarService AvatarService
79 { 79 {
80 get { return m_avatarService; } 80 get { return m_avatarService; }
81 } 81 }
82 protected IAvatarService m_avatarService; 82 protected IAvatarService m_avatarService;
83 83
84 public AssetCache AssetCache 84 public AssetCache AssetCache
85 { 85 {
86 get { return m_assetCache; } 86 get { return m_assetCache; }
87 } 87 }
88 protected AssetCache m_assetCache; 88 protected AssetCache m_assetCache;
89 89
90 public IInterServiceInventoryServices InterServiceInventoryService 90 public IInterServiceInventoryServices InterServiceInventoryService
91 { 91 {
92 get { return m_interServiceInventoryService; } 92 get { return m_interServiceInventoryService; }
93 } 93 }
94 protected IInterServiceInventoryServices m_interServiceInventoryService; 94 protected IInterServiceInventoryServices m_interServiceInventoryService;
95 95
96 public NetworkServersInfo NetworkServersInfo 96 public NetworkServersInfo NetworkServersInfo
97 { 97 {
98 get { return m_networkServersInfo; } 98 get { return m_networkServersInfo; }
99 } 99 }
100 protected NetworkServersInfo m_networkServersInfo; 100 protected NetworkServersInfo m_networkServersInfo;
101 101
102 /// <summary> 102 /// <summary>
103 /// Constructor 103 /// Constructor
@@ -138,7 +138,7 @@ namespace OpenSim.Framework.Communications
138 return null; 138 return null;
139 } 139 }
140 } 140 }
141 141
142 public IInventoryServices InventoryService 142 public IInventoryServices InventoryService
143 { 143 {
144 get 144 get
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index 509f408..fcc0db5 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Communications
33 public interface IGridServices 33 public interface IGridServices
34 { 34 {
35 string gdebugRegionName { get; set; } 35 string gdebugRegionName { get; set; }
36 36
37 /// <summary> 37 /// <summary>
38 /// Register a region with the grid service. 38 /// Register a region with the grid service.
39 /// </summary> 39 /// </summary>
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Communications
41 /// <returns></returns> 41 /// <returns></returns>
42 /// <exception cref="System.Exception">Thrown if region registration failed</exception> 42 /// <exception cref="System.Exception">Thrown if region registration failed</exception>
43 RegionCommsListener RegisterRegion(RegionInfo regionInfos); 43 RegionCommsListener RegisterRegion(RegionInfo regionInfos);
44 44
45 bool DeregisterRegion(RegionInfo regionInfo); 45 bool DeregisterRegion(RegionInfo regionInfo);
46 46
47 /// <summary> 47 /// <summary>
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications
51 /// <param name="y"></param> 51 /// <param name="y"></param>
52 /// <returns></returns> 52 /// <returns></returns>
53 List<SimpleRegionInfo> RequestNeighbours(uint x, uint y); 53 List<SimpleRegionInfo> RequestNeighbours(uint x, uint y);
54 54
55 RegionInfo RequestNeighbourInfo(ulong regionHandle); 55 RegionInfo RequestNeighbourInfo(ulong regionHandle);
56 RegionInfo RequestNeighbourInfo(LLUUID regionID); 56 RegionInfo RequestNeighbourInfo(LLUUID regionID);
57 RegionInfo RequestClosestRegion(string regionName); 57 RegionInfo RequestClosestRegion(string regionName);
diff --git a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
index 24213f2..a1f4c2e 100644
--- a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
@@ -32,22 +32,22 @@ namespace OpenSim.Framework.Communications
32{ 32{
33 /// <summary> 33 /// <summary>
34 /// Inventory operations used between grid services. 34 /// Inventory operations used between grid services.
35 /// </summary> 35 /// </summary>
36 public interface IInterServiceInventoryServices 36 public interface IInterServiceInventoryServices
37 { 37 {
38 /// <summary> 38 /// <summary>
39 /// Create a new inventory for the given user. 39 /// Create a new inventory for the given user.
40 /// </summary> 40 /// </summary>
41 /// <param name="user"></param> 41 /// <param name="user"></param>
42 /// <returns>true if the inventory was successfully created, false otherwise</returns> 42 /// <returns>true if the inventory was successfully created, false otherwise</returns>
43 bool CreateNewUserInventory(LLUUID user); 43 bool CreateNewUserInventory(LLUUID user);
44 44
45 /// <summary> 45 /// <summary>
46 /// Returns a list of all the folders in a given user's inventory. 46 /// Returns a list of all the folders in a given user's inventory.
47 /// </summary> 47 /// </summary>
48 /// <param name="userId"></param> 48 /// <param name="userId"></param>
49 /// <returns>A flat list of the user's inventory folder tree, 49 /// <returns>A flat list of the user's inventory folder tree,
50 /// null if there is no inventory for this user</returns> 50 /// null if there is no inventory for this user</returns>
51 List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId); 51 List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId);
52 } 52 }
53} 53}
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 08a2c5f..b00b1bf 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -41,12 +41,12 @@ namespace OpenSim.Framework.Communications
41 /// Defines all the operations one can perform on a user's inventory. 41 /// Defines all the operations one can perform on a user's inventory.
42 /// </summary> 42 /// </summary>
43 public interface IInventoryServices 43 public interface IInventoryServices
44 { 44 {
45 string Host 45 string Host
46 { 46 {
47 get; 47 get;
48 } 48 }
49 49
50 /// <summary> 50 /// <summary>
51 /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the 51 /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the
52 /// inventory has been received 52 /// inventory has been received
diff --git a/OpenSim/Framework/Communications/ISecureInventoryService.cs b/OpenSim/Framework/Communications/ISecureInventoryService.cs
index 3608c56..bd962d1 100644
--- a/OpenSim/Framework/Communications/ISecureInventoryService.cs
+++ b/OpenSim/Framework/Communications/ISecureInventoryService.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications
40 { 40 {
41 get; 41 get;
42 } 42 }
43 43
44 /// <summary> 44 /// <summary>
45 /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the 45 /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the
46 /// inventory has been received 46 /// inventory has been received
@@ -102,14 +102,14 @@ namespace OpenSim.Framework.Communications
102 /// Does the given user have an inventory structure? 102 /// Does the given user have an inventory structure?
103 /// </summary> 103 /// </summary>
104 /// <param name="userID"></param> 104 /// <param name="userID"></param>
105 /// <returns></returns> 105 /// <returns></returns>
106 bool HasInventoryForUser(LLUUID userID); 106 bool HasInventoryForUser(LLUUID userID);
107 107
108 /// <summary> 108 /// <summary>
109 /// Retrieve the root inventory folder for the given user. 109 /// Retrieve the root inventory folder for the given user.
110 /// </summary> 110 /// </summary>
111 /// <param name="userID"></param> 111 /// <param name="userID"></param>
112 /// <returns>null if no root folder was found</returns> 112 /// <returns>null if no root folder was found</returns>
113 InventoryFolderBase RequestRootFolder(LLUUID userID); 113 InventoryFolderBase RequestRootFolder(LLUUID userID);
114 } 114 }
115} 115}
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 40701f0..c76c078 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -53,14 +53,14 @@ namespace OpenSim.Framework.Communications
53 /// <param name="provider">The filename to the user server plugin DLL</param> 53 /// <param name="provider">The filename to the user server plugin DLL</param>
54 public void AddPlugin(string provider, string connect) 54 public void AddPlugin(string provider, string connect)
55 { 55 {
56 PluginLoader<IInventoryDataPlugin> loader = 56 PluginLoader<IInventoryDataPlugin> loader =
57 new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); 57 new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect));
58 58
59 // loader will try to load all providers (MySQL, MSSQL, etc) 59 // loader will try to load all providers (MySQL, MSSQL, etc)
60 // unless it is constrainted to the correct "Provider" entry in the addin.xml 60 // unless it is constrainted to the correct "Provider" entry in the addin.xml
61 loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); 61 loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider));
62 loader.Load(); 62 loader.Load();
63 63
64 m_plugins = loader.Plugins; 64 m_plugins = loader.Plugins;
65 } 65 }
66 66
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index fd5f139..40064d3 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Communications
79 /// <param name="response">The existing response</param> 79 /// <param name="response">The existing response</param>
80 /// <param name="theUser">The user profile</param> 80 /// <param name="theUser">The user profile</param>
81 public abstract void CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest); 81 public abstract void CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest);
82 82
83 /// <summary> 83 /// <summary>
84 /// If the user is already logged in, try to notify the region that the user they've got is dead. 84 /// If the user is already logged in, try to notify the region that the user they've got is dead.
85 /// </summary> 85 /// </summary>
@@ -206,12 +206,11 @@ namespace OpenSim.Framework.Communications
206 userProfile.CurrentAgent.AgentOnline = false; 206 userProfile.CurrentAgent.AgentOnline = false;
207 207
208 m_userManager.CommitAgent(ref userProfile); 208 m_userManager.CommitAgent(ref userProfile);
209 209
210 // try to tell the region that their user is dead. 210 // try to tell the region that their user is dead.
211 LogOffUser(userProfile, " XMLRPC You were logged off because you logged in from another location"); 211 LogOffUser(userProfile, " XMLRPC You were logged off because you logged in from another location");
212 212
213 // Reject the login 213 // Reject the login
214
215 214
216 m_log.InfoFormat( 215 m_log.InfoFormat(
217 "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in", 216 "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in",
@@ -293,7 +292,7 @@ namespace OpenSim.Framework.Communications
293 //return logResponse.ToXmlRpcResponse(); 292 //return logResponse.ToXmlRpcResponse();
294 } 293 }
295 294
296 userProfile.LastLogin = userProfile.CurrentAgent.LoginTime; 295 userProfile.LastLogin = userProfile.CurrentAgent.LoginTime;
297 CommitAgent(ref userProfile); 296 CommitAgent(ref userProfile);
298 297
299 // If we reach this point, then the login has successfully logged onto the grid 298 // If we reach this point, then the login has successfully logged onto the grid
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index f477df4..feeb666 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -57,11 +57,11 @@ namespace OpenSim.Framework.Communications
57 PluginLoader<IUserDataPlugin> loader = 57 PluginLoader<IUserDataPlugin> loader =
58 new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect)); 58 new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect));
59 59
60 // loader will try to load all providers (MySQL, MSSQL, etc) 60 // loader will try to load all providers (MySQL, MSSQL, etc)
61 // unless it is constrainted to the correct "Provider" entry in the addin.xml 61 // unless it is constrainted to the correct "Provider" entry in the addin.xml
62 loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); 62 loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider));
63 loader.Load(); 63 loader.Load();
64 64
65 _plugins = loader.Plugins; 65 _plugins = loader.Plugins;
66 } 66 }
67 67
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 2154e1e..89f52cf 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Framework.Configuration.XML
46 46
47 private void LoadDataToClass() 47 private void LoadDataToClass()
48 { 48 {
49 rootNode = doc.SelectSingleNode("Root"); 49 rootNode = doc.SelectSingleNode("Root");
50 if (null == rootNode) 50 if (null == rootNode)
51 throw new Exception("Error: Invalid .xml File. Missing <Root>"); 51 throw new Exception("Error: Invalid .xml File. Missing <Root>");
52 52
@@ -135,4 +135,4 @@ namespace OpenSim.Framework.Configuration.XML
135 doc = null; 135 doc = null;
136 } 136 }
137 } 137 }
138} \ No newline at end of file 138}
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index f21127b..89fd77d 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Console
42 private readonly object m_syncRoot = new object(); 42 private readonly object m_syncRoot = new object();
43 43
44 public conscmd_callback m_cmdParser; 44 public conscmd_callback m_cmdParser;
45 45
46 /// <summary> 46 /// <summary>
47 /// The default prompt text. 47 /// The default prompt text.
48 /// </summary> 48 /// </summary>
@@ -249,7 +249,7 @@ namespace OpenSim.Framework.Console
249 { 249 {
250 line = System.Console.ReadLine(); 250 line = System.Console.ReadLine();
251 } 251 }
252 252
253 return line; 253 return line;
254 } 254 }
255 catch (Exception e) 255 catch (Exception e)
diff --git a/OpenSim/Framework/Console/ConsolePluginCommand.cs b/OpenSim/Framework/Console/ConsolePluginCommand.cs
index b3f1c93..bf70645 100644
--- a/OpenSim/Framework/Console/ConsolePluginCommand.cs
+++ b/OpenSim/Framework/Console/ConsolePluginCommand.cs
@@ -30,10 +30,10 @@ using System;
30namespace OpenSim.Framework.Console 30namespace OpenSim.Framework.Console
31{ 31{
32 public delegate void ConsoleCommand(string[] comParams); 32 public delegate void ConsoleCommand(string[] comParams);
33 33
34 /// <summary> 34 /// <summary>
35 /// Holder object for a new console plugin command 35 /// Holder object for a new console plugin command
36 /// 36 ///
37 /// Override the methods like Run and IsHelpfull (but the defaults might work ok.) 37 /// Override the methods like Run and IsHelpfull (but the defaults might work ok.)
38 /// </summary> 38 /// </summary>
39 public class ConsolePluginCommand 39 public class ConsolePluginCommand
@@ -52,10 +52,10 @@ namespace OpenSim.Framework.Console
52 private string[] m_cmdText; 52 private string[] m_cmdText;
53 53
54 /// <summary> 54 /// <summary>
55 /// Construct a new ConsolePluginCommand 55 /// Construct a new ConsolePluginCommand
56 /// 56 ///
57 /// for use with OpenSim.RegisterConsolePluginCommand(myCmd); 57 /// for use with OpenSim.RegisterConsolePluginCommand(myCmd);
58 /// 58 ///
59 /// </summary> 59 /// </summary>
60 /// <param name="command">in the form of "showme new commands"</param> 60 /// <param name="command">in the form of "showme new commands"</param>
61 /// <param name="dlg">ommand delegate used in running</param> 61 /// <param name="dlg">ommand delegate used in running</param>
@@ -68,13 +68,13 @@ namespace OpenSim.Framework.Console
68 } 68 }
69 69
70 /// <summary> 70 /// <summary>
71 /// Returns the match length this command has upon the 'cmdWithParams' 71 /// Returns the match length this command has upon the 'cmdWithParams'
72 /// At least a higher number for "show plugin status" then "show" would return 72 /// At least a higher number for "show plugin status" then "show" would return
73 /// This is used to have multi length command verbs 73 /// This is used to have multi length command verbs
74 /// 74 ///
75 /// @see OopenSim.RunPluginCommands 75 /// @see OopenSim.RunPluginCommands
76 /// It will only run the one with the highest number 76 /// It will only run the one with the highest number
77 /// 77 ///
78 /// </summary> 78 /// </summary>
79 public int matchLength(string cmdWithParams) 79 public int matchLength(string cmdWithParams)
80 { 80 {
@@ -106,8 +106,8 @@ namespace OpenSim.Framework.Console
106 } 106 }
107 currentParam++; 107 currentParam++;
108 } 108 }
109 109
110 } 110 }
111 string[] sendCmdParams = cmdParams; 111 string[] sendCmdParams = cmdParams;
112 if (skipParams > 0) 112 if (skipParams > 0)
113 { 113 {
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index 2527977..fa26d22 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Console
39 { 39 {
40 override protected void Append(LoggingEvent le) 40 override protected void Append(LoggingEvent le)
41 { 41 {
42 try 42 try
43 { 43 {
44 string loggingMessage = RenderLoggingEvent(le); 44 string loggingMessage = RenderLoggingEvent(le);
45 45
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Console
47 47
48 Regex RE = new Regex(regex, RegexOptions.Multiline); 48 Regex RE = new Regex(regex, RegexOptions.Multiline);
49 MatchCollection matches = RE.Matches(loggingMessage); 49 MatchCollection matches = RE.Matches(loggingMessage);
50 50
51 // Get some direct matches $1 $4 is a 51 // Get some direct matches $1 $4 is a
52 if (matches.Count == 1) 52 if (matches.Count == 1)
53 { 53 {
diff --git a/OpenSim/Framework/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs
index 00d290e..ec70554 100644
--- a/OpenSim/Framework/IAssetProvider.cs
+++ b/OpenSim/Framework/IAssetProvider.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 bool ExistsAsset(LLUUID uuid); 37 bool ExistsAsset(LLUUID uuid);
38 void Initialise(string connect); 38 void Initialise(string connect);
39 } 39 }
40 40
41 public class AssetDataInitialiser : PluginInitialiserBase 41 public class AssetDataInitialiser : PluginInitialiserBase
42 { 42 {
43 private string connect; 43 private string connect;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 536050c..71b8eb0 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Framework
62 public delegate void ModifyTerrain( 62 public delegate void ModifyTerrain(
63 float height, float seconds, byte size, byte action, float north, float west, float south, float east, 63 float height, float seconds, byte size, byte action, float north, float west, float south, float east,
64 IClientAPI remoteClient); 64 IClientAPI remoteClient);
65 65
66 public delegate void SetAppearance(byte[] texture, List<byte> visualParamList); 66 public delegate void SetAppearance(byte[] texture, List<byte> visualParamList);
67 67
68 public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID); 68 public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID);
@@ -295,7 +295,7 @@ namespace OpenSim.Framework
295 public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey); 295 public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey);
296 public delegate void RegionHandleRequest(IClientAPI remoteClient, LLUUID regionID); 296 public delegate void RegionHandleRequest(IClientAPI remoteClient, LLUUID regionID);
297 public delegate void ParcelInfoRequest(IClientAPI remoteClient, LLUUID parcelID); 297 public delegate void ParcelInfoRequest(IClientAPI remoteClient, LLUUID parcelID);
298 298
299 public delegate void ScriptReset(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID); 299 public delegate void ScriptReset(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID);
300 public delegate void GetScriptRunning(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID); 300 public delegate void GetScriptRunning(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID);
301 public delegate void SetScriptRunning(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, bool running); 301 public delegate void SetScriptRunning(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, bool running);
@@ -322,9 +322,9 @@ namespace OpenSim.Framework
322 ulong ActiveGroupPowers { get; } 322 ulong ActiveGroupPowers { get; }
323 323
324 ulong GetGroupPowers(LLUUID groupID); 324 ulong GetGroupPowers(LLUUID groupID);
325 325
326 string FirstName { get; } 326 string FirstName { get; }
327 327
328 string LastName { get; } 328 string LastName { get; }
329 329
330 IScene Scene { get; } 330 IScene Scene { get; }
@@ -501,7 +501,7 @@ namespace OpenSim.Framework
501 event EstateDebugRegionRequest OnEstateDebugRegionRequest; 501 event EstateDebugRegionRequest OnEstateDebugRegionRequest;
502 event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest; 502 event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest;
503 event UUIDNameRequest OnUUIDGroupNameRequest; 503 event UUIDNameRequest OnUUIDGroupNameRequest;
504 504
505 event RegionHandleRequest OnRegionHandleRequest; 505 event RegionHandleRequest OnRegionHandleRequest;
506 event ParcelInfoRequest OnParcelInfoRequest; 506 event ParcelInfoRequest OnParcelInfoRequest;
507 507
@@ -724,10 +724,10 @@ namespace OpenSim.Framework
724 ClientInfo GetClientInfo(); 724 ClientInfo GetClientInfo();
725 void SetClientInfo(ClientInfo info); 725 void SetClientInfo(ClientInfo info);
726 void Terminate(); 726 void Terminate();
727 727
728 void SendSetFollowCamProperties(LLUUID objectID, SortedDictionary<int, float> parameters); 728 void SendSetFollowCamProperties(LLUUID objectID, SortedDictionary<int, float> parameters);
729 void SendClearFollowCamProperties(LLUUID objectID); 729 void SendClearFollowCamProperties(LLUUID objectID);
730 730
731 void SendRegionHandle(LLUUID regoinID, ulong handle); 731 void SendRegionHandle(LLUUID regoinID, ulong handle);
732 void SendParcelInfo(RegionInfo info, LandData land, LLUUID parcelID, uint x, uint y); 732 void SendParcelInfo(RegionInfo info, LandData land, LLUUID parcelID, uint x, uint y);
733 } 733 }
diff --git a/OpenSim/Framework/IInventoryData.cs b/OpenSim/Framework/IInventoryData.cs
index 0d4c555..1c62b0b 100644
--- a/OpenSim/Framework/IInventoryData.cs
+++ b/OpenSim/Framework/IInventoryData.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Framework
132 /// <param name="folder">The id of the folder</param> 132 /// <param name="folder">The id of the folder</param>
133 void deleteInventoryFolder(LLUUID folder); 133 void deleteInventoryFolder(LLUUID folder);
134 } 134 }
135 135
136 public class InventoryDataInitialiser : PluginInitialiserBase 136 public class InventoryDataInitialiser : PluginInitialiserBase
137 { 137 {
138 private string connect; 138 private string connect;
diff --git a/OpenSim/Framework/IPlugin.cs b/OpenSim/Framework/IPlugin.cs
index f739177..1eb1c06 100644
--- a/OpenSim/Framework/IPlugin.cs
+++ b/OpenSim/Framework/IPlugin.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework
38 public PluginNotInitialisedException (string msg) : base(msg) {} 38 public PluginNotInitialisedException (string msg) : base(msg) {}
39 public PluginNotInitialisedException (string msg, Exception e) : base(msg, e) {} 39 public PluginNotInitialisedException (string msg, Exception e) : base(msg, e) {}
40 } 40 }
41 41
42 /// <summary> 42 /// <summary>
43 /// This interface, describes a generic plugin 43 /// This interface, describes a generic plugin
44 /// </summary> 44 /// </summary>
@@ -63,17 +63,17 @@ namespace OpenSim.Framework
63 } 63 }
64 64
65 /// <summary> 65 /// <summary>
66 /// Any plugins which need to pass parameters to their initialisers must 66 /// Any plugins which need to pass parameters to their initialisers must
67 /// inherit this class and use it to set the PluginLoader Initialiser property 67 /// inherit this class and use it to set the PluginLoader Initialiser property
68 /// </summary> 68 /// </summary>
69 public class PluginInitialiserBase 69 public class PluginInitialiserBase
70 { 70 {
71 // this would be a lot simpler if C# supported currying or typedefs 71 // this would be a lot simpler if C# supported currying or typedefs
72 72
73 // default initialisation 73 // default initialisation
74 public virtual void Initialise (IPlugin plugin) 74 public virtual void Initialise (IPlugin plugin)
75 { 75 {
76 plugin.Initialise(); 76 plugin.Initialise();
77 } 77 }
78 } 78 }
79 79
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs
index 5ecb482..f74c0db 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
@@ -170,7 +170,7 @@ namespace OpenSim.Framework
170 void RemoveAttachment(LLUUID user, LLUUID item); 170 void RemoveAttachment(LLUUID user, LLUUID item);
171 List<LLUUID> GetAttachments(LLUUID user); 171 List<LLUUID> GetAttachments(LLUUID user);
172 } 172 }
173 173
174 public class UserDataInitialiser : PluginInitialiserBase 174 public class UserDataInitialiser : PluginInitialiserBase
175 { 175 {
176 private string connect; 176 private string connect;
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 8c1e1a1..a875a50 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework
39 private uint _auctionID = 0; //Unemplemented. If set to 0, not being auctioned 39 private uint _auctionID = 0; //Unemplemented. If set to 0, not being auctioned
40 private LLUUID _authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID 40 private LLUUID _authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID
41 private Parcel.ParcelCategory _category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category 41 private Parcel.ParcelCategory _category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
42 private int _claimDate = 0; 42 private int _claimDate = 0;
43 private int _claimPrice = 0; //Unemplemented 43 private int _claimPrice = 0; //Unemplemented
44 private LLUUID _globalID = LLUUID.Zero; 44 private LLUUID _globalID = LLUUID.Zero;
45 private LLUUID _groupID = LLUUID.Zero; //Unemplemented 45 private LLUUID _groupID = LLUUID.Zero; //Unemplemented
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
77 private LLUUID _snapshotID = LLUUID.Zero; 77 private LLUUID _snapshotID = LLUUID.Zero;
78 private LLVector3 _userLocation = new LLVector3(); 78 private LLVector3 _userLocation = new LLVector3();
79 private LLVector3 _userLookAt = new LLVector3(); 79 private LLVector3 _userLookAt = new LLVector3();
80 80
81 public LLVector3 AABBMax { 81 public LLVector3 AABBMax {
82 get { 82 get {
83 return _AABBMax; 83 return _AABBMax;
@@ -459,4 +459,4 @@ namespace OpenSim.Framework
459 return landData; 459 return landData;
460 } 460 }
461 } 461 }
462} \ No newline at end of file 462}
diff --git a/OpenSim/Framework/LandStatReportItem.cs b/OpenSim/Framework/LandStatReportItem.cs
index 3a92253..8c7ee7b 100644
--- a/OpenSim/Framework/LandStatReportItem.cs
+++ b/OpenSim/Framework/LandStatReportItem.cs
@@ -49,6 +49,6 @@ namespace OpenSim.Framework
49 { 49 {
50 50
51 } 51 }
52 52
53 } 53 }
54} 54}
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index 7ceb0b2..cabce1b 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework
47 } 47 }
48 48
49 /// <summary> 49 /// <summary>
50 /// Classes wishing to impose constraints on plugin loading must implement 50 /// Classes wishing to impose constraints on plugin loading must implement
51 /// this class and pass it to PluginLoader AddConstraint() 51 /// this class and pass it to PluginLoader AddConstraint()
52 /// </summary> 52 /// </summary>
53 public interface IPluginConstraint 53 public interface IPluginConstraint
@@ -75,46 +75,46 @@ namespace OpenSim.Framework
75 private List<T> loaded = new List<T>(); 75 private List<T> loaded = new List<T>();
76 private List<string> extpoints = new List<string>(); 76 private List<string> extpoints = new List<string>();
77 private PluginInitialiserBase initialiser; 77 private PluginInitialiserBase initialiser;
78 78
79 private Dictionary<string,IPluginConstraint> constraints 79 private Dictionary<string,IPluginConstraint> constraints
80 = new Dictionary<string,IPluginConstraint>(); 80 = new Dictionary<string,IPluginConstraint>();
81 81
82 private Dictionary<string,IPluginFilter> filters 82 private Dictionary<string,IPluginFilter> filters
83 = new Dictionary<string,IPluginFilter>(); 83 = new Dictionary<string,IPluginFilter>();
84 84
85 private static readonly ILog log 85 private static readonly ILog log
86 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 86 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
87 87
88 public PluginInitialiserBase Initialiser 88 public PluginInitialiserBase Initialiser
89 { 89 {
90 set { initialiser = value; } 90 set { initialiser = value; }
91 get { return initialiser; } 91 get { return initialiser; }
92 } 92 }
93 93
94 public List<T> Plugins 94 public List<T> Plugins
95 { 95 {
96 get { return loaded; } 96 get { return loaded; }
97 } 97 }
98 98
99 public T Plugin 99 public T Plugin
100 { 100 {
101 get { return (loaded.Count == 1)? loaded [0] : default (T); } 101 get { return (loaded.Count == 1)? loaded [0] : default (T); }
102 } 102 }
103 103
104 public PluginLoader () 104 public PluginLoader ()
105 { 105 {
106 Initialiser = new PluginInitialiserBase(); 106 Initialiser = new PluginInitialiserBase();
107 initialise_plugin_dir_ ("."); 107 initialise_plugin_dir_ (".");
108 } 108 }
109 109
110 public PluginLoader (PluginInitialiserBase init) 110 public PluginLoader (PluginInitialiserBase init)
111 { 111 {
112 Initialiser = init; 112 Initialiser = init;
113 initialise_plugin_dir_ ("."); 113 initialise_plugin_dir_ (".");
114 } 114 }
115 115
116 public PluginLoader (PluginInitialiserBase init, string dir) 116 public PluginLoader (PluginInitialiserBase init, string dir)
117 { 117 {
118 Initialiser = init; 118 Initialiser = init;
119 initialise_plugin_dir_ (dir); 119 initialise_plugin_dir_ (dir);
120 } 120 }
@@ -123,7 +123,7 @@ namespace OpenSim.Framework
123 { 123 {
124 if (extpoints.Contains (extpoint)) 124 if (extpoints.Contains (extpoint))
125 return; 125 return;
126 126
127 extpoints.Add (extpoint); 127 extpoints.Add (extpoint);
128 } 128 }
129 129
@@ -156,7 +156,7 @@ namespace OpenSim.Framework
156 } 156 }
157 157
158 public void Load () 158 public void Load ()
159 { 159 {
160 foreach (string ext in extpoints) 160 foreach (string ext in extpoints)
161 { 161 {
162 log.Info("[PLUGINS]: Loading extension point " + ext); 162 log.Info("[PLUGINS]: Loading extension point " + ext);
@@ -169,17 +169,17 @@ namespace OpenSim.Framework
169 } 169 }
170 170
171 IPluginFilter filter = null; 171 IPluginFilter filter = null;
172 172
173 if (filters.ContainsKey (ext)) 173 if (filters.ContainsKey (ext))
174 filter = filters [ext]; 174 filter = filters [ext];
175 175
176 foreach (PluginExtensionNode node in AddinManager.GetExtensionNodes (ext)) 176 foreach (PluginExtensionNode node in AddinManager.GetExtensionNodes (ext))
177 { 177 {
178 log.Info("[PLUGINS]: Trying plugin " + node.Path); 178 log.Info("[PLUGINS]: Trying plugin " + node.Path);
179 179
180 if ((filter != null) && (filter.Apply (node) == false)) 180 if ((filter != null) && (filter.Apply (node) == false))
181 continue; 181 continue;
182 182
183 T plugin = (T) node.CreateInstance(); 183 T plugin = (T) node.CreateInstance();
184 Initialiser.Initialise (plugin); 184 Initialiser.Initialise (plugin);
185 Plugins.Add (plugin); 185 Plugins.Add (plugin);
@@ -219,7 +219,7 @@ namespace OpenSim.Framework
219 private void on_addinloaderror_(object sender, AddinErrorEventArgs args) 219 private void on_addinloaderror_(object sender, AddinErrorEventArgs args)
220 { 220 {
221 if (args.Exception == null) 221 if (args.Exception == null)
222 log.Error ("[PLUGINS]: Plugin Error: " 222 log.Error ("[PLUGINS]: Plugin Error: "
223 + args.Message); 223 + args.Message);
224 else 224 else
225 log.Error ("[PLUGINS]: Plugin Error: " 225 log.Error ("[PLUGINS]: Plugin Error: "
@@ -229,7 +229,7 @@ namespace OpenSim.Framework
229 229
230 private void clear_registry_ () 230 private void clear_registry_ ()
231 { 231 {
232 // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0) 232 // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0)
233 // occasionally seems to corrupt its addin cache 233 // occasionally seems to corrupt its addin cache
234 // Hence, as a temporary solution we'll remove it before each startup 234 // Hence, as a temporary solution we'll remove it before each startup
235 try 235 try
@@ -252,7 +252,7 @@ namespace OpenSim.Framework
252 } 252 }
253 } 253 }
254 254
255 private static TextWriter prev_console_; 255 private static TextWriter prev_console_;
256 public void suppress_console_output_ (bool save) 256 public void suppress_console_output_ (bool save)
257 { 257 {
258 if (save) 258 if (save)
@@ -262,7 +262,7 @@ namespace OpenSim.Framework
262 } 262 }
263 else 263 else
264 { 264 {
265 if (prev_console_ != null) 265 if (prev_console_ != null)
266 System.Console.SetOut(prev_console_); 266 System.Console.SetOut(prev_console_);
267 } 267 }
268 } 268 }
@@ -283,7 +283,7 @@ namespace OpenSim.Framework
283 283
284 public Type TypeObject 284 public Type TypeObject
285 { 285 {
286 get 286 get
287 { 287 {
288 if (typeobj != null) 288 if (typeobj != null)
289 return typeobj; 289 return typeobj;
@@ -295,9 +295,9 @@ namespace OpenSim.Framework
295 } 295 }
296 } 296 }
297 297
298 public object CreateInstance () 298 public object CreateInstance ()
299 { 299 {
300 return Activator.CreateInstance (TypeObject); 300 return Activator.CreateInstance (TypeObject);
301 } 301 }
302 } 302 }
303 303
@@ -305,29 +305,29 @@ namespace OpenSim.Framework
305 /// Constraint that bounds the number of plugins to be loaded. 305 /// Constraint that bounds the number of plugins to be loaded.
306 /// </summary> 306 /// </summary>
307 public class PluginCountConstraint : IPluginConstraint 307 public class PluginCountConstraint : IPluginConstraint
308 { 308 {
309 private int min; 309 private int min;
310 private int max; 310 private int max;
311 311
312 public PluginCountConstraint (int exact) 312 public PluginCountConstraint (int exact)
313 { 313 {
314 min = exact; 314 min = exact;
315 max = exact; 315 max = exact;
316 }
317
318 public PluginCountConstraint (int minimum, int maximum)
319 {
320 min = minimum;
321 max = maximum;
316 } 322 }
317 323
318 public PluginCountConstraint (int minimum, int maximum) 324 public string Message
319 { 325 {
320 min = minimum; 326 get
321 max = maximum; 327 {
322 } 328 return "The number of plugins is constrained to the interval ["
323 329 + min + ", " + max + "]";
324 public string Message 330 }
325 {
326 get
327 {
328 return "The number of plugins is constrained to the interval ["
329 + min + ", " + max + "]";
330 }
331 } 331 }
332 332
333 public bool Apply (string extpoint) 333 public bool Apply (string extpoint)
@@ -340,7 +340,7 @@ namespace OpenSim.Framework
340 return true; 340 return true;
341 } 341 }
342 } 342 }
343 343
344 /// <summary> 344 /// <summary>
345 /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.xml 345 /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.xml
346 /// </summary> 346 /// </summary>
@@ -348,7 +348,7 @@ namespace OpenSim.Framework
348 { 348 {
349 private string provider; 349 private string provider;
350 350
351 public PluginProviderFilter (string p) 351 public PluginProviderFilter (string p)
352 { 352 {
353 provider = p; 353 provider = p;
354 } 354 }
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index ef74b54..f244b51 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Framework
128 [XmlIgnore] private bool _flexiEntry = false; 128 [XmlIgnore] private bool _flexiEntry = false;
129 [XmlIgnore] private bool _lightEntry = false; 129 [XmlIgnore] private bool _lightEntry = false;
130 [XmlIgnore] private bool _sculptEntry = false; 130 [XmlIgnore] private bool _sculptEntry = false;
131 131
132 public byte ProfileCurve 132 public byte ProfileCurve
133 { 133 {
134 get { return (byte)((byte)HollowShape | (byte)ProfileShape); } 134 get { return (byte)((byte)HollowShape | (byte)ProfileShape); }
@@ -185,10 +185,10 @@ namespace OpenSim.Framework
185 [XmlIgnore] 185 [XmlIgnore]
186 public LLObject.TextureEntry Textures 186 public LLObject.TextureEntry Textures
187 { 187 {
188 get 188 get
189 { 189 {
190 //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length); 190 //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
191 return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); 191 return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length);
192 } 192 }
193 193
194 set { m_textureEntry = value.ToBytes(); } 194 set { m_textureEntry = value.ToBytes(); }
@@ -198,12 +198,12 @@ namespace OpenSim.Framework
198 { 198 {
199 get { return m_textureEntry; } 199 get { return m_textureEntry; }
200 200
201 set 201 set
202 { 202 {
203 if (value == null) 203 if (value == null)
204 m_textureEntry = new byte[1]; 204 m_textureEntry = new byte[1];
205 else 205 else
206 m_textureEntry = value; 206 m_textureEntry = value;
207 } 207 }
208 } 208 }
209 209
@@ -302,7 +302,7 @@ namespace OpenSim.Framework
302 _profileBegin = LLObject.PackBeginCut(profileRange.X); 302 _profileBegin = LLObject.PackBeginCut(profileRange.X);
303 _profileEnd = LLObject.PackEndCut(profileRange.Y); 303 _profileEnd = LLObject.PackEndCut(profileRange.Y);
304 } 304 }
305 305
306 public byte[] ExtraParams 306 public byte[] ExtraParams
307 { 307 {
308 get 308 get
@@ -941,7 +941,7 @@ namespace OpenSim.Framework
941 941
942 return data; 942 return data;
943 } 943 }
944 944
945 public void ReadFlexiData(byte[] data, int pos) 945 public void ReadFlexiData(byte[] data, int pos)
946 { 946 {
947 if (data.Length-pos >= 16) 947 if (data.Length-pos >= 16)
@@ -972,7 +972,7 @@ namespace OpenSim.Framework
972 _flexiForceZ = 0f; 972 _flexiForceZ = 0f;
973 } 973 }
974 } 974 }
975 975
976 public byte[] GetFlexiBytes() 976 public byte[] GetFlexiBytes()
977 { 977 {
978 byte[] data = new byte[16]; 978 byte[] data = new byte[16];
@@ -991,7 +991,7 @@ namespace OpenSim.Framework
991 991
992 return data; 992 return data;
993 } 993 }
994 994
995 public void ReadLightData(byte[] data, int pos) 995 public void ReadLightData(byte[] data, int pos)
996 { 996 {
997 if (data.Length - pos >= 16) 997 if (data.Length - pos >= 16)
@@ -1021,7 +1021,7 @@ namespace OpenSim.Framework
1021 _lightIntensity = 0f; 1021 _lightIntensity = 0f;
1022 } 1022 }
1023 } 1023 }
1024 1024
1025 public byte[] GetLightBytes() 1025 public byte[] GetLightBytes()
1026 { 1026 {
1027 byte[] data = new byte[16]; 1027 byte[] data = new byte[16];
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 0b50a81..2d0be15 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework
47 private RegionUp handlerRegionUp = null; // OnRegionUp; 47 private RegionUp handlerRegionUp = null; // OnRegionUp;
48 private LogOffUser handlerLogOffUser = null; 48 private LogOffUser handlerLogOffUser = null;
49 private GetLandData handlerGetLandData = null; 49 private GetLandData handlerGetLandData = null;
50 50
51 #region IRegionCommsListener Members 51 #region IRegionCommsListener Members
52 52
53 public event ExpectUserDelegate OnExpectUser; 53 public event ExpectUserDelegate OnExpectUser;
@@ -228,13 +228,13 @@ namespace OpenSim.Framework
228 228
229 return false; 229 return false;
230 } 230 }
231 231
232 public LandData TriggerGetLandData(uint x, uint y) 232 public LandData TriggerGetLandData(uint x, uint y)
233 { 233 {
234 handlerGetLandData = OnGetLandData; 234 handlerGetLandData = OnGetLandData;
235 if (handlerGetLandData != null) 235 if (handlerGetLandData != null)
236 return handlerGetLandData(x, y); 236 return handlerGetLandData(x, y);
237 237
238 return null; 238 return null;
239 } 239 }
240 } 240 }
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 1d9d9ec..716849c 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework
50 set { m_httpPort = value; } 50 set { m_httpPort = value; }
51 } 51 }
52 protected uint m_httpPort; 52 protected uint m_httpPort;
53 53
54 /// <summary> 54 /// <summary>
55 /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) 55 /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
56 /// </summary> 56 /// </summary>
@@ -58,17 +58,17 @@ namespace OpenSim.Framework
58 { 58 {
59 get { return m_serverURI; } 59 get { return m_serverURI; }
60 set { m_serverURI = value; } 60 set { m_serverURI = value; }
61 } 61 }
62 protected string m_serverURI; 62 protected string m_serverURI;
63 63
64 protected bool Allow_Alternate_Ports; 64 protected bool Allow_Alternate_Ports;
65 public bool m_allow_alternate_ports; 65 public bool m_allow_alternate_ports;
66 protected string m_externalHostName; 66 protected string m_externalHostName;
67 67
68 protected IPEndPoint m_internalEndPoint; 68 protected IPEndPoint m_internalEndPoint;
69 protected uint? m_regionLocX; 69 protected uint? m_regionLocX;
70 protected uint? m_regionLocY; 70 protected uint? m_regionLocY;
71 protected uint m_remotingPort; 71 protected uint m_remotingPort;
72 public LLUUID RegionID = LLUUID.Zero; 72 public LLUUID RegionID = LLUUID.Zero;
73 public string RemotingAddress; 73 public string RemotingAddress;
74 74
@@ -404,11 +404,11 @@ namespace OpenSim.Framework
404 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 404 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
405 "(Sandbox Mode Only)Password for Master Avatar account", 405 "(Sandbox Mode Only)Password for Master Avatar account",
406 MasterAvatarSandboxPassword, true); 406 MasterAvatarSandboxPassword, true);
407 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 407 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
408 "Last Map UUID", lastMapUUID.ToString(), true); 408 "Last Map UUID", lastMapUUID.ToString(), true);
409 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 409 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
410 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); 410 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
411 411
412 } 412 }
413 413
414 public void loadConfigurationOptions() 414 public void loadConfigurationOptions()
@@ -454,15 +454,14 @@ namespace OpenSim.Framework
454 shouldMasterAvatarDetailsBeAsked); 454 shouldMasterAvatarDetailsBeAsked);
455 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 455 configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
456 "Last Map UUID", lastMapUUID.ToString(), true); 456 "Last Map UUID", lastMapUUID.ToString(), true);
457 457
458 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 458 configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
459 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); 459 "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
460
461 } 460 }
462 461
463 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) 462 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
464 { 463 {
465 if (MasterAvatarAssignedUUID == LLUUID.Zero) 464 return MasterAvatarAssignedUUID == LLUUID.Zero;
466 { 465 {
467 return true; 466 return true;
468 } 467 }
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index d157bac..b6e466d 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Framework
139 { 139 {
140 case "region_flags": 140 case "region_flags":
141 Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value; 141 Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value;
142 142
143 m_BlockTerraform = 143 m_BlockTerraform =
144 (flags & Simulator.RegionFlags.BlockTerraform) != 0; 144 (flags & Simulator.RegionFlags.BlockTerraform) != 0;
145 m_BlockFly = 145 m_BlockFly =
@@ -246,7 +246,7 @@ namespace OpenSim.Framework
246 } 246 }
247 247
248 private bool m_BlockTerraform = false; 248 private bool m_BlockTerraform = false;
249 249
250 public bool BlockTerraform 250 public bool BlockTerraform
251 { 251 {
252 get { return m_BlockTerraform; } 252 get { return m_BlockTerraform; }
@@ -254,7 +254,7 @@ namespace OpenSim.Framework
254 } 254 }
255 255
256 private bool m_BlockFly = false; 256 private bool m_BlockFly = false;
257 257
258 public bool BlockFly 258 public bool BlockFly
259 { 259 {
260 get { return m_BlockFly; } 260 get { return m_BlockFly; }
@@ -262,7 +262,7 @@ namespace OpenSim.Framework
262 } 262 }
263 263
264 private bool m_AllowDamage = false; 264 private bool m_AllowDamage = false;
265 265
266 public bool AllowDamage 266 public bool AllowDamage
267 { 267 {
268 get { return m_AllowDamage; } 268 get { return m_AllowDamage; }
@@ -270,7 +270,7 @@ namespace OpenSim.Framework
270 } 270 }
271 271
272 private bool m_RestrictPushing = false; 272 private bool m_RestrictPushing = false;
273 273
274 public bool RestrictPushing 274 public bool RestrictPushing
275 { 275 {
276 get { return m_RestrictPushing; } 276 get { return m_RestrictPushing; }
@@ -278,7 +278,7 @@ namespace OpenSim.Framework
278 } 278 }
279 279
280 private bool m_AllowLandResell = true; 280 private bool m_AllowLandResell = true;
281 281
282 public bool AllowLandResell 282 public bool AllowLandResell
283 { 283 {
284 get { return m_AllowLandResell; } 284 get { return m_AllowLandResell; }
@@ -286,7 +286,7 @@ namespace OpenSim.Framework
286 } 286 }
287 287
288 private bool m_AllowLandJoinDivide = true; 288 private bool m_AllowLandJoinDivide = true;
289 289
290 public bool AllowLandJoinDivide 290 public bool AllowLandJoinDivide
291 { 291 {
292 get { return m_AllowLandJoinDivide; } 292 get { return m_AllowLandJoinDivide; }
@@ -294,7 +294,7 @@ namespace OpenSim.Framework
294 } 294 }
295 295
296 private bool m_BlockShowInSearch = false; 296 private bool m_BlockShowInSearch = false;
297 297
298 public bool BlockShowInSearch 298 public bool BlockShowInSearch
299 { 299 {
300 get { return m_BlockShowInSearch; } 300 get { return m_BlockShowInSearch; }
@@ -302,7 +302,7 @@ namespace OpenSim.Framework
302 } 302 }
303 303
304 private int m_AgentLimit = 40; 304 private int m_AgentLimit = 40;
305 305
306 public int AgentLimit 306 public int AgentLimit
307 { 307 {
308 get { return m_AgentLimit; } 308 get { return m_AgentLimit; }
@@ -310,7 +310,7 @@ namespace OpenSim.Framework
310 } 310 }
311 311
312 private double m_ObjectBonus = 1.0; 312 private double m_ObjectBonus = 1.0;
313 313
314 public double ObjectBonus 314 public double ObjectBonus
315 { 315 {
316 get { return m_ObjectBonus; } 316 get { return m_ObjectBonus; }
@@ -318,7 +318,7 @@ namespace OpenSim.Framework
318 } 318 }
319 319
320 private int m_Maturity = 1; 320 private int m_Maturity = 1;
321 321
322 public int Maturity 322 public int Maturity
323 { 323 {
324 get { return m_Maturity; } 324 get { return m_Maturity; }
@@ -326,7 +326,7 @@ namespace OpenSim.Framework
326 } 326 }
327 327
328 private bool m_DisableScripts = false; 328 private bool m_DisableScripts = false;
329 329
330 public bool DisableScripts 330 public bool DisableScripts
331 { 331 {
332 get { return m_DisableScripts; } 332 get { return m_DisableScripts; }
@@ -334,7 +334,7 @@ namespace OpenSim.Framework
334 } 334 }
335 335
336 private bool m_DisableCollisions = false; 336 private bool m_DisableCollisions = false;
337 337
338 public bool DisableCollisions 338 public bool DisableCollisions
339 { 339 {
340 get { return m_DisableCollisions; } 340 get { return m_DisableCollisions; }
@@ -342,7 +342,7 @@ namespace OpenSim.Framework
342 } 342 }
343 343
344 private bool m_DisablePhysics = false; 344 private bool m_DisablePhysics = false;
345 345
346 public bool DisablePhysics 346 public bool DisablePhysics
347 { 347 {
348 get { return m_DisablePhysics; } 348 get { return m_DisablePhysics; }
@@ -350,7 +350,7 @@ namespace OpenSim.Framework
350 } 350 }
351 351
352 private LLUUID m_TerrainTexture1 = LLUUID.Zero; 352 private LLUUID m_TerrainTexture1 = LLUUID.Zero;
353 353
354 public LLUUID TerrainTexture1 354 public LLUUID TerrainTexture1
355 { 355 {
356 get { return m_TerrainTexture1; } 356 get { return m_TerrainTexture1; }
@@ -358,7 +358,7 @@ namespace OpenSim.Framework
358 } 358 }
359 359
360 private LLUUID m_TerrainTexture2 = LLUUID.Zero; 360 private LLUUID m_TerrainTexture2 = LLUUID.Zero;
361 361
362 public LLUUID TerrainTexture2 362 public LLUUID TerrainTexture2
363 { 363 {
364 get { return m_TerrainTexture2; } 364 get { return m_TerrainTexture2; }
@@ -366,7 +366,7 @@ namespace OpenSim.Framework
366 } 366 }
367 367
368 private LLUUID m_TerrainTexture3 = LLUUID.Zero; 368 private LLUUID m_TerrainTexture3 = LLUUID.Zero;
369 369
370 public LLUUID TerrainTexture3 370 public LLUUID TerrainTexture3
371 { 371 {
372 get { return m_TerrainTexture3; } 372 get { return m_TerrainTexture3; }
@@ -374,7 +374,7 @@ namespace OpenSim.Framework
374 } 374 }
375 375
376 private LLUUID m_TerrainTexture4 = LLUUID.Zero; 376 private LLUUID m_TerrainTexture4 = LLUUID.Zero;
377 377
378 public LLUUID TerrainTexture4 378 public LLUUID TerrainTexture4
379 { 379 {
380 get { return m_TerrainTexture4; } 380 get { return m_TerrainTexture4; }
@@ -382,7 +382,7 @@ namespace OpenSim.Framework
382 } 382 }
383 383
384 private double m_Elevation1NW = 10; 384 private double m_Elevation1NW = 10;
385 385
386 public double Elevation1NW 386 public double Elevation1NW
387 { 387 {
388 get { return m_Elevation1NW; } 388 get { return m_Elevation1NW; }
@@ -390,7 +390,7 @@ namespace OpenSim.Framework
390 } 390 }
391 391
392 private double m_Elevation2NW = 60; 392 private double m_Elevation2NW = 60;
393 393
394 public double Elevation2NW 394 public double Elevation2NW
395 { 395 {
396 get { return m_Elevation2NW; } 396 get { return m_Elevation2NW; }
@@ -398,7 +398,7 @@ namespace OpenSim.Framework
398 } 398 }
399 399
400 private double m_Elevation1NE = 10; 400 private double m_Elevation1NE = 10;
401 401
402 public double Elevation1NE 402 public double Elevation1NE
403 { 403 {
404 get { return m_Elevation1NE; } 404 get { return m_Elevation1NE; }
@@ -406,7 +406,7 @@ namespace OpenSim.Framework
406 } 406 }
407 407
408 private double m_Elevation2NE = 60; 408 private double m_Elevation2NE = 60;
409 409
410 public double Elevation2NE 410 public double Elevation2NE
411 { 411 {
412 get { return m_Elevation2NE; } 412 get { return m_Elevation2NE; }
@@ -414,7 +414,7 @@ namespace OpenSim.Framework
414 } 414 }
415 415
416 private double m_Elevation1SE = 10; 416 private double m_Elevation1SE = 10;
417 417
418 public double Elevation1SE 418 public double Elevation1SE
419 { 419 {
420 get { return m_Elevation1SE; } 420 get { return m_Elevation1SE; }
@@ -422,7 +422,7 @@ namespace OpenSim.Framework
422 } 422 }
423 423
424 private double m_Elevation2SE = 60; 424 private double m_Elevation2SE = 60;
425 425
426 public double Elevation2SE 426 public double Elevation2SE
427 { 427 {
428 get { return m_Elevation2SE; } 428 get { return m_Elevation2SE; }
@@ -430,7 +430,7 @@ namespace OpenSim.Framework
430 } 430 }
431 431
432 private double m_Elevation1SW = 10; 432 private double m_Elevation1SW = 10;
433 433
434 public double Elevation1SW 434 public double Elevation1SW
435 { 435 {
436 get { return m_Elevation1SW; } 436 get { return m_Elevation1SW; }
@@ -438,7 +438,7 @@ namespace OpenSim.Framework
438 } 438 }
439 439
440 private double m_Elevation2SW = 60; 440 private double m_Elevation2SW = 60;
441 441
442 public double Elevation2SW 442 public double Elevation2SW
443 { 443 {
444 get { return m_Elevation2SW; } 444 get { return m_Elevation2SW; }
@@ -446,7 +446,7 @@ namespace OpenSim.Framework
446 } 446 }
447 447
448 private double m_WaterHeight = 20; 448 private double m_WaterHeight = 20;
449 449
450 public double WaterHeight 450 public double WaterHeight
451 { 451 {
452 get { return m_WaterHeight; } 452 get { return m_WaterHeight; }
@@ -454,7 +454,7 @@ namespace OpenSim.Framework
454 } 454 }
455 455
456 private double m_TerrainRaiseLimit = 100; 456 private double m_TerrainRaiseLimit = 100;
457 457
458 public double TerrainRaiseLimit 458 public double TerrainRaiseLimit
459 { 459 {
460 get { return m_TerrainRaiseLimit; } 460 get { return m_TerrainRaiseLimit; }
@@ -462,7 +462,7 @@ namespace OpenSim.Framework
462 } 462 }
463 463
464 private double m_TerrainLowerLimit = -100; 464 private double m_TerrainLowerLimit = -100;
465 465
466 public double TerrainLowerLimit 466 public double TerrainLowerLimit
467 { 467 {
468 get { return m_TerrainLowerLimit; } 468 get { return m_TerrainLowerLimit; }
@@ -470,7 +470,7 @@ namespace OpenSim.Framework
470 } 470 }
471 471
472 private bool m_UseEstateSun = true; 472 private bool m_UseEstateSun = true;
473 473
474 public bool UseEstateSun 474 public bool UseEstateSun
475 { 475 {
476 get { return m_UseEstateSun; } 476 get { return m_UseEstateSun; }
@@ -478,7 +478,7 @@ namespace OpenSim.Framework
478 } 478 }
479 479
480 private bool m_Sandbox = false; 480 private bool m_Sandbox = false;
481 481
482 public bool Sandbox 482 public bool Sandbox
483 { 483 {
484 get { return m_Sandbox; } 484 get { return m_Sandbox; }
@@ -502,7 +502,7 @@ namespace OpenSim.Framework
502 } 502 }
503 503
504 private bool m_FixedSun = false; 504 private bool m_FixedSun = false;
505 505
506 public bool FixedSun 506 public bool FixedSun
507 { 507 {
508 get { return m_FixedSun; } 508 get { return m_FixedSun; }
@@ -510,7 +510,7 @@ namespace OpenSim.Framework
510 } 510 }
511 511
512 private double m_SunPosition = 0.0; 512 private double m_SunPosition = 0.0;
513 513
514 public double SunPosition 514 public double SunPosition
515 { 515 {
516 get { return m_SunPosition; } 516 get { return m_SunPosition; }
@@ -518,7 +518,7 @@ namespace OpenSim.Framework
518 } 518 }
519 519
520 private LLUUID m_Covenant = LLUUID.Zero; 520 private LLUUID m_Covenant = LLUUID.Zero;
521 521
522 public LLUUID Covenant 522 public LLUUID Covenant
523 { 523 {
524 get { return m_Covenant; } 524 get { return m_Covenant; }
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 952fb31..c3bd085 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -172,7 +172,7 @@ namespace OpenSim.Framework.Servers
172 OSHttpResponse response = new OSHttpResponse(context.Response); 172 OSHttpResponse response = new OSHttpResponse(context.Response);
173 173
174 // This is the REST agent interface. We require an agent to properly identify 174 // This is the REST agent interface. We require an agent to properly identify
175 // itself. If the REST handler recognizes the prefix it will attempt to 175 // itself. If the REST handler recognizes the prefix it will attempt to
176 // satisfy the request. If it is not recognizable, and no damage has occurred 176 // satisfy the request. If it is not recognizable, and no damage has occurred
177 // the request can be passed through to the other handlers. This is a low 177 // the request can be passed through to the other handlers. This is a low
178 // probability event; if a request is matched it is normally expected to be 178 // probability event; if a request is matched it is normally expected to be
@@ -650,7 +650,7 @@ namespace OpenSim.Framework.Servers
650 } 650 }
651 651
652 response.AddHeader("Content-type", contentType); 652 response.AddHeader("Content-type", contentType);
653 653
654 byte[] buffer; 654 byte[] buffer;
655 655
656 if (!contentType.Contains("image")) 656 if (!contentType.Contains("image"))
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index e901b68..33081b9 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Servers
89 89
90 m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics); 90 m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics);
91 m_periodicDiagnosticsTimer.Enabled = true; 91 m_periodicDiagnosticsTimer.Enabled = true;
92 92
93 // Add ourselves to thread monitoring. This thread will go on to become the console listening thread 93 // Add ourselves to thread monitoring. This thread will go on to become the console listening thread
94 Thread.CurrentThread.Name = "ConsoleThread"; 94 Thread.CurrentThread.Name = "ConsoleThread";
95 ThreadTracker.Add(Thread.CurrentThread); 95 ThreadTracker.Add(Thread.CurrentThread);
@@ -102,15 +102,15 @@ namespace OpenSim.Framework.Servers
102 { 102 {
103 StringBuilder sb = new StringBuilder("DIAGNOSTICS\n\n"); 103 StringBuilder sb = new StringBuilder("DIAGNOSTICS\n\n");
104 sb.Append(GetUptimeReport()); 104 sb.Append(GetUptimeReport());
105 105
106 if (m_stats != null) 106 if (m_stats != null)
107 { 107 {
108 sb.Append(m_stats.Report()); 108 sb.Append(m_stats.Report());
109 } 109 }
110 110
111 m_log.Debug(sb); 111 m_log.Debug(sb);
112 } 112 }
113 113
114 /// <summary> 114 /// <summary>
115 /// Return a report about the uptime of this server 115 /// Return a report about the uptime of this server
116 /// </summary> 116 /// </summary>
@@ -120,10 +120,10 @@ namespace OpenSim.Framework.Servers
120 StringBuilder sb = new StringBuilder(String.Format("Time now is {0}\n", DateTime.Now)); 120 StringBuilder sb = new StringBuilder(String.Format("Time now is {0}\n", DateTime.Now));
121 sb.Append(String.Format("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime)); 121 sb.Append(String.Format("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime));
122 sb.Append(String.Format("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime)); 122 sb.Append(String.Format("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime));
123 123
124 return sb.ToString(); 124 return sb.ToString();
125 } 125 }
126 126
127 /// <summary> 127 /// <summary>
128 /// Set the level of log notices being echoed to the console 128 /// Set the level of log notices being echoed to the console
129 /// </summary> 129 /// </summary>
@@ -133,7 +133,7 @@ namespace OpenSim.Framework.Servers
133 ILoggerRepository repository = LogManager.GetRepository(); 133 ILoggerRepository repository = LogManager.GetRepository();
134 IAppender[] appenders = repository.GetAppenders(); 134 IAppender[] appenders = repository.GetAppenders();
135 OpenSimAppender consoleAppender = null; 135 OpenSimAppender consoleAppender = null;
136 136
137 foreach (IAppender appender in appenders) 137 foreach (IAppender appender in appenders)
138 { 138 {
139 if (appender.Name == "Console") 139 if (appender.Name == "Console")
@@ -142,13 +142,13 @@ namespace OpenSim.Framework.Servers
142 break; 142 break;
143 } 143 }
144 } 144 }
145 145
146 if (null == consoleAppender) 146 if (null == consoleAppender)
147 { 147 {
148 Notice("No appender named Console found (see the log4net config file for this executable)!"); 148 Notice("No appender named Console found (see the log4net config file for this executable)!");
149 return; 149 return;
150 } 150 }
151 151
152 if (setParams.Length > 0) 152 if (setParams.Length > 0)
153 { 153 {
154 Level consoleLevel = repository.LevelMap[setParams[0]]; 154 Level consoleLevel = repository.LevelMap[setParams[0]];
@@ -160,12 +160,12 @@ namespace OpenSim.Framework.Servers
160 "{0} is not a valid logging level. Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF", 160 "{0} is not a valid logging level. Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF",
161 setParams[0])); 161 setParams[0]));
162 } 162 }
163 163
164 // If there is no threshold set then the threshold is effectively everything. 164 // If there is no threshold set then the threshold is effectively everything.
165 Level thresholdLevel 165 Level thresholdLevel
166 = (null != consoleAppender.Threshold ? consoleAppender.Threshold : log4net.Core.Level.All); 166 = (null != consoleAppender.Threshold ? consoleAppender.Threshold : log4net.Core.Level.All);
167 167
168 Notice(String.Format("Console log level is {0}", thresholdLevel)); 168 Notice(String.Format("Console log level is {0}", thresholdLevel));
169 } 169 }
170 170
171 /// <summary> 171 /// <summary>
@@ -203,7 +203,7 @@ namespace OpenSim.Framework.Servers
203 Notice(""); 203 Notice("");
204 Notice("quit - equivalent to shutdown."); 204 Notice("quit - equivalent to shutdown.");
205 205
206 Notice("set log level [level] - change the console logging level only. For example, off or debug."); 206 Notice("set log level [level] - change the console logging level only. For example, off or debug.");
207 Notice("show info - show server information (e.g. startup path)."); 207 Notice("show info - show server information (e.g. startup path).");
208 208
209 if (m_stats != null) 209 if (m_stats != null)
@@ -219,7 +219,7 @@ namespace OpenSim.Framework.Servers
219 case "set": 219 case "set":
220 Set(cmdparams); 220 Set(cmdparams);
221 break; 221 break;
222 222
223 case "show": 223 case "show":
224 if (cmdparams.Length > 0) 224 if (cmdparams.Length > 0)
225 { 225 {
@@ -232,8 +232,8 @@ namespace OpenSim.Framework.Servers
232 Shutdown(); 232 Shutdown();
233 break; 233 break;
234 } 234 }
235 } 235 }
236 236
237 /// <summary> 237 /// <summary>
238 /// Set an OpenSim parameter 238 /// Set an OpenSim parameter
239 /// </summary> 239 /// </summary>
@@ -245,15 +245,15 @@ namespace OpenSim.Framework.Servers
245 // Temporary while we only have one command which takes at least two parameters 245 // Temporary while we only have one command which takes at least two parameters
246 if (setArgs.Length < 2) 246 if (setArgs.Length < 2)
247 return; 247 return;
248 248
249 if (setArgs[0] == "log" && setArgs[1] == "level") 249 if (setArgs[0] == "log" && setArgs[1] == "level")
250 { 250 {
251 string[] setParams = new string[setArgs.Length - 2]; 251 string[] setParams = new string[setArgs.Length - 2];
252 Array.Copy(setArgs, 2, setParams, 0, setArgs.Length - 2); 252 Array.Copy(setArgs, 2, setParams, 0, setArgs.Length - 2);
253 253
254 SetConsoleLogLevel(setParams); 254 SetConsoleLogLevel(setParams);
255 } 255 }
256 } 256 }
257 257
258 /// <summary> 258 /// <summary>
259 /// Outputs to the console information about the region 259 /// Outputs to the console information about the region
@@ -276,7 +276,7 @@ namespace OpenSim.Framework.Servers
276 Notice(m_stats.Report()); 276 Notice(m_stats.Report());
277 } 277 }
278 break; 278 break;
279 279
280 case "threads": 280 case "threads":
281 List<Thread> threads = ThreadTracker.GetThreads(); 281 List<Thread> threads = ThreadTracker.GetThreads();
282 if (threads == null) 282 if (threads == null)
@@ -291,7 +291,7 @@ namespace OpenSim.Framework.Servers
291 Notice("ID: " + t.ManagedThreadId.ToString() + ", Name: " + t.Name + ", Alive: " + t.IsAlive.ToString() + ", Pri: " + t.Priority.ToString() + ", State: " + t.ThreadState.ToString()); 291 Notice("ID: " + t.ManagedThreadId.ToString() + ", Name: " + t.Name + ", Alive: " + t.IsAlive.ToString() + ", Pri: " + t.Priority.ToString() + ", State: " + t.ThreadState.ToString());
292 } 292 }
293 } 293 }
294 break; 294 break;
295 295
296 case "uptime": 296 case "uptime":
297 Notice(GetUptimeReport()); 297 Notice(GetUptimeReport());
@@ -301,7 +301,7 @@ namespace OpenSim.Framework.Servers
301 Notice("Version: " + m_version); 301 Notice("Version: " + m_version);
302 break; 302 break;
303 } 303 }
304 } 304 }
305 305
306 /// <summary> 306 /// <summary>
307 /// Console output is only possible if a console has been established. 307 /// Console output is only possible if a console has been established.
diff --git a/OpenSim/Framework/Servers/OSHttpHandler.cs b/OpenSim/Framework/Servers/OSHttpHandler.cs
index 66fff3e..838f29a 100644
--- a/OpenSim/Framework/Servers/OSHttpHandler.cs
+++ b/OpenSim/Framework/Servers/OSHttpHandler.cs
@@ -72,21 +72,21 @@ namespace OpenSim.Framework.Servers
72 /// Regular expression used to match against method of 72 /// Regular expression used to match against method of
73 /// the incoming HTTP request. If you want to match any string 73 /// the incoming HTTP request. If you want to match any string
74 /// either use '.*' or null. To match on the empty string use 74 /// either use '.*' or null. To match on the empty string use
75 /// '^$'. 75 /// '^$'.
76 /// </summary> 76 /// </summary>
77 public virtual Regex Method 77 public virtual Regex Method
78 { 78 {
79 get { return _method; } 79 get { return _method; }
80 } 80 }
81 protected Regex _method; 81 protected Regex _method;
82 82
83 /// <summary> 83 /// <summary>
84 /// Regular expression used to match against path of the 84 /// Regular expression used to match against path of the
85 /// incoming HTTP request. If you want to match any string 85 /// incoming HTTP request. If you want to match any string
86 /// either use '.*' or null. To match on the emtpy string use 86 /// either use '.*' or null. To match on the emtpy string use
87 /// '^$'. 87 /// '^$'.
88 /// </summary> 88 /// </summary>
89 public virtual Regex Path 89 public virtual Regex Path
90 { 90 {
91 get { return _path; } 91 get { return _path; }
92 } 92 }
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Servers
97 /// allowing us to match on URI query fields. 97 /// allowing us to match on URI query fields.
98 /// </summary> 98 /// </summary>
99 public virtual Dictionary<string, Regex> Query 99 public virtual Dictionary<string, Regex> Query
100 { 100 {
101 get { return _query; } 101 get { return _query; }
102 } 102 }
103 protected Dictionary<string, Regex> _query; 103 protected Dictionary<string, Regex> _query;
@@ -107,7 +107,7 @@ namespace OpenSim.Framework.Servers
107 /// allowing us to match on HTTP header fields. 107 /// allowing us to match on HTTP header fields.
108 /// </summary> 108 /// </summary>
109 public virtual Dictionary<string, Regex> Headers 109 public virtual Dictionary<string, Regex> Headers
110 { 110 {
111 get { return _headers; } 111 get { return _headers; }
112 } 112 }
113 protected Dictionary<string, Regex> _headers; 113 protected Dictionary<string, Regex> _headers;
@@ -137,7 +137,7 @@ namespace OpenSim.Framework.Servers
137 /// <param name="contentType">null or content type 137 /// <param name="contentType">null or content type
138 /// regex</param> 138 /// regex</param>
139 /// <param name="whitelist">null or IP address regex</param> 139 /// <param name="whitelist">null or IP address regex</param>
140 public OSHttpHandler(Regex method, Regex path, Dictionary<string, Regex> query, 140 public OSHttpHandler(Regex method, Regex path, Dictionary<string, Regex> query,
141 Dictionary<string, Regex> headers, Regex contentType, Regex whitelist) 141 Dictionary<string, Regex> headers, Regex contentType, Regex whitelist)
142 { 142 {
143 _method = method; 143 _method = method;
@@ -155,7 +155,7 @@ namespace OpenSim.Framework.Servers
155 155
156 /// <summary> 156 /// <summary>
157 /// Process an incoming OSHttpRequest that matched our 157 /// Process an incoming OSHttpRequest that matched our
158 /// requirements. 158 /// requirements.
159 /// </summary> 159 /// </summary>
160 /// <returns> 160 /// <returns>
161 /// OSHttpHandlerResult.Pass if we are after all not 161 /// OSHttpHandlerResult.Pass if we are after all not
@@ -180,4 +180,4 @@ namespace OpenSim.Framework.Servers
180 return sw.ToString(); 180 return sw.ToString();
181 } 181 }
182 } 182 }
183} \ No newline at end of file 183}
diff --git a/OpenSim/Framework/Servers/OSHttpHttpHandler.cs b/OpenSim/Framework/Servers/OSHttpHttpHandler.cs
index 66120c3..e08df85 100644
--- a/OpenSim/Framework/Servers/OSHttpHttpHandler.cs
+++ b/OpenSim/Framework/Servers/OSHttpHttpHandler.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Servers
58 /// <param name="headers">null or dictionary with header 58 /// <param name="headers">null or dictionary with header
59 /// regexs</param> 59 /// regexs</param>
60 /// <param name="whitelist">null or IP address whitelist</param> 60 /// <param name="whitelist">null or IP address whitelist</param>
61 public OSHttpHttpHandler(GenericHTTPMethod handler, Regex method, Regex path, 61 public OSHttpHttpHandler(GenericHTTPMethod handler, Regex method, Regex path,
62 Dictionary<string, Regex> query, 62 Dictionary<string, Regex> query,
63 Dictionary<string, Regex> headers, Regex whitelist) 63 Dictionary<string, Regex> headers, Regex whitelist)
64 : base(method, path, query, headers, new Regex(@"^text/html", RegexOptions.IgnoreCase | RegexOptions.Compiled), 64 : base(method, path, query, headers, new Regex(@"^text/html", RegexOptions.IgnoreCase | RegexOptions.Compiled),
@@ -71,7 +71,7 @@ namespace OpenSim.Framework.Servers
71 /// Instantiate an HTTP handler. 71 /// Instantiate an HTTP handler.
72 /// </summary> 72 /// </summary>
73 /// <param name="handler">a GenericHTTPMethod</param> 73 /// <param name="handler">a GenericHTTPMethod</param>
74 public OSHttpHttpHandler(GenericHTTPMethod handler) 74 public OSHttpHttpHandler(GenericHTTPMethod handler)
75 : this(handler, new Regex(@"^GET$", RegexOptions.IgnoreCase | RegexOptions.Compiled), null, null, null, null) 75 : this(handler, new Regex(@"^GET$", RegexOptions.IgnoreCase | RegexOptions.Compiled), null, null, null, null)
76 { 76 {
77 } 77 }
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Servers
79 /// <summary> 79 /// <summary>
80 /// Invoked by OSHttpRequestPump. 80 /// Invoked by OSHttpRequestPump.
81 /// </summary> 81 /// </summary>
82 public override OSHttpHandlerResult Process(OSHttpRequest request) 82 public override OSHttpHandlerResult Process(OSHttpRequest request)
83 { 83 {
84 // call handler method 84 // call handler method
85 Hashtable responseData = _handler(request.Query); 85 Hashtable responseData = _handler(request.Query);
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Servers
110 } 110 }
111 111
112 response.AddHeader("Content-type", contentType); 112 response.AddHeader("Content-type", contentType);
113 113
114 byte[] buffer; 114 byte[] buffer;
115 115
116 if (!contentType.Contains("image")) 116 if (!contentType.Contains("image"))
@@ -142,4 +142,4 @@ namespace OpenSim.Framework.Servers
142 return OSHttpHandlerResult.Done; 142 return OSHttpHandlerResult.Done;
143 } 143 }
144 } 144 }
145} \ No newline at end of file 145}
diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs
index 0a82a04..01e71c8 100644
--- a/OpenSim/Framework/Servers/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequest.cs
@@ -38,42 +38,35 @@ namespace OpenSim.Framework.Servers
38{ 38{
39 public class OSHttpRequest 39 public class OSHttpRequest
40 { 40 {
41
42
43 public string[] AcceptTypes 41 public string[] AcceptTypes
44 { 42 {
45 get { return _acceptTypes; } 43 get { return _acceptTypes; }
46 } 44 }
47 private string[] _acceptTypes; 45 private string[] _acceptTypes;
48 46
49
50 public Encoding ContentEncoding 47 public Encoding ContentEncoding
51 { 48 {
52 get { return _contentEncoding; } 49 get { return _contentEncoding; }
53 } 50 }
54 private Encoding _contentEncoding; 51 private Encoding _contentEncoding;
55 52
56
57 public long ContentLength 53 public long ContentLength
58 { 54 {
59 get { return _contentLength64; } 55 get { return _contentLength64; }
60 } 56 }
61 private long _contentLength64; 57 private long _contentLength64;
62 58
63
64 public long ContentLength64 59 public long ContentLength64
65 { 60 {
66 get { return ContentLength; } 61 get { return ContentLength; }
67 } 62 }
68 63
69
70 public string ContentType 64 public string ContentType
71 { 65 {
72 get { return _contentType; } 66 get { return _contentType; }
73 } 67 }
74 private string _contentType; 68 private string _contentType;
75 69
76
77 // public CookieCollection Cookies 70 // public CookieCollection Cookies
78 // { 71 // {
79 // get { return _cookies; } 72 // get { return _cookies; }
@@ -92,63 +85,54 @@ namespace OpenSim.Framework.Servers
92 } 85 }
93 private string _httpMethod; 86 private string _httpMethod;
94 87
95
96 public Stream InputStream 88 public Stream InputStream
97 { 89 {
98 get { return _inputStream; } 90 get { return _inputStream; }
99 } 91 }
100 private Stream _inputStream; 92 private Stream _inputStream;
101 93
102
103 // public bool IsSecureConnection 94 // public bool IsSecureConnection
104 // { 95 // {
105 // get { return _isSecureConnection; } 96 // get { return _isSecureConnection; }
106 // } 97 // }
107 // private bool _isSecureConnection; 98 // private bool _isSecureConnection;
108 99
109
110 // public bool IsAuthenticated 100 // public bool IsAuthenticated
111 // { 101 // {
112 // get { return _isAuthenticated; } 102 // get { return _isAuthenticated; }
113 // } 103 // }
114 // private bool _isAuthenticated; 104 // private bool _isAuthenticated;
115 105
116
117 public bool HasEntityBody 106 public bool HasEntityBody
118 { 107 {
119 get { return _hasbody; } 108 get { return _hasbody; }
120 } 109 }
121 private bool _hasbody; 110 private bool _hasbody;
122 111
123
124 public bool KeepAlive 112 public bool KeepAlive
125 { 113 {
126 get { return _keepAlive; } 114 get { return _keepAlive; }
127 } 115 }
128 private bool _keepAlive; 116 private bool _keepAlive;
129 117
130
131 public string RawUrl 118 public string RawUrl
132 { 119 {
133 get { return _rawUrl; } 120 get { return _rawUrl; }
134 } 121 }
135 private string _rawUrl; 122 private string _rawUrl;
136 123
137
138 public Uri Url 124 public Uri Url
139 { 125 {
140 get { return _url; } 126 get { return _url; }
141 } 127 }
142 private Uri _url; 128 private Uri _url;
143 129
144
145 public string UserAgent 130 public string UserAgent
146 { 131 {
147 get { return _userAgent; } 132 get { return _userAgent; }
148 } 133 }
149 private string _userAgent; 134 private string _userAgent;
150 135
151
152 public NameValueCollection QueryString 136 public NameValueCollection QueryString
153 { 137 {
154 get { return _queryString; } 138 get { return _queryString; }
@@ -161,28 +145,24 @@ namespace OpenSim.Framework.Servers
161 } 145 }
162 private Hashtable _query; 146 private Hashtable _query;
163 147
164
165 public IPEndPoint RemoteIPEndPoint 148 public IPEndPoint RemoteIPEndPoint
166 { 149 {
167 get { return _ipEndPoint; } 150 get { return _ipEndPoint; }
168 } 151 }
169 private IPEndPoint _ipEndPoint; 152 private IPEndPoint _ipEndPoint;
170 153
171
172 internal HttpRequest HttpRequest 154 internal HttpRequest HttpRequest
173 { 155 {
174 get { return _request; } 156 get { return _request; }
175 } 157 }
176 private HttpRequest _request; 158 private HttpRequest _request;
177 159
178
179 internal HttpClientContext HttpClientContext 160 internal HttpClientContext HttpClientContext
180 { 161 {
181 get { return _context; } 162 get { return _context; }
182 } 163 }
183 private HttpClientContext _context; 164 private HttpClientContext _context;
184 165
185
186 /// <summary> 166 /// <summary>
187 /// Internal whiteboard for handlers to store temporary stuff 167 /// Internal whiteboard for handlers to store temporary stuff
188 /// into. 168 /// into.
@@ -193,12 +173,10 @@ namespace OpenSim.Framework.Servers
193 } 173 }
194 private Dictionary<string, object> _whiteboard = new Dictionary<string, object>(); 174 private Dictionary<string, object> _whiteboard = new Dictionary<string, object>();
195 175
196
197 public OSHttpRequest() 176 public OSHttpRequest()
198 { 177 {
199 } 178 }
200 179
201
202 public OSHttpRequest(HttpListenerRequest req) 180 public OSHttpRequest(HttpListenerRequest req)
203 { 181 {
204 _acceptTypes = req.AcceptTypes; 182 _acceptTypes = req.AcceptTypes;
diff --git a/OpenSim/Framework/Servers/OSHttpRequestPump.cs b/OpenSim/Framework/Servers/OSHttpRequestPump.cs
index 8d4dc0d..b4270b3 100644
--- a/OpenSim/Framework/Servers/OSHttpRequestPump.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequestPump.cs
@@ -39,7 +39,6 @@ using System.Threading;
39using log4net; 39using log4net;
40using HttpServer; 40using HttpServer;
41 41
42
43namespace OpenSim.Framework.Servers 42namespace OpenSim.Framework.Servers
44{ 43{
45 /// <summary> 44 /// <summary>
@@ -58,13 +57,12 @@ namespace OpenSim.Framework.Servers
58 protected Thread _engine; 57 protected Thread _engine;
59 58
60 private int _id; 59 private int _id;
61 60
62 public string EngineID 61 public string EngineID
63 { 62 {
64 get { return String.Format("{0} pump {1}", _server.EngineID, _id); } 63 get { return String.Format("{0} pump {1}", _server.EngineID, _id); }
65 } 64 }
66 65
67
68 public OSHttpRequestPump(OSHttpServer server, OSHttpRequestQueue queue, int id) 66 public OSHttpRequestPump(OSHttpServer server, OSHttpRequestQueue queue, int id)
69 { 67 {
70 _server = server; 68 _server = server;
@@ -77,7 +75,6 @@ namespace OpenSim.Framework.Servers
77 _engine.Start(); 75 _engine.Start();
78 76
79 ThreadTracker.Add(_engine); 77 ThreadTracker.Add(_engine);
80
81 } 78 }
82 79
83 public static OSHttpRequestPump[] Pumps(OSHttpServer server, OSHttpRequestQueue queue, int poolSize) 80 public static OSHttpRequestPump[] Pumps(OSHttpServer server, OSHttpRequestQueue queue, int poolSize)
@@ -104,21 +101,22 @@ namespace OpenSim.Framework.Servers
104 public void Engine() 101 public void Engine()
105 { 102 {
106 OSHttpRequest req = null; 103 OSHttpRequest req = null;
107 104
108 while (true) 105 while (true)
109 { 106 {
110 try { 107 try
108 {
111 // dequeue an OSHttpRequest from OSHttpServer's 109 // dequeue an OSHttpRequest from OSHttpServer's
112 // request queue 110 // request queue
113 req = _queue.Dequeue(); 111 req = _queue.Dequeue();
114 112
115 // get a copy of the list of registered handlers 113 // get a copy of the list of registered handlers
116 List<OSHttpHandler> handlers = _server.OSHttpHandlers; 114 List<OSHttpHandler> handlers = _server.OSHttpHandlers;
117 115
118 // prune list and have it sorted from most 116 // prune list and have it sorted from most
119 // specific to least specific 117 // specific to least specific
120 handlers = MatchHandlers(req, handlers); 118 handlers = MatchHandlers(req, handlers);
121 119
122 // process req: we try each handler in turn until 120 // process req: we try each handler in turn until
123 // we are either out of handlers or get back a 121 // we are either out of handlers or get back a
124 // Pass or Done 122 // Pass or Done
@@ -126,18 +124,18 @@ namespace OpenSim.Framework.Servers
126 foreach (OSHttpHandler h in handlers) 124 foreach (OSHttpHandler h in handlers)
127 { 125 {
128 rc = h.Process(req); 126 rc = h.Process(req);
129 127
130 // Pass: handler did not process the request, 128 // Pass: handler did not process the request,
131 // try next handler 129 // try next handler
132 if (OSHttpHandlerResult.Pass == rc) continue; 130 if (OSHttpHandlerResult.Pass == rc) continue;
133 131
134 // Handled: handler has processed the request 132 // Handled: handler has processed the request
135 if (OSHttpHandlerResult.Done == rc) break; 133 if (OSHttpHandlerResult.Done == rc) break;
136 134
137 // hmm, something went wrong 135 // hmm, something went wrong
138 throw new Exception(String.Format("[{0}] got unexpected OSHttpHandlerResult {1}", EngineID, rc)); 136 throw new Exception(String.Format("[{0}] got unexpected OSHttpHandlerResult {1}", EngineID, rc));
139 } 137 }
140 138
141 if (OSHttpHandlerResult.Unprocessed == rc) 139 if (OSHttpHandlerResult.Unprocessed == rc)
142 { 140 {
143 _log.InfoFormat("[{0}] OSHttpHandler: no handler registered for {1}", EngineID, req); 141 _log.InfoFormat("[{0}] OSHttpHandler: no handler registered for {1}", EngineID, req);
@@ -190,7 +188,7 @@ namespace OpenSim.Framework.Servers
190 if (null != remote) 188 if (null != remote)
191 { 189 {
192 Match epm = h.IPEndPointWhitelist.Match(remote.ToString()); 190 Match epm = h.IPEndPointWhitelist.Match(remote.ToString());
193 if (!epm.Success) 191 if (!epm.Success)
194 { 192 {
195 scoredHandlers.Remove(h); 193 scoredHandlers.Remove(h);
196 continue; 194 continue;
@@ -201,7 +199,7 @@ namespace OpenSim.Framework.Servers
201 if (null != h.Method) 199 if (null != h.Method)
202 { 200 {
203 Match m = h.Method.Match(req.HttpMethod); 201 Match m = h.Method.Match(req.HttpMethod);
204 if (!m.Success) 202 if (!m.Success)
205 { 203 {
206 scoredHandlers.Remove(h); 204 scoredHandlers.Remove(h);
207 continue; 205 continue;
@@ -213,7 +211,7 @@ namespace OpenSim.Framework.Servers
213 if (null != h.Path) 211 if (null != h.Path)
214 { 212 {
215 Match m = h.Path.Match(req.RawUrl); 213 Match m = h.Path.Match(req.RawUrl);
216 if (!m.Success) 214 if (!m.Success)
217 { 215 {
218 scoredHandlers.Remove(h); 216 scoredHandlers.Remove(h);
219 continue; 217 continue;
@@ -272,14 +270,15 @@ namespace OpenSim.Framework.Servers
272 { 270 {
273 return 0; 271 return 0;
274 } 272 }
275 273
276 // does the content of collection[tag] match 274 // does the content of collection[tag] match
277 // the supplied regex? 275 // the supplied regex?
278 Match cm = regexs[tag].Match(collection[tag]); 276 Match cm = regexs[tag].Match(collection[tag]);
279 if (!cm.Success) { 277 if (!cm.Success)
278 {
280 return 0; 279 return 0;
281 } 280 }
282 281
283 // ok: matches 282 // ok: matches
284 matched++; 283 matched++;
285 continue; 284 continue;
@@ -288,7 +287,7 @@ namespace OpenSim.Framework.Servers
288 return matched; 287 return matched;
289 } 288 }
290 289
291 [ConditionalAttribute("DEBUGGING")] 290 [ConditionalAttribute("DEBUGGING")]
292 private void LogDumpHandlerList(List<OSHttpHandler> l) 291 private void LogDumpHandlerList(List<OSHttpHandler> l)
293 { 292 {
294 _log.DebugFormat("[{0}] OSHttpHandlerList dump:", EngineID); 293 _log.DebugFormat("[{0}] OSHttpHandlerList dump:", EngineID);
diff --git a/OpenSim/Framework/Servers/OSHttpRequestQueue.cs b/OpenSim/Framework/Servers/OSHttpRequestQueue.cs
index f6f1829..94f7b32 100644
--- a/OpenSim/Framework/Servers/OSHttpRequestQueue.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequestQueue.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Servers
40 { 40 {
41 private object _syncObject = new object(); 41 private object _syncObject = new object();
42 42
43 new public void Enqueue(OSHttpRequest req) 43 new public void Enqueue(OSHttpRequest req)
44 { 44 {
45 lock (_syncObject) 45 lock (_syncObject)
46 { 46 {
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers
48 Monitor.Pulse(_syncObject); 48 Monitor.Pulse(_syncObject);
49 } 49 }
50 } 50 }
51 51
52 new public OSHttpRequest Dequeue() 52 new public OSHttpRequest Dequeue()
53 { 53 {
54 OSHttpRequest req = null; 54 OSHttpRequest req = null;
@@ -65,4 +65,4 @@ namespace OpenSim.Framework.Servers
65 return req; 65 return req;
66 } 66 }
67 } 67 }
68} \ No newline at end of file 68}
diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs
index eb7e400..21d1e2b 100644
--- a/OpenSim/Framework/Servers/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/OSHttpResponse.cs
@@ -56,15 +56,15 @@ namespace OpenSim.Framework.Servers
56 /// </summary> 56 /// </summary>
57 /// <remarks> 57 /// <remarks>
58 /// Setting this property will also set IsContentTypeSet to 58 /// Setting this property will also set IsContentTypeSet to
59 /// true. 59 /// true.
60 /// </remarks> 60 /// </remarks>
61 public string ContentType 61 public string ContentType
62 { 62 {
63 get 63 get
64 { 64 {
65 if (HttpServer) 65 if (HttpServer)
66 return _httpResponse.ContentType; 66 return _httpResponse.ContentType;
67 else 67 else
68 return _httpListenerResponse.ContentType; 68 return _httpListenerResponse.ContentType;
69 } 69 }
70 set 70 set
@@ -100,11 +100,11 @@ namespace OpenSim.Framework.Servers
100 /// </summary> 100 /// </summary>
101 public long ContentLength 101 public long ContentLength
102 { 102 {
103 get 103 get
104 { 104 {
105 if (HttpServer) 105 if (HttpServer)
106 return _httpResponse.ContentLength; 106 return _httpResponse.ContentLength;
107 else 107 else
108 return _httpListenerResponse.ContentLength64; 108 return _httpListenerResponse.ContentLength64;
109 } 109 }
110 set 110 set
@@ -130,11 +130,11 @@ namespace OpenSim.Framework.Servers
130 /// </summary> 130 /// </summary>
131 public Encoding ContentEncoding 131 public Encoding ContentEncoding
132 { 132 {
133 get 133 get
134 { 134 {
135 if (HttpServer) 135 if (HttpServer)
136 return _httpResponse.Encoding; 136 return _httpResponse.Encoding;
137 else 137 else
138 return _httpListenerResponse.ContentEncoding; 138 return _httpListenerResponse.ContentEncoding;
139 } 139 }
140 140
@@ -142,7 +142,7 @@ namespace OpenSim.Framework.Servers
142 { 142 {
143 if (HttpServer) 143 if (HttpServer)
144 _httpResponse.Encoding = value; 144 _httpResponse.Encoding = value;
145 else 145 else
146 _httpListenerResponse.ContentEncoding = value; 146 _httpListenerResponse.ContentEncoding = value;
147 } 147 }
148 } 148 }
@@ -152,8 +152,8 @@ namespace OpenSim.Framework.Servers
152 /// </summary> 152 /// </summary>
153 public WebHeaderCollection Headers 153 public WebHeaderCollection Headers
154 { 154 {
155 get 155 get
156 { 156 {
157 if (HttpServer) 157 if (HttpServer)
158 return null; 158 return null;
159 else 159 else
@@ -166,10 +166,10 @@ namespace OpenSim.Framework.Servers
166 /// </summary> 166 /// </summary>
167 public bool KeepAlive 167 public bool KeepAlive
168 { 168 {
169 get 169 get
170 { 170 {
171 if (HttpServer) 171 if (HttpServer)
172 return _httpResponse.Connection == ConnectionType.KeepAlive; 172 return _httpResponse.Connection == ConnectionType.KeepAlive;
173 else 173 else
174 return _httpListenerResponse.KeepAlive; 174 return _httpListenerResponse.KeepAlive;
175 } 175 }
@@ -178,7 +178,7 @@ namespace OpenSim.Framework.Servers
178 { 178 {
179 if (HttpServer) 179 if (HttpServer)
180 _httpResponse.Connection = ConnectionType.KeepAlive; 180 _httpResponse.Connection = ConnectionType.KeepAlive;
181 else 181 else
182 _httpListenerResponse.KeepAlive = value; 182 _httpListenerResponse.KeepAlive = value;
183 } 183 }
184 } 184 }
@@ -191,8 +191,8 @@ namespace OpenSim.Framework.Servers
191 /// </remarks> 191 /// </remarks>
192 public Stream OutputStream 192 public Stream OutputStream
193 { 193 {
194 get 194 get
195 { 195 {
196 if (HttpServer) 196 if (HttpServer)
197 return _httpResponse.Body; 197 return _httpResponse.Body;
198 else 198 else
@@ -205,10 +205,10 @@ namespace OpenSim.Framework.Servers
205 /// </summary> 205 /// </summary>
206 public Stream Body 206 public Stream Body
207 { 207 {
208 get 208 get
209 { 209 {
210 if (HttpServer) 210 if (HttpServer)
211 return _httpResponse.Body; 211 return _httpResponse.Body;
212 throw new Exception("[OSHttpResponse] mixed .NET and HttpServer access"); 212 throw new Exception("[OSHttpResponse] mixed .NET and HttpServer access");
213 } 213 }
214 } 214 }
@@ -228,18 +228,18 @@ namespace OpenSim.Framework.Servers
228 } 228 }
229 } 229 }
230 230
231 231
232 /// <summary> 232 /// <summary>
233 /// Chunk transfers. 233 /// Chunk transfers.
234 /// </summary> 234 /// </summary>
235 public bool SendChunked 235 public bool SendChunked
236 { 236 {
237 get 237 get
238 { 238 {
239 if (HttpServer) 239 if (HttpServer)
240 return _httpResponse.Chunked; 240 return _httpResponse.Chunked;
241 else 241 else
242 return _httpListenerResponse.SendChunked; 242 return _httpListenerResponse.SendChunked;
243 } 243 }
244 244
245 set 245 set
@@ -256,12 +256,12 @@ namespace OpenSim.Framework.Servers
256 /// </summary> 256 /// </summary>
257 public int StatusCode 257 public int StatusCode
258 { 258 {
259 get 259 get
260 { 260 {
261 if (HttpServer) 261 if (HttpServer)
262 return (int)_httpResponse.Status; 262 return (int)_httpResponse.Status;
263 else 263 else
264 return _httpListenerResponse.StatusCode; 264 return _httpListenerResponse.StatusCode;
265 } 265 }
266 266
267 set 267 set
@@ -279,12 +279,12 @@ namespace OpenSim.Framework.Servers
279 /// </summary> 279 /// </summary>
280 public string StatusDescription 280 public string StatusDescription
281 { 281 {
282 get 282 get
283 { 283 {
284 if (HttpServer) 284 if (HttpServer)
285 return _httpResponse.Reason; 285 return _httpResponse.Reason;
286 else 286 else
287 return _httpListenerResponse.StatusDescription; 287 return _httpListenerResponse.StatusDescription;
288 } 288 }
289 289
290 set 290 set
@@ -331,7 +331,7 @@ namespace OpenSim.Framework.Servers
331 /// object. 331 /// object.
332 /// </summary 332 /// </summary
333 /// <param name="req">Incoming OSHttpRequest to which we are 333 /// <param name="req">Incoming OSHttpRequest to which we are
334 /// replying</param> 334 /// replying</param>
335 public OSHttpResponse(OSHttpRequest req) 335 public OSHttpResponse(OSHttpRequest req)
336 { 336 {
337 _httpResponse = new HttpResponse(req.HttpClientContext, req.HttpRequest); 337 _httpResponse = new HttpResponse(req.HttpClientContext, req.HttpRequest);
@@ -343,7 +343,7 @@ namespace OpenSim.Framework.Servers
343 /// <param name="key">string containing the header field 343 /// <param name="key">string containing the header field
344 /// name</param> 344 /// name</param>
345 /// <param name="value">string containing the header field 345 /// <param name="value">string containing the header field
346 /// value</param> 346 /// value</param>
347 public void AddHeader(string key, string value) 347 public void AddHeader(string key, string value)
348 { 348 {
349 if (HttpServer) 349 if (HttpServer)
@@ -361,8 +361,8 @@ namespace OpenSim.Framework.Servers
361 { 361 {
362 _httpResponse.Body.Flush(); 362 _httpResponse.Body.Flush();
363 _httpResponse.Send(); 363 _httpResponse.Send();
364 } 364 }
365 else 365 else
366 { 366 {
367 OutputStream.Close(); 367 OutputStream.Close();
368 } 368 }
diff --git a/OpenSim/Framework/Servers/OSHttpServer.cs b/OpenSim/Framework/Servers/OSHttpServer.cs
index e0d26ff..40f4229 100644
--- a/OpenSim/Framework/Servers/OSHttpServer.cs
+++ b/OpenSim/Framework/Servers/OSHttpServer.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Servers
80 get { return _isSecure; } 80 get { return _isSecure; }
81 } 81 }
82 82
83 public int QueueSize 83 public int QueueSize
84 { 84 {
85 get { return _pumps.Length; } 85 get { return _pumps.Length; }
86 } 86 }
@@ -91,7 +91,7 @@ namespace OpenSim.Framework.Servers
91 protected List<OSHttpHandler> _httpHandlers = new List<OSHttpHandler>(); 91 protected List<OSHttpHandler> _httpHandlers = new List<OSHttpHandler>();
92 public List<OSHttpHandler> OSHttpHandlers 92 public List<OSHttpHandler> OSHttpHandlers
93 { 93 {
94 get 94 get
95 { 95 {
96 lock (_httpHandlers) 96 lock (_httpHandlers)
97 { 97 {
@@ -175,7 +175,7 @@ namespace OpenSim.Framework.Servers
175 _listener.RequestHandler += OnHttpRequest; 175 _listener.RequestHandler += OnHttpRequest;
176 _listener.Start(QueueSize); 176 _listener.Start(QueueSize);
177 _log.InfoFormat("[{0}] HTTP server started", EngineID); 177 _log.InfoFormat("[{0}] HTTP server started", EngineID);
178 178
179 lock (_syncObject) Monitor.Wait(_syncObject); 179 lock (_syncObject) Monitor.Wait(_syncObject);
180 } 180 }
181 catch (Exception ex) 181 catch (Exception ex)
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Servers
196 /// and regular expressions to match against header values</param> 196 /// and regular expressions to match against header values</param>
197 public void AddHandler(OSHttpHandler handler) 197 public void AddHandler(OSHttpHandler handler)
198 { 198 {
199 lock (_httpHandlers) 199 lock (_httpHandlers)
200 { 200 {
201 if (_httpHandlers.Contains(handler)) 201 if (_httpHandlers.Contains(handler))
202 { 202 {
diff --git a/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs b/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs
index f3f056a..996e5dc 100644
--- a/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs
+++ b/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs
@@ -54,16 +54,16 @@ namespace OpenSim.Framework.Servers
54 protected bool XmlRpcMethodMatch(OSHttpRequest req) 54 protected bool XmlRpcMethodMatch(OSHttpRequest req)
55 { 55 {
56 XmlRpcRequest xmlRpcRequest = null; 56 XmlRpcRequest xmlRpcRequest = null;
57 57
58 // check whether req is already reified 58 // check whether req is already reified
59 // if not: reify (and post to whiteboard) 59 // if not: reify (and post to whiteboard)
60 try 60 try
61 { 61 {
62 if (req.Whiteboard.ContainsKey("xmlrequest")) 62 if (req.Whiteboard.ContainsKey("xmlrequest"))
63 { 63 {
64 xmlRpcRequest = req.Whiteboard["xmlrequest"] as XmlRpcRequest; 64 xmlRpcRequest = req.Whiteboard["xmlrequest"] as XmlRpcRequest;
65 } 65 }
66 else 66 else
67 { 67 {
68 StreamReader body = new StreamReader(req.InputStream); 68 StreamReader body = new StreamReader(req.InputStream);
69 string requestBody = body.ReadToEnd(); 69 string requestBody = body.ReadToEnd();
@@ -76,22 +76,22 @@ namespace OpenSim.Framework.Servers
76 _log.ErrorFormat("[OSHttpXmlRpcHandler] failed to deserialize XmlRpcRequest from {0}", req.ToString()); 76 _log.ErrorFormat("[OSHttpXmlRpcHandler] failed to deserialize XmlRpcRequest from {0}", req.ToString());
77 return false; 77 return false;
78 } 78 }
79 79
80 // check against methodName 80 // check against methodName
81 if ((null != xmlRpcRequest) 81 if ((null != xmlRpcRequest)
82 && !String.IsNullOrEmpty(xmlRpcRequest.MethodName) 82 && !String.IsNullOrEmpty(xmlRpcRequest.MethodName)
83 && xmlRpcRequest.MethodName == _methodName) 83 && xmlRpcRequest.MethodName == _methodName)
84 { 84 {
85 _log.DebugFormat("[OSHttpXmlRpcHandler] located handler {0} for {1}", _methodName, req.ToString()); 85 _log.DebugFormat("[OSHttpXmlRpcHandler] located handler {0} for {1}", _methodName, req.ToString());
86 return true; 86 return true;
87 } 87 }
88 88
89 return false; 89 return false;
90 } 90 }
91 91
92 // contains handler for processing XmlRpc Request 92 // contains handler for processing XmlRpc Request
93 private XmlRpcMethod _handler; 93 private XmlRpcMethod _handler;
94 94
95 // contains XmlRpc method name 95 // contains XmlRpc method name
96 private string _methodName; 96 private string _methodName;
97 97
@@ -112,9 +112,9 @@ namespace OpenSim.Framework.Servers
112 /// can be null, in which case they are not taken into account 112 /// can be null, in which case they are not taken into account
113 /// when the handler is being looked up. 113 /// when the handler is being looked up.
114 /// </remarks> 114 /// </remarks>
115 public OSHttpXmlRpcHandler(XmlRpcMethod handler, string methodName, Regex path, 115 public OSHttpXmlRpcHandler(XmlRpcMethod handler, string methodName, Regex path,
116 Dictionary<string, Regex> headers, Regex whitelist) 116 Dictionary<string, Regex> headers, Regex whitelist)
117 : base(new Regex(@"^POST$", RegexOptions.IgnoreCase | RegexOptions.Compiled), path, null, headers, 117 : base(new Regex(@"^POST$", RegexOptions.IgnoreCase | RegexOptions.Compiled), path, null, headers,
118 new Regex(@"^(text|application)/xml", RegexOptions.IgnoreCase | RegexOptions.Compiled), 118 new Regex(@"^(text|application)/xml", RegexOptions.IgnoreCase | RegexOptions.Compiled),
119 whitelist) 119 whitelist)
120 { 120 {
@@ -138,7 +138,7 @@ namespace OpenSim.Framework.Servers
138 /// <summary> 138 /// <summary>
139 /// Invoked by OSHttpRequestPump. 139 /// Invoked by OSHttpRequestPump.
140 /// </summary> 140 /// </summary>
141 public override OSHttpHandlerResult Process(OSHttpRequest request) 141 public override OSHttpHandlerResult Process(OSHttpRequest request)
142 { 142 {
143 XmlRpcResponse xmlRpcResponse; 143 XmlRpcResponse xmlRpcResponse;
144 string responseString; 144 string responseString;
@@ -148,13 +148,13 @@ namespace OpenSim.Framework.Servers
148 148
149 149
150 OSHttpResponse resp = new OSHttpResponse(request); 150 OSHttpResponse resp = new OSHttpResponse(request);
151 try 151 try
152 { 152 {
153 // reified XmlRpcRequest must still be on the whiteboard 153 // reified XmlRpcRequest must still be on the whiteboard
154 XmlRpcRequest xmlRpcRequest = request.Whiteboard["xmlrequest"] as XmlRpcRequest; 154 XmlRpcRequest xmlRpcRequest = request.Whiteboard["xmlrequest"] as XmlRpcRequest;
155 xmlRpcResponse = _handler(xmlRpcRequest); 155 xmlRpcResponse = _handler(xmlRpcRequest);
156 responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse); 156 responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse);
157 157
158 resp.ContentType = "text/xml"; 158 resp.ContentType = "text/xml";
159 byte[] buffer = Encoding.UTF8.GetBytes(responseString); 159 byte[] buffer = Encoding.UTF8.GetBytes(responseString);
160 160
@@ -176,4 +176,4 @@ namespace OpenSim.Framework.Servers
176 return OSHttpHandlerResult.Done; 176 return OSHttpHandlerResult.Done;
177 } 177 }
178 } 178 }
179} \ No newline at end of file 179}
diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs
index 1ed349f..1cfb425 100644
--- a/OpenSim/Framework/Servers/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/RestSessionService.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Framework.Servers
151 private CheckIdentityMethod m_smethod; 151 private CheckIdentityMethod m_smethod;
152 152
153 public RestDeserialiseSecureHandler( 153 public RestDeserialiseSecureHandler(
154 string httpMethod, string path, 154 string httpMethod, string path,
155 RestDeserialiseMethod<TRequest, TResponse> method, CheckIdentityMethod smethod) 155 RestDeserialiseMethod<TRequest, TResponse> method, CheckIdentityMethod smethod)
156 : base(httpMethod, path) 156 : base(httpMethod, path)
157 { 157 {
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Servers
196 /// <param name="method"></param> 196 /// <param name="method"></param>
197 /// <param name="tmethod"></param> 197 /// <param name="tmethod"></param>
198 private RestDeserialiseMethod<TRequest, TResponse> m_method; 198 private RestDeserialiseMethod<TRequest, TResponse> m_method;
199 199
200 /// <summary> 200 /// <summary>
201 /// The method used to check whether a request is trusted. 201 /// The method used to check whether a request is trusted.
202 /// </summary> 202 /// </summary>
diff --git a/OpenSim/Framework/Statistics/BaseStatsCollector.cs b/OpenSim/Framework/Statistics/BaseStatsCollector.cs
index c888f4c..1e59983 100644
--- a/OpenSim/Framework/Statistics/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/BaseStatsCollector.cs
@@ -24,10 +24,10 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text; 29using System.Text;
30 30
31namespace OpenSim.Framework.Statistics 31namespace OpenSim.Framework.Statistics
32{ 32{
33 /// <summary> 33 /// <summary>
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Statistics
44 string.Format( 44 string.Format(
45 "Allocated to OpenSim : {0} MB" + Environment.NewLine, 45 "Allocated to OpenSim : {0} MB" + Environment.NewLine,
46 Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0))); 46 Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0)));
47 47
48 return sb.ToString(); 48 return sb.ToString();
49 } 49 }
50 } 50 }
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 06b3185..58d5621 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Statistics
40 public class SimExtraStatsCollector : BaseStatsCollector 40 public class SimExtraStatsCollector : BaseStatsCollector
41 { 41 {
42 private long abnormalClientThreadTerminations; 42 private long abnormalClientThreadTerminations;
43 43
44 private long assetsInCache; 44 private long assetsInCache;
45 private long texturesInCache; 45 private long texturesInCache;
46 private long assetCacheMemoryUsage; 46 private long assetCacheMemoryUsage;
@@ -49,7 +49,7 @@ namespace OpenSim.Framework.Statistics
49 49
50 private long assetServiceRequestFailures; 50 private long assetServiceRequestFailures;
51 private long inventoryServiceRetrievalFailures; 51 private long inventoryServiceRetrievalFailures;
52 52
53 private float timeDilation; 53 private float timeDilation;
54 private float simFps; 54 private float simFps;
55 private float physicsFps; 55 private float physicsFps;
@@ -70,8 +70,8 @@ namespace OpenSim.Framework.Statistics
70 private float pendingDownloads; 70 private float pendingDownloads;
71 private float pendingUploads; 71 private float pendingUploads;
72 private float activeScripts; 72 private float activeScripts;
73 private float scriptLinesPerSecond; 73 private float scriptLinesPerSecond;
74 74
75 /// <summary> 75 /// <summary>
76 /// Number of times that a client thread terminated because of an exception 76 /// Number of times that a client thread terminated because of an exception
77 /// </summary> 77 /// </summary>
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Statistics
79 79
80 /// <summary> 80 /// <summary>
81 /// These statistics are being collected by push rather than pull. Pull would be simpler, but I had the 81 /// These statistics are being collected by push rather than pull. Pull would be simpler, but I had the
82 /// notion of providing some flow statistics (which pull wouldn't give us). Though admittedly these 82 /// notion of providing some flow statistics (which pull wouldn't give us). Though admittedly these
83 /// haven't yet been implemented... :) 83 /// haven't yet been implemented... :)
84 /// </summary> 84 /// </summary>
85 public long AssetsInCache { get { return assetsInCache; } } 85 public long AssetsInCache { get { return assetsInCache; } }
@@ -101,19 +101,19 @@ namespace OpenSim.Framework.Statistics
101 /// as a failure 101 /// as a failure
102 /// </summary> 102 /// </summary>
103 public long AssetServiceRequestFailures { get { return assetServiceRequestFailures; } } 103 public long AssetServiceRequestFailures { get { return assetServiceRequestFailures; } }
104 104
105 /// <summary> 105 /// <summary>
106 /// Number of known failures to retrieve avatar inventory from the inventory service. This does not 106 /// Number of known failures to retrieve avatar inventory from the inventory service. This does not
107 /// cover situations where the inventory service accepts the request but never returns any data, since 107 /// cover situations where the inventory service accepts the request but never returns any data, since
108 /// we do not yet timeout this situation. 108 /// we do not yet timeout this situation.
109 /// </summary> 109 /// </summary>
110 public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } } 110 public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } }
111 111
112 /// <summary> 112 /// <summary>
113 /// Retrieve the total frame time (in ms) of the last frame 113 /// Retrieve the total frame time (in ms) of the last frame
114 /// </summary> 114 /// </summary>
115 //public float TotalFrameTime { get { return totalFrameTime; } } 115 //public float TotalFrameTime { get { return totalFrameTime; } }
116 116
117 /// <summary> 117 /// <summary>
118 /// Retrieve the physics update component (in ms) of the last frame 118 /// Retrieve the physics update component (in ms) of the last frame
119 /// </summary> 119 /// </summary>
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.Statistics
124 /// </summary> 124 /// </summary>
125 private IDictionary<LLUUID, PacketQueueStatsCollector> packetQueueStatsCollectors 125 private IDictionary<LLUUID, PacketQueueStatsCollector> packetQueueStatsCollectors
126 = new Dictionary<LLUUID, PacketQueueStatsCollector>(); 126 = new Dictionary<LLUUID, PacketQueueStatsCollector>();
127 127
128 public void AddAbnormalClientThreadTermination() 128 public void AddAbnormalClientThreadTermination()
129 { 129 {
130 abnormalClientThreadTerminations++; 130 abnormalClientThreadTerminations++;
@@ -146,7 +146,7 @@ namespace OpenSim.Framework.Statistics
146 textureCacheMemoryUsage += image.Data.Length; 146 textureCacheMemoryUsage += image.Data.Length;
147 } 147 }
148 } 148 }
149 149
150 /// <summary> 150 /// <summary>
151 /// Signal that the asset cache can be cleared. 151 /// Signal that the asset cache can be cleared.
152 /// </summary> 152 /// </summary>
@@ -167,7 +167,7 @@ namespace OpenSim.Framework.Statistics
167 { 167 {
168 assetServiceRequestFailures++; 168 assetServiceRequestFailures++;
169 } 169 }
170 170
171 public void AddInventoryServiceRetrievalFailure() 171 public void AddInventoryServiceRetrievalFailure()
172 { 172 {
173 inventoryServiceRetrievalFailures++; 173 inventoryServiceRetrievalFailures++;
@@ -199,18 +199,18 @@ namespace OpenSim.Framework.Statistics
199 packetQueueStatsCollectors.Remove(uuid); 199 packetQueueStatsCollectors.Remove(uuid);
200 } 200 }
201 } 201 }
202 202
203 /// <summary> 203 /// <summary>
204 /// This is the method on which the classic sim stats reporter (which collects stats for 204 /// This is the method on which the classic sim stats reporter (which collects stats for
205 /// client purposes) sends information to listeners. 205 /// client purposes) sends information to listeners.
206 /// </summary> 206 /// </summary>
207 /// <param name="pack"></param> 207 /// <param name="pack"></param>
208 public void ReceiveClassicSimStatsPacket(SimStatsPacket statsPacket) 208 public void ReceiveClassicSimStatsPacket(SimStatsPacket statsPacket)
209 { 209 {
210 // FIXME: Really shouldn't rely on the probably arbitrary order in which 210 // FIXME: Really shouldn't rely on the probably arbitrary order in which
211 // stats are packed into the packet 211 // stats are packed into the packet
212 timeDilation = statsPacket.Stat[0].StatValue; 212 timeDilation = statsPacket.Stat[0].StatValue;
213 simFps = statsPacket.Stat[1].StatValue; 213 simFps = statsPacket.Stat[1].StatValue;
214 physicsFps = statsPacket.Stat[2].StatValue; 214 physicsFps = statsPacket.Stat[2].StatValue;
215 agentUpdates = statsPacket.Stat[3].StatValue; 215 agentUpdates = statsPacket.Stat[3].StatValue;
216 rootAgents = statsPacket.Stat[4].StatValue; 216 rootAgents = statsPacket.Stat[4].StatValue;
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Statistics
231 activeScripts = statsPacket.Stat[19].StatValue; 231 activeScripts = statsPacket.Stat[19].StatValue;
232 scriptLinesPerSecond = statsPacket.Stat[20].StatValue; 232 scriptLinesPerSecond = statsPacket.Stat[20].StatValue;
233 } 233 }
234 234
235 /// <summary> 235 /// <summary>
236 /// Report back collected statistical information. 236 /// Report back collected statistical information.
237 /// </summary> 237 /// </summary>
@@ -248,10 +248,10 @@ Texture cache contains {2,6} texture assets using {3,10} K
248Blocked client requests for missing textures: {4} 248Blocked client requests for missing textures: {4}
249Asset service request failures: {5}"+ Environment.NewLine, 249Asset service request failures: {5}"+ Environment.NewLine,
250 AssetsInCache, Math.Round(AssetCacheMemoryUsage / 1024.0), 250 AssetsInCache, Math.Round(AssetCacheMemoryUsage / 1024.0),
251 TexturesInCache, Math.Round(TextureCacheMemoryUsage / 1024.0), 251 TexturesInCache, Math.Round(TextureCacheMemoryUsage / 1024.0),
252 BlockedMissingTextureRequests, 252 BlockedMissingTextureRequests,
253 AssetServiceRequestFailures)); 253 AssetServiceRequestFailures));
254 254
255 sb.Append(Environment.NewLine); 255 sb.Append(Environment.NewLine);
256 sb.Append("CONNECTION STATISTICS"); 256 sb.Append("CONNECTION STATISTICS");
257 sb.Append(Environment.NewLine); 257 sb.Append(Environment.NewLine);
@@ -267,7 +267,7 @@ Asset service request failures: {5}"+ Environment.NewLine,
267 string.Format( 267 string.Format(
268 "Initial inventory caching failures: {0}" + Environment.NewLine, 268 "Initial inventory caching failures: {0}" + Environment.NewLine,
269 InventoryServiceRetrievalFailures)); 269 InventoryServiceRetrievalFailures));
270 270
271 sb.Append(Environment.NewLine); 271 sb.Append(Environment.NewLine);
272 sb.Append("FRAME STATISTICS"); 272 sb.Append("FRAME STATISTICS");
273 sb.Append(Environment.NewLine); 273 sb.Append(Environment.NewLine);
@@ -278,18 +278,18 @@ Asset service request failures: {5}"+ Environment.NewLine,
278 "{0,6:0.00} {1,6:0} {2,6:0.0} {3,6:0.0} {4,6:0} {5,6:0} {6,6:0} {7,6:0} {8,6:0} {9,6:0}", 278 "{0,6:0.00} {1,6:0} {2,6:0.0} {3,6:0.0} {4,6:0} {5,6:0} {6,6:0} {7,6:0} {8,6:0} {9,6:0}",
279 timeDilation, simFps, physicsFps, agentUpdates, rootAgents, 279 timeDilation, simFps, physicsFps, agentUpdates, rootAgents,
280 childAgents, totalPrims, activePrims, activeScripts, scriptLinesPerSecond)); 280 childAgents, totalPrims, activePrims, activeScripts, scriptLinesPerSecond));
281 281
282 sb.Append(Environment.NewLine); 282 sb.Append(Environment.NewLine);
283 sb.Append(Environment.NewLine); 283 sb.Append(Environment.NewLine);
284 // There is no script frame time currently because we don't yet collect it 284 // There is no script frame time currently because we don't yet collect it
285 sb.Append("PktsIn PktOut PendDl PendUl UnackB TotlFt NetFt PhysFt OthrFt AgntFt ImgsFt"); 285 sb.Append("PktsIn PktOut PendDl PendUl UnackB TotlFt NetFt PhysFt OthrFt AgntFt ImgsFt");
286 sb.Append(Environment.NewLine); 286 sb.Append(Environment.NewLine);
287 sb.Append( 287 sb.Append(
288 string.Format( 288 string.Format(
289 "{0,6:0} {1,6:0} {2,6:0} {3,6:0} {4,6:0} {5,6:0.0} {6,6:0.0} {7,6:0.0} {8,6:0.0} {9,6:0.0} {10,6:0.0}", 289 "{0,6:0} {1,6:0} {2,6:0} {3,6:0} {4,6:0} {5,6:0.0} {6,6:0.0} {7,6:0.0} {8,6:0.0} {9,6:0.0} {10,6:0.0}",
290 inPacketsPerSecond, outPacketsPerSecond, pendingDownloads, pendingUploads, unackedBytes, totalFrameTime, 290 inPacketsPerSecond, outPacketsPerSecond, pendingDownloads, pendingUploads, unackedBytes, totalFrameTime,
291 netFrameTime, physicsFrameTime, otherFrameTime, agentFrameTime, imageFrameTime)); 291 netFrameTime, physicsFrameTime, otherFrameTime, agentFrameTime, imageFrameTime));
292 sb.Append(Environment.NewLine); 292 sb.Append(Environment.NewLine);
293 293
294 /* 294 /*
295 sb.Append(Environment.NewLine); 295 sb.Append(Environment.NewLine);
@@ -311,7 +311,7 @@ Asset service request failures: {5}"+ Environment.NewLine,
311 */ 311 */
312 312
313 sb.Append(base.Report()); 313 sb.Append(base.Report());
314 314
315 return sb.ToString(); 315 return sb.ToString();
316 } 316 }
317 } 317 }
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 9b497ab..fc84041 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -226,7 +226,7 @@ namespace OpenSim.Framework
226 private LLUUID _permsGranter; 226 private LLUUID _permsGranter;
227 private int _permsMask; 227 private int _permsMask;
228 private int _type = 0; 228 private int _type = 0;
229 229
230 public LLUUID AssetID { 230 public LLUUID AssetID {
231 get { 231 get {
232 return _assetID; 232 return _assetID;
@@ -437,4 +437,4 @@ namespace OpenSim.Framework
437 _parentPartID = partID; 437 _parentPartID = partID;
438 } 438 }
439 } 439 }
440} \ No newline at end of file 440}
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index bc35fa6..2a21221 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -716,7 +716,7 @@ namespace OpenSim.Framework
716 XmlRpcRequest client = new XmlRpcRequest(methodName, args); 716 XmlRpcRequest client = new XmlRpcRequest(methodName, args);
717 return client.Send(url, 6000); 717 return client.Send(url, 6000);
718 } 718 }
719 719
720 // used for RemoteParcelRequest (for "About Landmark") 720 // used for RemoteParcelRequest (for "About Landmark")
721 public static LLUUID BuildFakeParcelID(ulong regionHandle, uint x, uint y) { 721 public static LLUUID BuildFakeParcelID(ulong regionHandle, uint x, uint y) {
722 byte[] bytes = { 722 byte[] bytes = {
@@ -726,7 +726,7 @@ namespace OpenSim.Framework
726 (byte)(y >> 24), (byte)(y >> 16), (byte)(y >> 8), (byte)y }; 726 (byte)(y >> 24), (byte)(y >> 16), (byte)(y >> 8), (byte)y };
727 return new LLUUID(bytes, 0); 727 return new LLUUID(bytes, 0);
728 } 728 }
729 729
730 public static void ParseFakeParcelID(LLUUID parcelID, out ulong regionHandle, out uint x, out uint y) { 730 public static void ParseFakeParcelID(LLUUID parcelID, out ulong regionHandle, out uint x, out uint y) {
731 byte[] bytes = parcelID.GetBytes(); 731 byte[] bytes = parcelID.GetBytes();
732 regionHandle = Helpers.BytesToUInt64(bytes); 732 regionHandle = Helpers.BytesToUInt64(bytes);