diff options
| author | Justin Clark-Casey (justincc) | 2012-02-13 20:48:50 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-13 20:48:50 +0000 |
| commit | 21393af631c743f0ee0094a20a9fa9f2aeb2e500 (patch) | |
| tree | dd74990b038ca912b6a0fe42a8a3305f9e51c7f2 /OpenSim/Region/Framework | |
| parent | On object deserialization, go back to logging errors at DEBUG level rather th... (diff) | |
| parent | correct the default avatar_terminal_velocity value that I accidentally left i... (diff) | |
| download | opensim-SC_OLD-21393af631c743f0ee0094a20a9fa9f2aeb2e500.zip opensim-SC_OLD-21393af631c743f0ee0094a20a9fa9f2aeb2e500.tar.gz opensim-SC_OLD-21393af631c743f0ee0094a20a9fa9f2aeb2e500.tar.bz2 opensim-SC_OLD-21393af631c743f0ee0094a20a9fa9f2aeb2e500.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs index 5dfd3e0..f678d07 100644 --- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
| @@ -148,7 +148,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 148 | x = m_inventoryDeletes.Dequeue(); | 148 | x = m_inventoryDeletes.Dequeue(); |
| 149 | 149 | ||
| 150 | m_log.DebugFormat( | 150 | m_log.DebugFormat( |
| 151 | "[ASYNC DELETER]: Sending object to user's inventory, action {1}, count {2}, {0} item(s) remaining.", left, x.action, x.objectGroups.Count); | 151 | "[ASYNC DELETER]: Sending object to user's inventory, action {1}, count {2}, {0} item(s) remaining.", |
| 152 | left, x.action, x.objectGroups.Count); | ||
| 152 | 153 | ||
| 153 | try | 154 | try |
| 154 | { | 155 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5c56150..77f7b32 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -291,13 +291,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 291 | /// </summary> | 291 | /// </summary> |
| 292 | public PhysicsActor PhysicsActor { get; private set; } | 292 | public PhysicsActor PhysicsActor { get; private set; } |
| 293 | 293 | ||
| 294 | private byte m_movementflag; | 294 | /// <summary> |
| 295 | 295 | /// Record user movement inputs. | |
| 296 | public byte MovementFlag | 296 | /// </summary> |
| 297 | { | 297 | public byte MovementFlag { get; private set; } |
| 298 | set { m_movementflag = value; } | ||
| 299 | get { return m_movementflag; } | ||
| 300 | } | ||
| 301 | 298 | ||
| 302 | private bool m_updateflag; | 299 | private bool m_updateflag; |
| 303 | 300 | ||