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/Hypergrid | |
| 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/Hypergrid')
| -rw-r--r-- | OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs index 8ef03e7..c2f127c 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs | |||
| @@ -122,7 +122,8 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
| 122 | return GrantRights(request); | 122 | return GrantRights(request); |
| 123 | */ | 123 | */ |
| 124 | } | 124 | } |
| 125 | m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0} request {1}", method.Length, method); | 125 | |
| 126 | m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0}", method); | ||
| 126 | } | 127 | } |
| 127 | catch (Exception e) | 128 | catch (Exception e) |
| 128 | { | 129 | { |