From 8556a9f1a8c85bc77c87beeaae1aec7d170ebbd3 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Thu, 4 Feb 2010 13:31:06 -0800
Subject: Applying patch #4534 by Misterblue to fix ODE physics stickiness
---
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 973aa84..44b2727 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1575,6 +1575,7 @@ Console.WriteLine(" JointCreateFixed");
{
//Console.WriteLine("Move " + m_primName);
if (!d.BodyIsEnabled (Body)) d.BodyEnable (Body); // KF add 161009
+ /*
// NON-'VEHICLES' are dealt with here
if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f))
{
@@ -1587,6 +1588,7 @@ Console.WriteLine(" JointCreateFixed");
avel2.Z = 0;
d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z);
}
+ */
//float PID_P = 900.0f;
float m_mass = CalculateMass();
--
cgit v1.1
From f1b99c4a7f9543c3a2aa36de2e659bdefca9e68b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Feb 2010 21:35:56 +0000
Subject: minor: one method doc
---
.../CoreModules/Scripting/VectorRender/VectorRenderModule.cs | 1 +
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index d57a8e5..3291be4 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -342,6 +342,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
m_log.Error(
"[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Empty byte data returned!");
}
+
m_textureManager.ReturnData(id, imageJ2000);
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8d84557..dd797fc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4144,9 +4144,13 @@ namespace OpenSim.Region.Framework.Scenes
ScheduleFullUpdate();
}
- // Added to handle bug in libsecondlife's TextureEntry.ToBytes()
- // not handling RGBA properly. Cycles through, and "fixes" the color
- // info
+ ///
+ /// Update the textures on the part.
+ ///
+ /// Added to handle bug in libsecondlife's TextureEntry.ToBytes()
+ /// not handling RGBA properly. Cycles through, and "fixes" the color
+ /// info
+ ///
public void UpdateTexture(Primitive.TextureEntry tex)
{
//Color4 tmpcolor;
--
cgit v1.1
From 0a084a31e9f96cc007f953b47e3319bde6d834f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Feb 2010 23:23:07 +0000
Subject: refactor: chain two ScenePresence constructors together to eliminate
common code. No functional changes
---
.../Region/ClientStack/LindenUDP/LLClientView.cs | 4 +++-
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 26 +++++++++-------------
2 files changed, 14 insertions(+), 16 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 1d364d4..6dc6f01 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5190,6 +5190,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack;
+ //m_log.DebugFormat("[CLIENT]: Received ScriptDialogReply from {0}", rdialog.Data.ObjectID);
+
#region Packet Session and User Check
if (m_checkPackets)
{
@@ -5210,7 +5212,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
args.Type = ChatTypeEnum.Shout;
args.Position = new Vector3();
args.Scene = Scene;
- args.Sender = this;
+ args.Sender = this;
ChatMessage handlerChatFromClient2 = OnChatFromClient;
if (handlerChatFromClient2 != null)
handlerChatFromClient2(this, args);
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cd39cab..bcf22c3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -104,6 +104,8 @@ namespace OpenSim.Region.Framework.Scenes
}
protected ScenePresenceAnimator m_animator;
+ protected List m_attachments = new List();
+
private Dictionary scriptedcontrols = new Dictionary();
private ScriptControlled IgnoredControls = ScriptControlled.CONTROL_ZERO;
private ScriptControlled LastCommands = ScriptControlled.CONTROL_ZERO;
@@ -215,9 +217,7 @@ namespace OpenSim.Region.Framework.Scenes
// Agent's Draw distance.
protected float m_DrawDistance;
- protected AvatarAppearance m_appearance;
-
- protected List m_attachments = new List();
+ protected AvatarAppearance m_appearance;
// neighbouring regions we have enabled a child agent in
// holds the seed cap for the child agent in that region
@@ -630,12 +630,16 @@ namespace OpenSim.Region.Framework.Scenes
#endregion
#region Constructor(s)
-
- private ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo)
- {
- m_animator = new ScenePresenceAnimator(this);
+
+ public ScenePresence()
+ {
m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
CreateSceneViewer();
+ m_animator = new ScenePresenceAnimator(this);
+ }
+
+ private ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo) : this()
+ {
m_rootRegionHandle = reginfo.RegionHandle;
m_controllingClient = client;
m_firstname = m_controllingClient.FirstName;
@@ -659,7 +663,6 @@ namespace OpenSim.Region.Framework.Scenes
m_reprioritization_timer.Elapsed += new ElapsedEventHandler(Reprioritize);
m_reprioritization_timer.AutoReset = false;
-
AdjustKnownSeeds();
// TODO: I think, this won't send anything, as we are still a child here...
@@ -3321,13 +3324,6 @@ namespace OpenSim.Region.Framework.Scenes
m_animator = null;
}
- public ScenePresence()
- {
- m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
- CreateSceneViewer();
- m_animator = new ScenePresenceAnimator(this);
- }
-
public void AddAttachment(SceneObjectGroup gobj)
{
lock (m_attachments)
--
cgit v1.1
From 7058a4c2597a2b76704e906b73ae7077ff805b16 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 5 Feb 2010 18:09:27 +0000
Subject: Old OpenSim installations may have no AssetCaching setting in
config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all) If
this is the case, this patch makes CenomeAssetCache the default cache (which
matches that selected in StandaloneCommon.ini.example) Not having an asset
cache may lead to a continual loop of appearance baking failures and cause
dynamic textures not to work, among other effects
---
OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index 1add0ab..e0e4cc6 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -324,7 +324,9 @@ namespace OpenSim.Region.CoreModules.Asset
if (moduleConfig == null)
return;
- string name = moduleConfig.GetString("AssetCaching");
+ // We're going to make CenomeAssetCache the default if there is no AssetCaching setting at all. This
+ // matches the default StandaloneCommon.ini.example
+ string name = moduleConfig.GetString("AssetCaching", Name);
//Log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name);
if (name != Name)
--
cgit v1.1
From 68bb2dac45d7ce0d280cdfa66de3d142bb05c8cc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 5 Feb 2010 19:21:27 +0000
Subject: Revert "Old OpenSim installations may have no AssetCaching setting in
config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)"
This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules)
This reverts commit 7058a4c2597a2b76704e906b73ae7077ff805b16.
---
OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index e0e4cc6..1add0ab 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -324,9 +324,7 @@ namespace OpenSim.Region.CoreModules.Asset
if (moduleConfig == null)
return;
- // We're going to make CenomeAssetCache the default if there is no AssetCaching setting at all. This
- // matches the default StandaloneCommon.ini.example
- string name = moduleConfig.GetString("AssetCaching", Name);
+ string name = moduleConfig.GetString("AssetCaching");
//Log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name);
if (name != Name)
--
cgit v1.1