diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 1d364d4178..6dc6f011fd 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/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index d57a8e5979..3291be4163 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 8d845578c6..dd797fcdae 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;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index cd39cab81d..bcf22c3452 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)
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 973aa844d3..44b2727afe 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();