diff options
Diffstat (limited to 'OpenSim/Server/Handlers')
5 files changed, 7 insertions, 11 deletions
diff --git a/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs b/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs index 427fa16..faa6fb7 100644 --- a/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs +++ b/OpenSim/Server/Handlers/Asset/Tests/AssetServerPostHandlerTests.cs | |||
@@ -39,7 +39,6 @@ using OpenSim.Server.Handlers.Asset; | |||
39 | using OpenSim.Services.AssetService; | 39 | using OpenSim.Services.AssetService; |
40 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
41 | using OpenSim.Tests.Common; | 41 | using OpenSim.Tests.Common; |
42 | using OpenSim.Tests.Common.Mock; | ||
43 | 42 | ||
44 | namespace OpenSim.Server.Handlers.Asset.Test | 43 | namespace OpenSim.Server.Handlers.Asset.Test |
45 | { | 44 | { |
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakesGetHandler.cs b/OpenSim/Server/Handlers/BakedTextures/XBakesGetHandler.cs index 9e703f1..3c61673 100644 --- a/OpenSim/Server/Handlers/BakedTextures/XBakesGetHandler.cs +++ b/OpenSim/Server/Handlers/BakedTextures/XBakesGetHandler.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Server.Handlers.BakedTextures | |||
45 | { | 45 | { |
46 | public class BakesServerGetHandler : BaseStreamHandler | 46 | public class BakesServerGetHandler : BaseStreamHandler |
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | private IBakedTextureService m_BakesService; | 50 | private IBakedTextureService m_BakesService; |
51 | private System.Text.UTF8Encoding utf8 = | 51 | private System.Text.UTF8Encoding utf8 = |
diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs b/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs index 1aacbc9..e38543b 100644 --- a/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs +++ b/OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs | |||
@@ -45,13 +45,10 @@ namespace OpenSim.Server.Handlers.BakedTextures | |||
45 | { | 45 | { |
46 | public class BakesServerPostHandler : BaseStreamHandler | 46 | public class BakesServerPostHandler : BaseStreamHandler |
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | private IBakedTextureService m_BakesService; | 50 | private IBakedTextureService m_BakesService; |
51 | 51 | ||
52 | private System.Text.UTF8Encoding utf8 = | ||
53 | new System.Text.UTF8Encoding(); | ||
54 | |||
55 | public BakesServerPostHandler(IBakedTextureService service, IServiceAuth auth) : | 52 | public BakesServerPostHandler(IBakedTextureService service, IServiceAuth auth) : |
56 | base("POST", "/bakes", auth) | 53 | base("POST", "/bakes", auth) |
57 | { | 54 | { |
@@ -76,4 +73,4 @@ namespace OpenSim.Server.Handlers.BakedTextures | |||
76 | return new byte[0]; | 73 | return new byte[0]; |
77 | } | 74 | } |
78 | } | 75 | } |
79 | } | 76 | } \ No newline at end of file |
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs index f8f1d00..49aa8ba 100644 --- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs +++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs | |||
@@ -263,8 +263,7 @@ namespace OpenSim.Server.Handlers | |||
263 | m_log.DebugFormat ("Avatar Notes Request"); | 263 | m_log.DebugFormat ("Avatar Notes Request"); |
264 | return false; | 264 | return false; |
265 | } | 265 | } |
266 | 266 | ||
267 | string result = string.Empty; | ||
268 | UserProfileNotes note = new UserProfileNotes(); | 267 | UserProfileNotes note = new UserProfileNotes(); |
269 | object Note = (object)note; | 268 | object Note = (object)note; |
270 | OSD.DeserializeMembers(ref Note, (OSDMap)json["params"]); | 269 | OSD.DeserializeMembers(ref Note, (OSDMap)json["params"]); |
@@ -403,7 +402,7 @@ namespace OpenSim.Server.Handlers | |||
403 | 402 | ||
404 | response.Error.Code = ErrorCode.InternalError; | 403 | response.Error.Code = ErrorCode.InternalError; |
405 | response.Error.Message = string.Format("{0}", result); | 404 | response.Error.Message = string.Format("{0}", result); |
406 | m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message); | 405 | // m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message); |
407 | return false; | 406 | return false; |
408 | } | 407 | } |
409 | 408 | ||
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index da2bfeb..81c9df2 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -182,7 +182,8 @@ namespace OpenSim.Server.Handlers.Simulation | |||
182 | if (action.Equals("release")) | 182 | if (action.Equals("release")) |
183 | ReleaseAgent(regionID, id); | 183 | ReleaseAgent(regionID, id); |
184 | else | 184 | else |
185 | Util.FireAndForget(delegate { m_SimulationService.CloseAgent(destination, id, auth_token); }); | 185 | Util.FireAndForget( |
186 | o => m_SimulationService.CloseAgent(destination, id, auth_token), null, "AgentHandler.DoAgentDelete"); | ||
186 | 187 | ||
187 | responsedata["int_response_code"] = HttpStatusCode.OK; | 188 | responsedata["int_response_code"] = HttpStatusCode.OK; |
188 | responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); | 189 | responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); |