diff options
| author | Melanie | 2013-08-17 03:23:45 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-17 03:23:45 +0100 |
| commit | bef03fb30be67dbe671dcc330558daf8a6c4bb22 (patch) | |
| tree | 6d221db8af5bdb1a09190527a79aae3dfe3116d9 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove mono compiler warnings from UserProfilesModule (diff) | |
| download | opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.zip opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.gz opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.bz2 opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Monitoring/StatsManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs index 7cf1fa7..05ee4c5 100644 --- a/OpenSim/Framework/Monitoring/StatsManager.cs +++ b/OpenSim/Framework/Monitoring/StatsManager.cs | |||
| @@ -267,7 +267,7 @@ namespace OpenSim.Framework.Monitoring | |||
| 267 | public static Hashtable HandleStatsRequest(Hashtable request) | 267 | public static Hashtable HandleStatsRequest(Hashtable request) |
| 268 | { | 268 | { |
| 269 | Hashtable responsedata = new Hashtable(); | 269 | Hashtable responsedata = new Hashtable(); |
| 270 | string regpath = request["uri"].ToString(); | 270 | // string regpath = request["uri"].ToString(); |
| 271 | int response_code = 200; | 271 | int response_code = 200; |
| 272 | string contenttype = "text/json"; | 272 | string contenttype = "text/json"; |
| 273 | 273 | ||