aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs3
-rw-r--r--OpenSim/Framework/SimStats.cs9
-rw-r--r--OpenSim/Framework/Statistics/SimExtraStatsCollector.cs65
3 files changed, 53 insertions, 24 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 51658f3..ea356ac 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -1091,6 +1091,7 @@ namespace OpenSim.Framework.Servers
1091 { 1091 {
1092 host = (string)headervals["Host"]; 1092 host = (string)headervals["Host"];
1093 } 1093 }
1094 keysvals.Add("headers",headervals);
1094 1095
1095 if (keysvals.Contains("method")) 1096 if (keysvals.Contains("method"))
1096 { 1097 {
@@ -1238,7 +1239,7 @@ namespace OpenSim.Framework.Servers
1238 1239
1239 byte[] buffer; 1240 byte[] buffer;
1240 1241
1241 if (!contentType.Contains("image")) 1242 if (!(contentType.Contains("image") || contentType.Contains("x-shockwave-flash")))
1242 { 1243 {
1243 buffer = Encoding.UTF8.GetBytes(responseString); 1244 buffer = Encoding.UTF8.GetBytes(responseString);
1244 } 1245 }
diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs
index c77d0d4..865dee2 100644
--- a/OpenSim/Framework/SimStats.cs
+++ b/OpenSim/Framework/SimStats.cs
@@ -72,11 +72,18 @@ namespace OpenSim.Framework
72 get { return m_objectCapacity; } 72 get { return m_objectCapacity; }
73 } 73 }
74 private uint m_objectCapacity; 74 private uint m_objectCapacity;
75
76 public OpenMetaverse.UUID RegionUUID
77 {
78 get { return regionUUID;}
79 }
80 private OpenMetaverse.UUID regionUUID;
75 81
76 public SimStats( 82 public SimStats(
77 uint regionX, uint regionY, uint regionFlags, uint objectCapacity, 83 uint regionX, uint regionY, uint regionFlags, uint objectCapacity,
78 SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock) 84 SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock, OpenMetaverse.UUID pRUUID)
79 { 85 {
86 regionUUID = pRUUID;
80 m_regionX = regionX; 87 m_regionX = regionX;
81 m_regionY = regionY; 88 m_regionY = regionY;
82 m_regionFlags = regionFlags; 89 m_regionFlags = regionFlags;
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 48bed81..43c73b2 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -51,27 +51,27 @@ namespace OpenSim.Framework.Statistics
51 private long assetServiceRequestFailures; 51 private long assetServiceRequestFailures;
52 private long inventoryServiceRetrievalFailures; 52 private long inventoryServiceRetrievalFailures;
53 53
54 private float timeDilation; 54 private volatile float timeDilation;
55 private float simFps; 55 private volatile float simFps;
56 private float physicsFps; 56 private volatile float physicsFps;
57 private float agentUpdates; 57 private volatile float agentUpdates;
58 private float rootAgents; 58 private volatile float rootAgents;
59 private float childAgents; 59 private volatile float childAgents;
60 private float totalPrims; 60 private volatile float totalPrims;
61 private float activePrims; 61 private volatile float activePrims;
62 private float totalFrameTime; 62 private volatile float totalFrameTime;
63 private float netFrameTime; 63 private volatile float netFrameTime;
64 private float physicsFrameTime; 64 private volatile float physicsFrameTime;
65 private float otherFrameTime; 65 private volatile float otherFrameTime;
66 private float imageFrameTime; 66 private volatile float imageFrameTime;
67 private float inPacketsPerSecond; 67 private volatile float inPacketsPerSecond;
68 private float outPacketsPerSecond; 68 private volatile float outPacketsPerSecond;
69 private float unackedBytes; 69 private volatile float unackedBytes;
70 private float agentFrameTime; 70 private volatile float agentFrameTime;
71 private float pendingDownloads; 71 private volatile float pendingDownloads;
72 private float pendingUploads; 72 private volatile float pendingUploads;
73 private float activeScripts; 73 private volatile float activeScripts;
74 private float scriptLinesPerSecond; 74 private volatile float scriptLinesPerSecond;
75 75
76 /// <summary> 76 /// <summary>
77 /// Number of times that a client thread terminated because of an exception 77 /// Number of times that a client thread terminated because of an exception
@@ -87,7 +87,28 @@ namespace OpenSim.Framework.Statistics
87 public long TexturesInCache { get { return texturesInCache; } } 87 public long TexturesInCache { get { return texturesInCache; } }
88 public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } } 88 public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } }
89 public long TextureCacheMemoryUsage { get { return textureCacheMemoryUsage; } } 89 public long TextureCacheMemoryUsage { get { return textureCacheMemoryUsage; } }
90 90
91 public float TimeDilation { get { return timeDilation; } }
92 public float SimFps { get { return simFps; } }
93 public float PhysicsFps { get { return physicsFps; } }
94 public float AgentUpdates { get { return agentUpdates; } }
95 public float RootAgents { get { return rootAgents; } }
96 public float ChildAgents { get { return childAgents; } }
97 public float TotalPrims { get { return totalPrims; } }
98 public float ActivePrims { get { return activePrims; } }
99 public float TotalFrameTime { get { return totalFrameTime; } }
100 public float NetFrameTime { get { return netFrameTime; } }
101 public float PhysicsFrameTime { get { return physicsFrameTime; } }
102 public float OtherFrameTime { get { return otherFrameTime; } }
103 public float ImageFrameTime { get { return imageFrameTime; } }
104 public float InPacketsPerSecond { get { return inPacketsPerSecond; } }
105 public float OutPacketsPerSecond { get { return outPacketsPerSecond; } }
106 public float UnackedBytes { get { return unackedBytes; } }
107 public float AgentFrameTime { get { return agentFrameTime; } }
108 public float PendingDownloads { get { return pendingDownloads; } }
109 public float PendingUploads { get { return pendingUploads; } }
110 public float ActiveScripts { get { return activeScripts; } }
111 public float ScriptLinesPerSecond { get { return scriptLinesPerSecond; } }
91 /// <summary> 112 /// <summary>
92 /// This is the time it took for the last asset request made in response to a cache miss. 113 /// This is the time it took for the last asset request made in response to a cache miss.
93 /// </summary> 114 /// </summary>