aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-02-06 01:13:01 +0000
committerMelanie2010-02-06 01:13:01 +0000
commit4a092b5ab81c58853dbb03149e7bd924623044ee (patch)
tree38f2fb0fc5bbd81815ce83736f089fe9ae925274
parentFixing an incorrect logging message in insertUserRow (diff)
parentRevert "Old OpenSim installations may have no AssetCaching setting in config-... (diff)
downloadopensim-SC_OLD-4a092b5ab81c58853dbb03149e7bd924623044ee.zip
opensim-SC_OLD-4a092b5ab81c58853dbb03149e7bd924623044ee.tar.gz
opensim-SC_OLD-4a092b5ab81c58853dbb03149e7bd924623044ee.tar.bz2
opensim-SC_OLD-4a092b5ab81c58853dbb03149e7bd924623044ee.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs26
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs2
5 files changed, 24 insertions, 19 deletions
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
5190 { 5190 {
5191 ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; 5191 ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack;
5192 5192
5193 //m_log.DebugFormat("[CLIENT]: Received ScriptDialogReply from {0}", rdialog.Data.ObjectID);
5194
5193 #region Packet Session and User Check 5195 #region Packet Session and User Check
5194 if (m_checkPackets) 5196 if (m_checkPackets)
5195 { 5197 {
@@ -5210,7 +5212,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5210 args.Type = ChatTypeEnum.Shout; 5212 args.Type = ChatTypeEnum.Shout;
5211 args.Position = new Vector3(); 5213 args.Position = new Vector3();
5212 args.Scene = Scene; 5214 args.Scene = Scene;
5213 args.Sender = this; 5215 args.Sender = this;
5214 ChatMessage handlerChatFromClient2 = OnChatFromClient; 5216 ChatMessage handlerChatFromClient2 = OnChatFromClient;
5215 if (handlerChatFromClient2 != null) 5217 if (handlerChatFromClient2 != null)
5216 handlerChatFromClient2(this, args); 5218 handlerChatFromClient2(this, args);
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
342 m_log.Error( 342 m_log.Error(
343 "[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); 343 "[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Empty byte data returned!");
344 } 344 }
345
345 m_textureManager.ReturnData(id, imageJ2000); 346 m_textureManager.ReturnData(id, imageJ2000);
346 } 347 }
347 348
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
4144 ScheduleFullUpdate(); 4144 ScheduleFullUpdate();
4145 } 4145 }
4146 4146
4147 // Added to handle bug in libsecondlife's TextureEntry.ToBytes() 4147 /// <summary>
4148 // not handling RGBA properly. Cycles through, and "fixes" the color 4148 /// Update the textures on the part.
4149 // info 4149 /// </summary>
4150 /// Added to handle bug in libsecondlife's TextureEntry.ToBytes()
4151 /// not handling RGBA properly. Cycles through, and "fixes" the color
4152 /// info
4153 /// <param name="tex"></param>
4150 public void UpdateTexture(Primitive.TextureEntry tex) 4154 public void UpdateTexture(Primitive.TextureEntry tex)
4151 { 4155 {
4152 //Color4 tmpcolor; 4156 //Color4 tmpcolor;
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
104 } 104 }
105 protected ScenePresenceAnimator m_animator; 105 protected ScenePresenceAnimator m_animator;
106 106
107 protected List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
108
107 private Dictionary<UUID, ScriptControllers> scriptedcontrols = new Dictionary<UUID, ScriptControllers>(); 109 private Dictionary<UUID, ScriptControllers> scriptedcontrols = new Dictionary<UUID, ScriptControllers>();
108 private ScriptControlled IgnoredControls = ScriptControlled.CONTROL_ZERO; 110 private ScriptControlled IgnoredControls = ScriptControlled.CONTROL_ZERO;
109 private ScriptControlled LastCommands = ScriptControlled.CONTROL_ZERO; 111 private ScriptControlled LastCommands = ScriptControlled.CONTROL_ZERO;
@@ -215,9 +217,7 @@ namespace OpenSim.Region.Framework.Scenes
215 // Agent's Draw distance. 217 // Agent's Draw distance.
216 protected float m_DrawDistance; 218 protected float m_DrawDistance;
217 219
218 protected AvatarAppearance m_appearance; 220 protected AvatarAppearance m_appearance;
219
220 protected List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
221 221
222 // neighbouring regions we have enabled a child agent in 222 // neighbouring regions we have enabled a child agent in
223 // holds the seed cap for the child agent in that region 223 // holds the seed cap for the child agent in that region
@@ -630,12 +630,16 @@ namespace OpenSim.Region.Framework.Scenes
630 #endregion 630 #endregion
631 631
632 #region Constructor(s) 632 #region Constructor(s)
633 633
634 private ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo) 634 public ScenePresence()
635 { 635 {
636 m_animator = new ScenePresenceAnimator(this);
637 m_sendCourseLocationsMethod = SendCoarseLocationsDefault; 636 m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
638 CreateSceneViewer(); 637 CreateSceneViewer();
638 m_animator = new ScenePresenceAnimator(this);
639 }
640
641 private ScenePresence(IClientAPI client, Scene world, RegionInfo reginfo) : this()
642 {
639 m_rootRegionHandle = reginfo.RegionHandle; 643 m_rootRegionHandle = reginfo.RegionHandle;
640 m_controllingClient = client; 644 m_controllingClient = client;
641 m_firstname = m_controllingClient.FirstName; 645 m_firstname = m_controllingClient.FirstName;
@@ -659,7 +663,6 @@ namespace OpenSim.Region.Framework.Scenes
659 m_reprioritization_timer.Elapsed += new ElapsedEventHandler(Reprioritize); 663 m_reprioritization_timer.Elapsed += new ElapsedEventHandler(Reprioritize);
660 m_reprioritization_timer.AutoReset = false; 664 m_reprioritization_timer.AutoReset = false;
661 665
662
663 AdjustKnownSeeds(); 666 AdjustKnownSeeds();
664 667
665 // TODO: I think, this won't send anything, as we are still a child here... 668 // TODO: I think, this won't send anything, as we are still a child here...
@@ -3321,13 +3324,6 @@ namespace OpenSim.Region.Framework.Scenes
3321 m_animator = null; 3324 m_animator = null;
3322 } 3325 }
3323 3326
3324 public ScenePresence()
3325 {
3326 m_sendCourseLocationsMethod = SendCoarseLocationsDefault;
3327 CreateSceneViewer();
3328 m_animator = new ScenePresenceAnimator(this);
3329 }
3330
3331 public void AddAttachment(SceneObjectGroup gobj) 3327 public void AddAttachment(SceneObjectGroup gobj)
3332 { 3328 {
3333 lock (m_attachments) 3329 lock (m_attachments)
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");
1575 { 1575 {
1576//Console.WriteLine("Move " + m_primName); 1576//Console.WriteLine("Move " + m_primName);
1577 if (!d.BodyIsEnabled (Body)) d.BodyEnable (Body); // KF add 161009 1577 if (!d.BodyIsEnabled (Body)) d.BodyEnable (Body); // KF add 161009
1578 /*
1578 // NON-'VEHICLES' are dealt with here 1579 // NON-'VEHICLES' are dealt with here
1579 if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f)) 1580 if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f))
1580 { 1581 {
@@ -1587,6 +1588,7 @@ Console.WriteLine(" JointCreateFixed");
1587 avel2.Z = 0; 1588 avel2.Z = 0;
1588 d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z); 1589 d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z);
1589 } 1590 }
1591 */
1590 //float PID_P = 900.0f; 1592 //float PID_P = 900.0f;
1591 1593
1592 float m_mass = CalculateMass(); 1594 float m_mass = CalculateMass();