ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-09-25 06:19:26 +01:00
parent 83b16612ce 3b76d7bbb6
commit 4fbdcb95a0
23 changed files with 231 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -1560,7 +1560,7 @@ namespace OpenSim.Region.Framework.Scenes
try
{
PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
Name,
string.Format("{0}/{1}", Name, UUID),
Shape,
AbsolutePosition,
Scale,
@@ -4396,7 +4396,7 @@ namespace OpenSim.Region.Framework.Scenes
{
// It's not phantom anymore. So make sure the physics engine get's knowledge of it
PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
Name,
string.Format("{0}/{1}", Name, UUID),
Shape,
AbsolutePosition,
Scale,