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/Grid | |
| 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/Grid')
| -rw-r--r-- | OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index bebf482..91d14cb 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | |||
| @@ -116,7 +116,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
| 116 | return GetRegionFlags(request); | 116 | return GetRegionFlags(request); |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | m_log.DebugFormat("[GRID HANDLER]: unknown method {0} request {1}", method.Length, method); | 119 | m_log.DebugFormat("[GRID HANDLER]: unknown method request {0}", method); |
| 120 | } | 120 | } |
| 121 | catch (Exception e) | 121 | catch (Exception e) |
| 122 | { | 122 | { |