diff options
| author | Dan Lake | 2011-07-20 15:01:32 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-20 15:01:32 -0700 |
| commit | 2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch) | |
| tree | d593e3d1130e78ec74a11650d413f451a9a844da /OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs | |
| parent | Merge branch 'master' into bulletsim (diff) | |
| parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
| download | opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs index c9d7ae1..29a9199 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs | |||
| @@ -124,7 +124,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 124 | 124 | ||
| 125 | private Hashtable MeshUploadFlag(Hashtable mDhttpMethod) | 125 | private Hashtable MeshUploadFlag(Hashtable mDhttpMethod) |
| 126 | { | 126 | { |
| 127 | m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: MeshUploadFlag request"); | 127 | // m_log.DebugFormat("[MESH UPLOAD FLAG MODULE]: MeshUploadFlag request"); |
| 128 | 128 | ||
| 129 | OSDMap data = new OSDMap(); | 129 | OSDMap data = new OSDMap(); |
| 130 | ScenePresence sp = m_scene.GetScenePresence(m_agentID); | 130 | ScenePresence sp = m_scene.GetScenePresence(m_agentID); |