aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-07-18 10:17:30 +0100
committerMelanie2013-07-18 10:17:30 +0100
commit437326a4800f23c23abd65b2a44dc21e33f6b1c5 (patch)
tree85aee59a2d83ce991064ba663b521d3ef929f1bf
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.zip
opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.gz
opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.bz2
opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.xz
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
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs7
-rw-r--r--OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs5
5 files changed, 8 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index 674b451..cf95463 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -287,14 +287,14 @@ namespace OpenSim.Region.ClientStack.Linden
287 287
288 public void RegisterCaps(UUID agentID, Caps caps) 288 public void RegisterCaps(UUID agentID, Caps caps)
289 { 289 {
290 UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
291 caps, m_scene.AssetService, m_persistBakedTextures);
292
293 UUID capID = UUID.Random(); 290 UUID capID = UUID.Random();
294 291
295 //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); 292 //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
296 if (m_URL == "localhost") 293 if (m_URL == "localhost")
297 { 294 {
295 UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
296 caps, m_scene.AssetService, m_persistBakedTextures);
297
298 caps.RegisterHandler( 298 caps.RegisterHandler(
299 "UploadBakedTexture", 299 "UploadBakedTexture",
300 new RestStreamHandler( 300 new RestStreamHandler(
@@ -309,7 +309,6 @@ namespace OpenSim.Region.ClientStack.Linden
309 { 309 {
310 caps.RegisterHandler("UploadBakedTexture", m_URL); 310 caps.RegisterHandler("UploadBakedTexture", m_URL);
311 } 311 }
312
313 } 312 }
314 } 313 }
315} 314}
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index 3d5ed4f..6ce6227 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -148,7 +148,6 @@ namespace OpenSim.Region.CoreModules.Framework
148 148
149 m_capsObjects[circuitCode] = caps; 149 m_capsObjects[circuitCode] = caps;
150 } 150 }
151
152 m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); 151 m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps);
153 } 152 }
154 153
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 95ffc77..59a453a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -390,8 +390,6 @@ namespace OpenSim.Region.Framework.Scenes
390 390
391 private SOPVehicle m_vehicleParams = null; 391 private SOPVehicle m_vehicleParams = null;
392 392
393 private KeyframeMotion m_keyframeMotion = null;
394
395 public KeyframeMotion KeyframeMotion 393 public KeyframeMotion KeyframeMotion
396 { 394 {
397 get; set; 395 get; set;
@@ -4646,6 +4644,11 @@ namespace OpenSim.Region.Framework.Scenes
4646 } 4644 }
4647 } 4645 }
4648*/ 4646*/
4647 if (pa != null)
4648 {
4649 pa.SetMaterial(Material);
4650 DoPhysicsPropertyUpdate(UsePhysics, true);
4651 }
4649 } 4652 }
4650 else // it already has a physical representation 4653 else // it already has a physical representation
4651 { 4654 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 2ea265d..d211a2b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -384,7 +384,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
384 void llSetVehicleRotationParam(int param, LSL_Rotation rot); 384 void llSetVehicleRotationParam(int param, LSL_Rotation rot);
385 void llSetVehicleType(int type); 385 void llSetVehicleType(int type);
386 void llSetVehicleVectorParam(int param, LSL_Vector vec); 386 void llSetVehicleVectorParam(int param, LSL_Vector vec);
387 void llSetVelocity(LSL_Vector velocity, int local);
388 void llShout(int channelID, string text); 387 void llShout(int channelID, string text);
389 LSL_Float llSin(double f); 388 LSL_Float llSin(double f);
390 void llSitTarget(LSL_Vector offset, LSL_Rotation rot); 389 void llSitTarget(LSL_Vector offset, LSL_Rotation rot);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 41e585c..4fc8d65 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1745,11 +1745,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
1745 m_LSL_Functions.llSetVehicleVectorParam(param, vec); 1745 m_LSL_Functions.llSetVehicleVectorParam(param, vec);
1746 } 1746 }
1747 1747
1748 public void llSetVelocity(LSL_Vector velocity, int local)
1749 {
1750 m_LSL_Functions.llSetVelocity(velocity, local);
1751 }
1752
1753 public void llShout(int channelID, string text) 1748 public void llShout(int channelID, string text)
1754 { 1749 {
1755 m_LSL_Functions.llShout(channelID, text); 1750 m_LSL_Functions.llShout(channelID, text);