OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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
avinationmerge
Melanie 2013-07-18 10:17:30 +01:00
parent 7830cc9954 c6d75cda97
commit 437326a480
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
View File

@ -287,14 +287,14 @@ namespace OpenSim.Region.ClientStack.Linden
public void RegisterCaps(UUID agentID, Caps caps) public void RegisterCaps(UUID agentID, Caps caps)
{ {
UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
caps, m_scene.AssetService, m_persistBakedTextures);
UUID capID = UUID.Random(); UUID capID = UUID.Random();
//caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
if (m_URL == "localhost") if (m_URL == "localhost")
{ {
UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
caps, m_scene.AssetService, m_persistBakedTextures);
caps.RegisterHandler( caps.RegisterHandler(
"UploadBakedTexture", "UploadBakedTexture",
new RestStreamHandler( new RestStreamHandler(
@ -309,7 +309,6 @@ namespace OpenSim.Region.ClientStack.Linden
{ {
caps.RegisterHandler("UploadBakedTexture", m_URL); caps.RegisterHandler("UploadBakedTexture", m_URL);
} }
} }
} }
} }

1
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
View File

@ -148,7 +148,6 @@ namespace OpenSim.Region.CoreModules.Framework
m_capsObjects[circuitCode] = caps; m_capsObjects[circuitCode] = caps;
} }
m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps);
} }

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

@ -390,8 +390,6 @@ namespace OpenSim.Region.Framework.Scenes
private SOPVehicle m_vehicleParams = null; private SOPVehicle m_vehicleParams = null;
private KeyframeMotion m_keyframeMotion = null;
public KeyframeMotion KeyframeMotion public KeyframeMotion KeyframeMotion
{ {
get; set; 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 else // it already has a physical representation
{ {

1
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
View File

@ -384,7 +384,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void llSetVehicleRotationParam(int param, LSL_Rotation rot); void llSetVehicleRotationParam(int param, LSL_Rotation rot);
void llSetVehicleType(int type); void llSetVehicleType(int type);
void llSetVehicleVectorParam(int param, LSL_Vector vec); void llSetVehicleVectorParam(int param, LSL_Vector vec);
void llSetVelocity(LSL_Vector velocity, int local);
void llShout(int channelID, string text); void llShout(int channelID, string text);
LSL_Float llSin(double f); LSL_Float llSin(double f);
void llSitTarget(LSL_Vector offset, LSL_Rotation rot); void llSitTarget(LSL_Vector offset, LSL_Rotation rot);

5
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
View File

@ -1745,11 +1745,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_LSL_Functions.llSetVehicleVectorParam(param, vec); m_LSL_Functions.llSetVehicleVectorParam(param, vec);
} }
public void llSetVelocity(LSL_Vector velocity, int local)
{
m_LSL_Functions.llSetVelocity(velocity, local);
}
public void llShout(int channelID, string text) public void llShout(int channelID, string text)
{ {
m_LSL_Functions.llShout(channelID, text); m_LSL_Functions.llShout(channelID, text);