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

Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

Browse Source 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
This commit is contained in:
Melanie
2013-07-18 10:17:30 +01:00
parent 7830cc9954 c6d75cda97
commit 437326a480
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,8 +390,6 @@ namespace OpenSim.Region.Framework.Scenes
private SOPVehicle m_vehicleParams = null;
private KeyframeMotion m_keyframeMotion = null;
public KeyframeMotion KeyframeMotion
{
get; set;
@@ -4646,6 +4644,11 @@ namespace OpenSim.Region.Framework.Scenes
}
}
*/
if (pa != null)
{
pa.SetMaterial(Material);
DoPhysicsPropertyUpdate(UsePhysics, true);
}
}
else // it already has a physical representation
{