diff options
| author | Melanie | 2012-05-05 10:32:04 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-05 10:32:04 +0100 |
| commit | 31ab8b2fe0683cbc9fa4503c616722d678b66e33 (patch) | |
| tree | 34fefd4bf9db7eea797db49e75aaaac5080ea94b /OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs | |
| parent | Merge branch 'avination' (diff) | |
| parent | Fire the scripting changed event with CHANGED_OWNER when an object that has c... (diff) | |
| download | opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.zip opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.gz opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.bz2 opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs index 59420f5..ef9b96f 100644 --- a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs | |||
| @@ -95,7 +95,8 @@ namespace OpenSim.Server.Handlers.Friends | |||
| 95 | return DeleteFriendString(request); | 95 | return DeleteFriendString(request); |
| 96 | 96 | ||
| 97 | } | 97 | } |
| 98 | m_log.DebugFormat("[FRIENDS HANDLER]: unknown method {0} request {1}", method.Length, method); | 98 | |
| 99 | m_log.DebugFormat("[FRIENDS HANDLER]: unknown method request {0}", method); | ||
| 99 | } | 100 | } |
| 100 | catch (Exception e) | 101 | catch (Exception e) |
| 101 | { | 102 | { |
| @@ -103,7 +104,6 @@ namespace OpenSim.Server.Handlers.Friends | |||
| 103 | } | 104 | } |
| 104 | 105 | ||
| 105 | return FailureResult(); | 106 | return FailureResult(); |
| 106 | |||
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | #region Method-specific handlers | 109 | #region Method-specific handlers |