diff options
| author | Melanie | 2012-03-04 16:23:19 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-04 16:23:19 +0000 |
| commit | 6338996f87ca1314c493709d42b1c606f5688676 (patch) | |
| tree | 5ea7bd2c640390c19ef787360d71ac97851db43f /OpenSim/Region | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add WebProfiles config to other config example (diff) | |
| download | opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.zip opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.gz opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.bz2 opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index be699db..35cb575 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -262,7 +262,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 262 | { | 262 | { |
| 263 | try | 263 | try |
| 264 | { | 264 | { |
| 265 | m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName); | 265 | // m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName); |
| 266 | //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param); | 266 | //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param); |
| 267 | 267 | ||
| 268 | Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request)); | 268 | Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request)); |