aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2012-03-20 18:07:24 +0100
committerMelanie2012-03-20 18:07:24 +0100
commit70c0d6cf0b4fe101cc02e46ffc38417fa62ff245 (patch)
treec9c90629247817fbf95974671b3b448196a56d85 /OpenSim/Region/ClientStack
parentCover the case where prims are loaded and ParentGroup is not yet set (diff)
parent add some more notifications about changes on physical parameters ( still inc... (diff)
downloadopensim-SC-70c0d6cf0b4fe101cc02e46ffc38417fa62ff245.zip
opensim-SC-70c0d6cf0b4fe101cc02e46ffc38417fa62ff245.tar.gz
opensim-SC-70c0d6cf0b4fe101cc02e46ffc38417fa62ff245.tar.bz2
opensim-SC-70c0d6cf0b4fe101cc02e46ffc38417fa62ff245.tar.xz
Merge branch 'ubitwork'
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index dd3b8aa..ba5f4d5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2633,6 +2633,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2633 { 2633 {
2634 m_log.Error("Unable to send part Physics Proprieties - exception: " + ex.ToString()); 2634 m_log.Error("Unable to send part Physics Proprieties - exception: " + ex.ToString());
2635 } 2635 }
2636 part.UpdatePhysRequired = false;
2636 } 2637 }
2637 } 2638 }
2638 2639