diff options
| author | Melanie | 2011-01-23 23:29:25 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-23 23:29:25 +0000 |
| commit | 105deab601244584d779e8b7d1e8275b8aeb15ec (patch) | |
| tree | 63e2f064a748fddcaa566fde915ee56e8546220b /OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs | |
| parent | Completely nixing flags from the client causes wearables to break. Fix it (diff) | |
| parent | Fixes mantis #5343 (diff) | |
| download | opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.zip opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.gz opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.bz2 opensim-SC-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs index 008233b..a0d72ed 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs +++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs | |||
| @@ -43,8 +43,9 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
| 43 | { | 43 | { |
| 44 | public class ObjectAdd : IRegionModule | 44 | public class ObjectAdd : IRegionModule |
| 45 | { | 45 | { |
| 46 | private static readonly ILog m_log = | 46 | // private static readonly ILog m_log = |
| 47 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 48 | |||
| 48 | private Scene m_scene; | 49 | private Scene m_scene; |
| 49 | #region IRegionModule Members | 50 | #region IRegionModule Members |
| 50 | 51 | ||