aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs6
-rw-r--r--OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs40
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs28
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEventQueue.cs9
-rw-r--r--OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs196
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs992
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs81
12 files changed, 1010 insertions, 383 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
index 34aca33..d25c930 100644
--- a/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
@@ -35,8 +35,8 @@ namespace OpenSim.Region.Framework.Interfaces
35 35
36 public interface IAvatarFactoryModule 36 public interface IAvatarFactoryModule
37 { 37 {
38 void SetAppearance(IScenePresence sp, AvatarAppearance appearance); 38 void SetAppearance(IScenePresence sp, AvatarAppearance appearance, WearableCacheItem[] cacheItems);
39 void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams); 39 void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams, WearableCacheItem[] cacheItems);
40 40
41 /// <summary> 41 /// <summary>
42 /// Send the appearance of an avatar to others in the scene. 42 /// Send the appearance of an avatar to others in the scene.
@@ -52,6 +52,8 @@ namespace OpenSim.Region.Framework.Interfaces
52 /// <returns>An empty list if this agent has no baked textures (e.g. because it's a child agent)</returns> 52 /// <returns>An empty list if this agent has no baked textures (e.g. because it's a child agent)</returns>
53 Dictionary<BakeType, Primitive.TextureEntryFace> GetBakedTextureFaces(UUID agentId); 53 Dictionary<BakeType, Primitive.TextureEntryFace> GetBakedTextureFaces(UUID agentId);
54 54
55
56 WearableCacheItem[] GetCachedItems(UUID agentId);
55 /// <summary> 57 /// <summary>
56 /// Save the baked textures for the given agent permanently in the asset database. 58 /// Save the baked textures for the given agent permanently in the asset database.
57 /// </summary> 59 /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
new file mode 100644
index 0000000..b536a49
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IBakedTextureModule.cs
@@ -0,0 +1,40 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using Nini.Config;
30using OpenSim.Framework;
31using OpenMetaverse;
32
33namespace OpenSim.Services.Interfaces
34{
35 public interface IBakedTextureModule
36 {
37 WearableCacheItem[] Get(UUID id);
38 void Store(UUID id, WearableCacheItem[] data);
39 }
40}
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 1c43a25..214b07a 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -35,6 +35,8 @@ using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Framework.Interfaces 36namespace OpenSim.Region.Framework.Interfaces
37{ 37{
38 public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
39
38 public interface IEntityTransferModule 40 public interface IEntityTransferModule
39 { 41 {
40 /// <summary> 42 /// <summary>
@@ -45,13 +47,22 @@ namespace OpenSim.Region.Framework.Interfaces
45 /// The handle of the destination region. If it's the same as the region currently 47 /// The handle of the destination region. If it's the same as the region currently
46 /// occupied by the agent then the teleport will be within that region. 48 /// occupied by the agent then the teleport will be within that region.
47 /// </param> 49 /// </param>
50 /// <param name='agent'></param>
51 /// <param name='regionHandle'></param>
48 /// <param name='position'></param> 52 /// <param name='position'></param>
49 /// <param name='lookAt'></param> 53 /// <param name='lookAt'></param>
50 /// <param name='teleportFlags'></param> 54 /// <param name='teleportFlags'></param>
51 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags); 55 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
52 56
53 /// <summary> 57 /// <summary>
54 /// Teleport an agent directly to a given region without checking whether the region should be subsituted. 58 /// Teleports the agent for the given client to their home destination.
59 /// </summary>
60 /// <param name='id'></param>
61 /// <param name='client'></param>
62 bool TeleportHome(UUID id, IClientAPI client);
63
64 /// <summary>
65 /// Teleport an agent directly to a given region without checking whether the region should be substituted.
55 /// </summary> 66 /// </summary>
56 /// <remarks> 67 /// <remarks>
57 /// Please use Teleport() instead unless you know exactly what you're doing. 68 /// Please use Teleport() instead unless you know exactly what you're doing.
@@ -63,18 +74,10 @@ namespace OpenSim.Region.Framework.Interfaces
63 /// <param name='position'></param> 74 /// <param name='position'></param>
64 /// <param name='lookAt'></param> 75 /// <param name='lookAt'></param>
65 /// <param name='teleportFlags'></param> 76 /// <param name='teleportFlags'></param>
66 void DoTeleport( 77 void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
67 ScenePresence sp, GridRegion reg, GridRegion finalDestination,
68 Vector3 position, Vector3 lookAt, uint teleportFlags); 78 Vector3 position, Vector3 lookAt, uint teleportFlags);
69 79
70 /// <summary> 80 /// <summary>
71 /// Teleports the agent for the given client to their home destination.
72 /// </summary>
73 /// <param name='id'></param>
74 /// <param name='client'></param>
75 bool TeleportHome(UUID id, IClientAPI client);
76
77 /// <summary>
78 /// Show whether the given agent is being teleported. 81 /// Show whether the given agent is being teleported.
79 /// </summary> 82 /// </summary>
80 /// <param name='id'>The agent ID</para></param> 83 /// <param name='id'>The agent ID</para></param>
@@ -89,7 +92,12 @@ namespace OpenSim.Region.Framework.Interfaces
89 92
90 void EnableChildAgent(ScenePresence agent, GridRegion region); 93 void EnableChildAgent(ScenePresence agent, GridRegion region);
91 94
95 GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos);
96
92 void Cross(SceneObjectGroup sog, Vector3 position, bool silent); 97 void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
98
99 ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, GridRegion neighbourRegion, bool isFlying, string version);
100
93 } 101 }
94 102
95 public interface IUserAgentVerificationModule 103 public interface IUserAgentVerificationModule
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index 3780ece..dfc269e 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -39,16 +39,17 @@ namespace OpenSim.Region.Framework.Interfaces
39 39
40 // These are required to decouple Scenes from EventQueueHelper 40 // These are required to decouple Scenes from EventQueueHelper
41 void DisableSimulator(ulong handle, UUID avatarID); 41 void DisableSimulator(ulong handle, UUID avatarID);
42 void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID); 42 void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID, int regionSizeX, int regionSizeY);
43 void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, 43 void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint,
44 string capsPath); 44 string capsPath, ulong regionHandle, int regionSizeX, int regionSizeY);
45 void TeleportFinishEvent(ulong regionHandle, byte simAccess, 45 void TeleportFinishEvent(ulong regionHandle, byte simAccess,
46 IPEndPoint regionExternalEndPoint, 46 IPEndPoint regionExternalEndPoint,
47 uint locationID, uint flags, string capsURL, 47 uint locationID, uint flags, string capsURL,
48 UUID agentID); 48 UUID agentID, int regionSizeX, int regionSizeY);
49 void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, 49 void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt,
50 IPEndPoint newRegionExternalEndPoint, 50 IPEndPoint newRegionExternalEndPoint,
51 string capsURL, UUID avatarID, UUID sessionID); 51 string capsURL, UUID avatarID, UUID sessionID,
52 int regionSizeX, int regionSizeY);
52 void ChatterboxInvitation(UUID sessionID, string sessionName, 53 void ChatterboxInvitation(UUID sessionID, string sessionName,
53 UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, 54 UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
54 uint timeStamp, bool offline, int parentEstateID, Vector3 position, 55 uint timeStamp, bool offline, int parentEstateID, Vector3 position,
diff --git a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
index b67312e..1a89721 100644
--- a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
@@ -51,10 +51,17 @@ namespace OpenSim.Region.Framework.Interfaces
51 UUID = 5 51 UUID = 5
52 } 52 }
53 53
54 public struct JsonStoreStats
55 {
56 public int StoreCount;
57 }
58
54 public delegate void TakeValueCallback(string s); 59 public delegate void TakeValueCallback(string s);
55 60
56 public interface IJsonStoreModule 61 public interface IJsonStoreModule
57 { 62 {
63 JsonStoreStats GetStoreStats();
64
58 bool AttachObjectStore(UUID objectID); 65 bool AttachObjectStore(UUID objectID);
59 bool CreateStore(string value, ref UUID result); 66 bool CreateStore(string value, ref UUID result);
60 bool DestroyStore(UUID storeID); 67 bool DestroyStore(UUID storeID);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 59c5b09..c3110a2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1953,6 +1953,11 @@ namespace OpenSim.Region.Framework.Scenes
1953 1953
1954 GridRegion region = new GridRegion(RegionInfo); 1954 GridRegion region = new GridRegion(RegionInfo);
1955 string error = GridService.RegisterRegion(RegionInfo.ScopeID, region); 1955 string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
1956 m_log.DebugFormat("{0} RegisterRegionWithGrid. name={1},id={2},loc=<{3},{4}>,size=<{5},{6}>",
1957 LogHeader, m_regionName,
1958 RegionInfo.RegionID,
1959 RegionInfo.RegionLocX, RegionInfo.RegionLocY,
1960 RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
1956 if (error != String.Empty) 1961 if (error != String.Empty)
1957 throw new Exception(error); 1962 throw new Exception(error);
1958 } 1963 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 4f04706..c86f412 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -42,7 +42,8 @@ namespace OpenSim.Region.Framework.Scenes
42{ 42{
43 public abstract class SceneBase : IScene 43 public abstract class SceneBase : IScene
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 protected static readonly string LogHeader = "[SCENE]";
46 47
47 #region Events 48 #region Events
48 49
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index e31270c..9bd7632 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -121,6 +121,7 @@ namespace OpenSim.Region.Framework.Scenes
121 private bool m_hasGroupChanged = false; 121 private bool m_hasGroupChanged = false;
122 private long timeFirstChanged; 122 private long timeFirstChanged;
123 private long timeLastChanged; 123 private long timeLastChanged;
124 private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
124 125
125 /// <summary> 126 /// <summary>
126 /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage 127 /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage
@@ -431,6 +432,12 @@ namespace OpenSim.Region.Framework.Scenes
431 return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0)); 432 return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0));
432 } 433 }
433 434
435 private struct avtocrossInfo
436 {
437 public ScenePresence av;
438 public uint ParentID;
439 }
440
434 /// <summary> 441 /// <summary>
435 /// The absolute position of this scene object in the scene 442 /// The absolute position of this scene object in the scene
436 /// </summary> 443 /// </summary>
@@ -458,13 +465,124 @@ namespace OpenSim.Region.Framework.Scenes
458 || Scene.TestBorderCross(val, Cardinals.S)) 465 || Scene.TestBorderCross(val, Cardinals.S))
459 && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) 466 && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
460 { 467 {
468 IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
469 uint x = 0;
470 uint y = 0;
471 string version = String.Empty;
472 Vector3 newpos = Vector3.Zero;
473 OpenSim.Services.Interfaces.GridRegion destination = null;
474
461 if (m_rootPart.KeyframeMotion != null) 475 if (m_rootPart.KeyframeMotion != null)
462 m_rootPart.KeyframeMotion.StartCrossingCheck(); 476 m_rootPart.KeyframeMotion.StartCrossingCheck();
463 477
464 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 478 bool canCross = true;
479 foreach (ScenePresence av in m_linkedAvatars)
480 {
481 // We need to cross these agents. First, let's find
482 // out if any of them can't cross for some reason.
483 // We have to deny the crossing entirely if any
484 // of them are banned. Alternatively, we could
485 // unsit banned agents....
486
487
488 // We set the avatar position as being the object
489 // position to get the region to send to
490 if ((destination = entityTransfer.GetDestination(m_scene, av.UUID, val, out x, out y, out version, out newpos)) == null)
491 {
492 canCross = false;
493 break;
494 }
495
496 m_log.DebugFormat("[SCENE OBJECT]: Avatar {0} needs to be crossed to {1}", av.Name, destination.RegionName);
497 }
498
499 if (canCross)
500 {
501 // We unparent the SP quietly so that it won't
502 // be made to stand up
503
504 List<avtocrossInfo> avsToCross = new List<avtocrossInfo>();
505
506 foreach (ScenePresence av in m_linkedAvatars)
507 {
508 avtocrossInfo avinfo = new avtocrossInfo();
509 SceneObjectPart parentPart = m_scene.GetSceneObjectPart(av.ParentID);
510 if (parentPart != null)
511 av.ParentUUID = parentPart.UUID;
512
513 avinfo.av = av;
514 avinfo.ParentID = av.ParentID;
515 avsToCross.Add(avinfo);
516
517 av.PrevSitOffset = av.OffsetPosition;
518 av.ParentID = 0;
519 }
520
521 // m_linkedAvatars.Clear();
522 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
523
524 // Normalize
525 if (val.X >= Constants.RegionSize)
526 val.X -= Constants.RegionSize;
527 if (val.Y >= Constants.RegionSize)
528 val.Y -= Constants.RegionSize;
529 if (val.X < 0)
530 val.X += Constants.RegionSize;
531 if (val.Y < 0)
532 val.Y += Constants.RegionSize;
533
534 // If it's deleted, crossing was successful
535 if (IsDeleted)
536 {
537 // foreach (ScenePresence av in m_linkedAvatars)
538 foreach (avtocrossInfo avinfo in avsToCross)
539 {
540 ScenePresence av = avinfo.av;
541 if (!av.IsInTransit) // just in case...
542 {
543 m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar {0} to {1}", av.Name, val);
544
545 av.IsInTransit = true;
546
547 CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync;
548 d.BeginInvoke(av, val, destination, av.Flying, version, CrossAgentToNewRegionCompleted, d);
549 }
550 else
551 m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar alreasy in transit {0} to {1}", av.Name, val);
552 }
553 avsToCross.Clear();
554 return;
555 }
556 else // cross failed, put avas back ??
557 {
558 foreach (avtocrossInfo avinfo in avsToCross)
559 {
560 ScenePresence av = avinfo.av;
561 av.ParentUUID = UUID.Zero;
562 av.ParentID = avinfo.ParentID;
563// m_linkedAvatars.Add(av);
564 }
565 }
566 avsToCross.Clear();
567
568 }
569 else
570 {
571 if (m_rootPart.KeyframeMotion != null)
572 m_rootPart.KeyframeMotion.CrossingFailure();
573
574 if (RootPart.PhysActor != null)
575 {
576 RootPart.PhysActor.CrossingFailure();
577 }
578 }
579 Vector3 oldp = AbsolutePosition;
580 val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)Constants.RegionSize - 0.5f);
581 val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)Constants.RegionSize - 0.5f);
582 val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f);
465 } 583 }
466 } 584 }
467 585
468 if (RootPart.GetStatusSandbox()) 586 if (RootPart.GetStatusSandbox())
469 { 587 {
470 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) 588 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
@@ -498,6 +616,39 @@ namespace OpenSim.Region.Framework.Scenes
498 } 616 }
499 } 617 }
500 618
619 public override Vector3 Velocity
620 {
621 get { return RootPart.Velocity; }
622 set { RootPart.Velocity = value; }
623 }
624
625 private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
626 {
627 CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
628 ScenePresence agent = icon.EndInvoke(iar);
629
630 //// If the cross was successful, this agent is a child agent
631 if (agent.IsChildAgent)
632 {
633 if (agent.ParentUUID != UUID.Zero)
634 {
635 agent.ParentPart = null;
636// agent.ParentPosition = Vector3.Zero;
637// agent.ParentUUID = UUID.Zero;
638 }
639 }
640
641 agent.ParentUUID = UUID.Zero;
642// agent.Reset();
643// else // Not successful
644// agent.RestoreInCurrentScene();
645
646 // In any case
647 agent.IsInTransit = false;
648
649 m_log.DebugFormat("[SCENE OBJECT]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
650 }
651
501 public override uint LocalId 652 public override uint LocalId
502 { 653 {
503 get { return m_rootPart.LocalId; } 654 get { return m_rootPart.LocalId; }
@@ -1099,6 +1250,7 @@ namespace OpenSim.Region.Framework.Scenes
1099 } 1250 }
1100 } 1251 }
1101 1252
1253
1102 /// <summary> 1254 /// <summary>
1103 /// 1255 ///
1104 /// </summary> 1256 /// </summary>
@@ -1108,6 +1260,46 @@ namespace OpenSim.Region.Framework.Scenes
1108 part.ParentID = m_rootPart.LocalId; 1260 part.ParentID = m_rootPart.LocalId;
1109 part.ClearUndoState(); 1261 part.ClearUndoState();
1110 } 1262 }
1263 /// <summary>
1264 /// Add the avatar to this linkset (avatar is sat).
1265 /// </summary>
1266 /// <param name="agentID"></param>
1267 public void AddAvatar(UUID agentID)
1268 {
1269 ScenePresence presence;
1270 if (m_scene.TryGetScenePresence(agentID, out presence))
1271 {
1272 if (!m_linkedAvatars.Contains(presence))
1273 {
1274 m_linkedAvatars.Add(presence);
1275 }
1276 }
1277 }
1278
1279 /// <summary>
1280 /// Delete the avatar from this linkset (avatar is unsat).
1281 /// </summary>
1282 /// <param name="agentID"></param>
1283 public void DeleteAvatar(UUID agentID)
1284 {
1285 ScenePresence presence;
1286 if (m_scene.TryGetScenePresence(agentID, out presence))
1287 {
1288 if (m_linkedAvatars.Contains(presence))
1289 {
1290 m_linkedAvatars.Remove(presence);
1291 }
1292 }
1293 }
1294
1295 /// <summary>
1296 /// Returns the list of linked presences (avatars sat on this group)
1297 /// </summary>
1298 /// <param name="agentID"></param>
1299 public List<ScenePresence> GetLinkedAvatars()
1300 {
1301 return m_linkedAvatars;
1302 }
1111 1303
1112 public ushort GetTimeDilation() 1304 public ushort GetTimeDilation()
1113 { 1305 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3290da1..84201cc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Region.Framework.Scenes
65 65
66 struct ScriptControllers 66 struct ScriptControllers
67 { 67 {
68 public UUID objectID;
68 public UUID itemID; 69 public UUID itemID;
69 public ScriptControlled ignoreControls; 70 public ScriptControlled ignoreControls;
70 public ScriptControlled eventControls; 71 public ScriptControlled eventControls;
@@ -130,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes
130 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis 131 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis
131 /// issue #1716 132 /// issue #1716
132 /// </summary> 133 /// </summary>
133 public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f); 134 public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.4f);
134 135
135 /// <summary> 136 /// <summary>
136 /// Movement updates for agents in neighboring regions are sent directly to clients. 137 /// Movement updates for agents in neighboring regions are sent directly to clients.
@@ -152,8 +153,6 @@ namespace OpenSim.Region.Framework.Scenes
152 /// <remarks> 153 /// <remarks>
153 /// TODO: For some reason, we effectively have a list both here and in Appearance. Need to work out if this is 154 /// TODO: For some reason, we effectively have a list both here and in Appearance. Need to work out if this is
154 /// necessary. 155 /// necessary.
155 /// NOTE: To avoid deadlocks, do not lock m_attachments and then perform other tasks under that lock. Take a copy
156 /// of the list and act on that instead.
157 /// </remarks> 156 /// </remarks>
158 private List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>(); 157 private List<SceneObjectGroup> m_attachments = new List<SceneObjectGroup>();
159 158
@@ -172,6 +171,10 @@ namespace OpenSim.Region.Framework.Scenes
172 private Vector3 m_lastPosition; 171 private Vector3 m_lastPosition;
173 private Quaternion m_lastRotation; 172 private Quaternion m_lastRotation;
174 private Vector3 m_lastVelocity; 173 private Vector3 m_lastVelocity;
174 private Vector3 m_lastSize = new Vector3(0.45f,0.6f,1.9f);
175
176 private bool m_followCamAuto = false;
177
175 178
176 private Vector3? m_forceToApply; 179 private Vector3? m_forceToApply;
177 private int m_userFlags; 180 private int m_userFlags;
@@ -204,6 +207,7 @@ namespace OpenSim.Region.Framework.Scenes
204// private int m_lastColCount = -1; //KF: Look for Collision chnages 207// private int m_lastColCount = -1; //KF: Look for Collision chnages
205// private int m_updateCount = 0; //KF: Update Anims for a while 208// private int m_updateCount = 0; //KF: Update Anims for a while
206// private static readonly int UPDATE_COUNT = 10; // how many frames to update for 209// private static readonly int UPDATE_COUNT = 10; // how many frames to update for
210 private List<uint> m_lastColliders = new List<uint>();
207 211
208 private TeleportFlags m_teleportFlags; 212 private TeleportFlags m_teleportFlags;
209 public TeleportFlags TeleportFlags 213 public TeleportFlags TeleportFlags
@@ -259,8 +263,6 @@ namespace OpenSim.Region.Framework.Scenes
259 /// </summary> 263 /// </summary>
260 public bool LandAtTarget { get; private set; } 264 public bool LandAtTarget { get; private set; }
261 265
262 private bool m_followCamAuto;
263
264 private int m_movementUpdateCount; 266 private int m_movementUpdateCount;
265 private const int NumMovementsBetweenRayCast = 5; 267 private const int NumMovementsBetweenRayCast = 5;
266 268
@@ -268,6 +270,13 @@ namespace OpenSim.Region.Framework.Scenes
268 //private int m_moveToPositionStateStatus; 270 //private int m_moveToPositionStateStatus;
269 //***************************************************** 271 //*****************************************************
270 272
273 private bool m_collisionEventFlag = false;
274 private object m_collisionEventLock = new Object();
275
276 private int m_movementAnimationUpdateCounter = 0;
277
278 public Vector3 PrevSitOffset { get; set; }
279
271 protected AvatarAppearance m_appearance; 280 protected AvatarAppearance m_appearance;
272 281
273 public AvatarAppearance Appearance 282 public AvatarAppearance Appearance
@@ -407,6 +416,9 @@ namespace OpenSim.Region.Framework.Scenes
407 /// </summary> 416 /// </summary>
408 protected Vector3 m_lastCameraPosition; 417 protected Vector3 m_lastCameraPosition;
409 418
419 private Vector4 m_lastCameraCollisionPlane = new Vector4(0f, 0f, 0f, 1);
420 private bool m_doingCamRayCast = false;
421
410 public Vector3 CameraPosition { get; set; } 422 public Vector3 CameraPosition { get; set; }
411 423
412 public Quaternion CameraRotation 424 public Quaternion CameraRotation
@@ -487,6 +499,10 @@ namespace OpenSim.Region.Framework.Scenes
487 get { return (IClientCore)ControllingClient; } 499 get { return (IClientCore)ControllingClient; }
488 } 500 }
489 501
502 public UUID COF { get; set; }
503
504// public Vector3 ParentPosition { get; set; }
505
490 /// <summary> 506 /// <summary>
491 /// Position of this avatar relative to the region the avatar is in 507 /// Position of this avatar relative to the region the avatar is in
492 /// </summary> 508 /// </summary>
@@ -613,7 +629,24 @@ namespace OpenSim.Region.Framework.Scenes
613// Scene.RegionInfo.RegionName, Name, m_velocity); 629// Scene.RegionInfo.RegionName, Name, m_velocity);
614 } 630 }
615 } 631 }
632/*
633 public override Vector3 AngularVelocity
634 {
635 get
636 {
637 if (PhysicsActor != null)
638 {
639 m_rotationalvelocity = PhysicsActor.RotationalVelocity;
640
641 // m_log.DebugFormat(
642 // "[SCENE PRESENCE]: Set velocity {0} for {1} in {2} via getting Velocity!",
643 // m_velocity, Name, Scene.RegionInfo.RegionName);
644 }
616 645
646 return m_rotationalvelocity;
647 }
648 }
649*/
617 private Quaternion m_bodyRot = Quaternion.Identity; 650 private Quaternion m_bodyRot = Quaternion.Identity;
618 651
619 /// <summary> 652 /// <summary>
@@ -636,8 +669,16 @@ namespace OpenSim.Region.Framework.Scenes
636 m_bodyRot = value; 669 m_bodyRot = value;
637 670
638 if (PhysicsActor != null) 671 if (PhysicsActor != null)
639 PhysicsActor.Orientation = m_bodyRot; 672 {
640 673 try
674 {
675 PhysicsActor.Orientation = m_bodyRot;
676 }
677 catch (Exception e)
678 {
679 m_log.Error("[SCENE PRESENCE]: Orientation " + e.Message);
680 }
681 }
641// m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot); 682// m_log.DebugFormat("[SCENE PRESENCE]: Body rot for {0} set to {1}", Name, m_bodyRot);
642 } 683 }
643 } 684 }
@@ -651,12 +692,20 @@ namespace OpenSim.Region.Framework.Scenes
651 } 692 }
652 693
653 public bool IsChildAgent { get; set; } 694 public bool IsChildAgent { get; set; }
695 public bool IsLoggingIn { get; set; }
654 696
655 /// <summary> 697 /// <summary>
656 /// If the avatar is sitting, the local ID of the prim that it's sitting on. If not sitting then zero. 698 /// If the avatar is sitting, the local ID of the prim that it's sitting on. If not sitting then zero.
657 /// </summary> 699 /// </summary>
658 public uint ParentID { get; set; } 700 public uint ParentID { get; set; }
659 701
702 public UUID ParentUUID
703 {
704 get { return m_parentUUID; }
705 set { m_parentUUID = value; }
706 }
707 private UUID m_parentUUID = UUID.Zero;
708
660 /// <summary> 709 /// <summary>
661 /// Are we sitting on an object? 710 /// Are we sitting on an object?
662 /// </summary> 711 /// </summary>
@@ -814,6 +863,7 @@ namespace OpenSim.Region.Framework.Scenes
814 AttachmentsSyncLock = new Object(); 863 AttachmentsSyncLock = new Object();
815 AllowMovement = true; 864 AllowMovement = true;
816 IsChildAgent = true; 865 IsChildAgent = true;
866 IsLoggingIn = false;
817 m_sendCoarseLocationsMethod = SendCoarseLocationsDefault; 867 m_sendCoarseLocationsMethod = SendCoarseLocationsDefault;
818 Animator = new ScenePresenceAnimator(this); 868 Animator = new ScenePresenceAnimator(this);
819 PresenceType = type; 869 PresenceType = type;
@@ -859,6 +909,33 @@ namespace OpenSim.Region.Framework.Scenes
859 m_stateMachine = new ScenePresenceStateMachine(this); 909 m_stateMachine = new ScenePresenceStateMachine(this);
860 } 910 }
861 911
912 private void RegionHeartbeatEnd(Scene scene)
913 {
914 if (IsChildAgent)
915 return;
916
917 m_movementAnimationUpdateCounter ++;
918 if (m_movementAnimationUpdateCounter >= 2)
919 {
920 m_movementAnimationUpdateCounter = 0;
921 if (Animator != null)
922 {
923 // If the parentID == 0 we are not sitting
924 // if !SitGournd then we are not sitting on the ground
925 // Fairly straightforward, now here comes the twist
926 // if ParentUUID is NOT UUID.Zero, we are looking to
927 // be sat on an object that isn't there yet. Should
928 // be treated as if sat.
929 if(ParentID == 0 && !SitGround && ParentUUID == UUID.Zero) // skip it if sitting
930 Animator.UpdateMovementAnimations();
931 }
932 else
933 {
934 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
935 }
936 }
937 }
938
862 public void RegisterToEvents() 939 public void RegisterToEvents()
863 { 940 {
864 ControllingClient.OnCompleteMovementToRegion += CompleteMovement; 941 ControllingClient.OnCompleteMovementToRegion += CompleteMovement;
@@ -926,17 +1003,46 @@ namespace OpenSim.Region.Framework.Scenes
926 /// </remarks> 1003 /// </remarks>
927 private bool MakeRootAgent(Vector3 pos, bool isFlying) 1004 private bool MakeRootAgent(Vector3 pos, bool isFlying)
928 { 1005 {
929// m_log.InfoFormat(
930// "[SCENE]: Upgrading child to root agent for {0} in {1}",
931// Name, m_scene.RegionInfo.RegionName);
932
933 //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
934
935 lock (m_completeMovementLock) 1006 lock (m_completeMovementLock)
936 { 1007 {
937 if (!IsChildAgent) 1008 if (!IsChildAgent)
938 return false; 1009 return false;
939 1010
1011 //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
1012
1013 // m_log.InfoFormat(
1014 // "[SCENE]: Upgrading child to root agent for {0} in {1}",
1015 // Name, m_scene.RegionInfo.RegionName);
1016
1017 if (ParentUUID != UUID.Zero)
1018 {
1019 m_log.DebugFormat("[SCENE PRESENCE]: Sitting avatar back on prim {0}", ParentUUID);
1020 SceneObjectPart part = m_scene.GetSceneObjectPart(ParentUUID);
1021 if (part == null)
1022 {
1023 m_log.ErrorFormat("[SCENE PRESENCE]: Can't find prim {0} to sit on", ParentUUID);
1024 }
1025 else
1026 {
1027 part.ParentGroup.AddAvatar(UUID);
1028 if (part.SitTargetPosition != Vector3.Zero)
1029 part.SitTargetAvatar = UUID;
1030 // ParentPosition = part.GetWorldPosition();
1031 ParentID = part.LocalId;
1032 ParentPart = part;
1033 m_pos = PrevSitOffset;
1034 // pos = ParentPosition;
1035 pos = part.GetWorldPosition();
1036 }
1037 ParentUUID = UUID.Zero;
1038
1039 // Animator.TrySetMovementAnimation("SIT");
1040 }
1041 else
1042 {
1043 IsLoggingIn = false;
1044 }
1045
940 IsChildAgent = false; 1046 IsChildAgent = false;
941 } 1047 }
942 1048
@@ -953,70 +1059,106 @@ namespace OpenSim.Region.Framework.Scenes
953 1059
954 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); 1060 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
955 1061
956 // Moved this from SendInitialData to ensure that Appearance is initialized 1062 UUID groupUUID = UUID.Zero;
957 // before the inventory is processed in MakeRootAgent. This fixes a race condition 1063 string GroupName = string.Empty;
958 // related to the handling of attachments 1064 ulong groupPowers = 0;
959 //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
960 1065
961 if (m_scene.TestBorderCross(pos, Cardinals.E)) 1066 // ----------------------------------
1067 // Previous Agent Difference - AGNI sends an unsolicited AgentDataUpdate upon root agent status
1068 try
962 { 1069 {
963 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); 1070 if (gm != null)
964 pos.X = crossedBorder.BorderLine.Z - 1; 1071 {
1072 groupUUID = ControllingClient.ActiveGroupId;
1073 GroupRecord record = gm.GetGroupRecord(groupUUID);
1074 if (record != null)
1075 GroupName = record.GroupName;
1076 GroupMembershipData groupMembershipData = gm.GetMembershipData(groupUUID, m_uuid);
1077 if (groupMembershipData != null)
1078 groupPowers = groupMembershipData.GroupPowers;
1079 }
1080 ControllingClient.SendAgentDataUpdate(m_uuid, groupUUID, Firstname, Lastname, groupPowers, GroupName,
1081 Grouptitle);
965 } 1082 }
966 1083 catch (Exception e)
967 if (m_scene.TestBorderCross(pos, Cardinals.N))
968 { 1084 {
969 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N); 1085 m_log.Debug("[AGENTUPDATE]: " + e.ToString());
970 pos.Y = crossedBorder.BorderLine.Z - 1;
971 } 1086 }
1087 // ------------------------------------
972 1088
973 CheckAndAdjustLandingPoint(ref pos); 1089 if (ParentID == 0)
974
975 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
976 { 1090 {
977 m_log.WarnFormat( 1091 // Moved this from SendInitialData to ensure that Appearance is initialized
978 "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping", 1092 // before the inventory is processed in MakeRootAgent. This fixes a race condition
979 pos, Name, UUID); 1093 // related to the handling of attachments
1094 //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
1095 if (m_scene.TestBorderCross(pos, Cardinals.E))
1096 {
1097 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
1098 pos.X = crossedBorder.BorderLine.Z - 1;
1099 }
980 1100
981 if (pos.X < 0f) pos.X = 0f; 1101 if (m_scene.TestBorderCross(pos, Cardinals.N))
982 if (pos.Y < 0f) pos.Y = 0f; 1102 {
983 if (pos.Z < 0f) pos.Z = 0f; 1103 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
984 } 1104 pos.Y = crossedBorder.BorderLine.Z - 1;
1105 }
1106
1107 CheckAndAdjustLandingPoint(ref pos);
1108
1109 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
1110 {
1111 m_log.WarnFormat(
1112 "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping",
1113 pos, Name, UUID);
985 1114
986 float localAVHeight = 1.56f; 1115 if (pos.X < 0f) pos.X = 0f;
987 if (Appearance.AvatarHeight > 0) 1116 if (pos.Y < 0f) pos.Y = 0f;
988 localAVHeight = Appearance.AvatarHeight; 1117 if (pos.Z < 0f) pos.Z = 0f;
1118 }
989 1119
990 float posZLimit = 0; 1120 float localAVHeight = 1.56f;
1121 if (Appearance.AvatarHeight > 0)
1122 localAVHeight = Appearance.AvatarHeight;
991 1123
992 if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize) 1124 float posZLimit = 0;
993 posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y];
994
995 float newPosZ = posZLimit + localAVHeight / 2;
996 if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
997 {
998 pos.Z = newPosZ;
999 }
1000 AbsolutePosition = pos;
1001 1125
1002 AddToPhysicalScene(isFlying); 1126 if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize)
1127 posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y];
1128
1129 float newPosZ = posZLimit + localAVHeight / 2;
1130 if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
1131 {
1132 pos.Z = newPosZ;
1133 }
1134 AbsolutePosition = pos;
1003 1135
1004 // XXX: This is to trigger any secondary teleport needed for a megaregion when the user has teleported to a 1136 if (m_teleportFlags == TeleportFlags.Default)
1005 // location outside the 'root region' (the south-west 256x256 corner). This is the earlist we can do it 1137 {
1006 // since it requires a physics actor to be present. If it is left any later, then physics appears to reset 1138 Vector3 vel = Velocity;
1007 // the value to a negative position which does not trigger the border cross. 1139 AddToPhysicalScene(isFlying);
1008 // This may not be the best location for this. 1140 if (PhysicsActor != null)
1009 CheckForBorderCrossing(); 1141 PhysicsActor.SetMomentum(vel);
1142 }
1143 else
1144 AddToPhysicalScene(isFlying);
1010 1145
1011 if (ForceFly) 1146 // XXX: This is to trigger any secondary teleport needed for a megaregion when the user has teleported to a
1012 { 1147 // location outside the 'root region' (the south-west 256x256 corner). This is the earlist we can do it
1013 Flying = true; 1148 // since it requires a physics actor to be present. If it is left any later, then physics appears to reset
1014 } 1149 // the value to a negative position which does not trigger the border cross.
1015 else if (FlyDisabled) 1150 // This may not be the best location for this.
1016 { 1151 CheckForBorderCrossing();
1017 Flying = false;
1018 }
1019 1152
1153 if (ForceFly)
1154 {
1155 Flying = true;
1156 }
1157 else if (FlyDisabled)
1158 {
1159 Flying = false;
1160 }
1161 }
1020 // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying 1162 // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying
1021 // avatar to return to the standing position in mid-air. On login it looks like this is being sent 1163 // avatar to return to the standing position in mid-air. On login it looks like this is being sent
1022 // elsewhere anyway 1164 // elsewhere anyway
@@ -1049,6 +1191,11 @@ namespace OpenSim.Region.Framework.Scenes
1049 // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are 1191 // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are
1050 // not transporting the required data. 1192 // not transporting the required data.
1051 // 1193 //
1194 // We need to restart scripts here so that they receive the correct changed events (CHANGED_TELEPORT
1195 // and CHANGED_REGION) when the attachments have been rezzed in the new region. This cannot currently
1196 // be done in AttachmentsModule.CopyAttachments(AgentData ad, IScenePresence sp) itself since we are
1197 // not transporting the required data.
1198 //
1052 // We must take a copy of the attachments list here (rather than locking) to avoid a deadlock where a script in one of 1199 // We must take a copy of the attachments list here (rather than locking) to avoid a deadlock where a script in one of
1053 // the attachments may start processing an event (which locks ScriptInstance.m_Script) that then calls a method here 1200 // the attachments may start processing an event (which locks ScriptInstance.m_Script) that then calls a method here
1054 // which needs to lock m_attachments. ResumeScripts() needs to take a ScriptInstance.m_Script lock to try to unset the Suspend status. 1201 // which needs to lock m_attachments. ResumeScripts() needs to take a ScriptInstance.m_Script lock to try to unset the Suspend status.
@@ -1057,6 +1204,9 @@ namespace OpenSim.Region.Framework.Scenes
1057 // But XEngine starts all scripts unsuspended. Starting them suspended will not currently work because script rezzing 1204 // But XEngine starts all scripts unsuspended. Starting them suspended will not currently work because script rezzing
1058 // is placed in an asynchronous queue in XEngine and so the ResumeScripts() call will almost certainly execute before the 1205 // is placed in an asynchronous queue in XEngine and so the ResumeScripts() call will almost certainly execute before the
1059 // script is rezzed. This means the ResumeScripts() does absolutely nothing when using XEngine. 1206 // script is rezzed. This means the ResumeScripts() does absolutely nothing when using XEngine.
1207 //
1208 // One cannot simply iterate over attachments in a fire and forget thread because this would no longer
1209 // be locked, allowing race conditions if other code changes the attachments list.
1060 List<SceneObjectGroup> attachments = GetAttachments(); 1210 List<SceneObjectGroup> attachments = GetAttachments();
1061 1211
1062 if (attachments.Count > 0) 1212 if (attachments.Count > 0)
@@ -1067,12 +1217,15 @@ namespace OpenSim.Region.Framework.Scenes
1067 // Resume scripts 1217 // Resume scripts
1068 foreach (SceneObjectGroup sog in attachments) 1218 foreach (SceneObjectGroup sog in attachments)
1069 { 1219 {
1220 sog.ScheduleGroupForFullUpdate();
1070 sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); 1221 sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
1071 sog.ResumeScripts(); 1222 sog.ResumeScripts();
1072 } 1223 }
1073 } 1224 }
1074 } 1225 }
1075 1226
1227 SendAvatarDataToAllAgents();
1228
1076 // send the animations of the other presences to me 1229 // send the animations of the other presences to me
1077 m_scene.ForEachRootScenePresence(delegate(ScenePresence presence) 1230 m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
1078 { 1231 {
@@ -1083,6 +1236,7 @@ namespace OpenSim.Region.Framework.Scenes
1083 // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will 1236 // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will
1084 // stall on the border crossing since the existing child agent will still have the last movement 1237 // stall on the border crossing since the existing child agent will still have the last movement
1085 // recorded, which stops the input from being processed. 1238 // recorded, which stops the input from being processed.
1239
1086 MovementFlag = 0; 1240 MovementFlag = 0;
1087 1241
1088 m_scene.EventManager.TriggerOnMakeRootAgent(this); 1242 m_scene.EventManager.TriggerOnMakeRootAgent(this);
@@ -1115,12 +1269,16 @@ namespace OpenSim.Region.Framework.Scenes
1115 /// </remarks> 1269 /// </remarks>
1116 public void MakeChildAgent() 1270 public void MakeChildAgent()
1117 { 1271 {
1272 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
1273
1118 m_log.DebugFormat("[SCENE PRESENCE]: Making {0} a child agent in {1}", Name, Scene.RegionInfo.RegionName); 1274 m_log.DebugFormat("[SCENE PRESENCE]: Making {0} a child agent in {1}", Name, Scene.RegionInfo.RegionName);
1119 1275
1120 // Reset these so that teleporting in and walking out isn't seen 1276 // Reset these so that teleporting in and walking out isn't seen
1121 // as teleporting back 1277 // as teleporting back
1122 TeleportFlags = TeleportFlags.Default; 1278 TeleportFlags = TeleportFlags.Default;
1123 1279
1280 MovementFlag = 0;
1281
1124 // It looks like Animator is set to null somewhere, and MakeChild 1282 // It looks like Animator is set to null somewhere, and MakeChild
1125 // is called after that. Probably in aborted teleports. 1283 // is called after that. Probably in aborted teleports.
1126 if (Animator == null) 1284 if (Animator == null)
@@ -1128,6 +1286,7 @@ namespace OpenSim.Region.Framework.Scenes
1128 else 1286 else
1129 Animator.ResetAnimations(); 1287 Animator.ResetAnimations();
1130 1288
1289
1131// m_log.DebugFormat( 1290// m_log.DebugFormat(
1132// "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", 1291// "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
1133// Name, UUID, m_scene.RegionInfo.RegionName); 1292// Name, UUID, m_scene.RegionInfo.RegionName);
@@ -1139,6 +1298,7 @@ namespace OpenSim.Region.Framework.Scenes
1139 IsChildAgent = true; 1298 IsChildAgent = true;
1140 m_scene.SwapRootAgentCount(true); 1299 m_scene.SwapRootAgentCount(true);
1141 RemoveFromPhysicalScene(); 1300 RemoveFromPhysicalScene();
1301 ParentID = 0; // Child agents can't be sitting
1142 1302
1143 // FIXME: Set RegionHandle to the region handle of the scene this agent is moving into 1303 // FIXME: Set RegionHandle to the region handle of the scene this agent is moving into
1144 1304
@@ -1154,9 +1314,9 @@ namespace OpenSim.Region.Framework.Scenes
1154 { 1314 {
1155// PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; 1315// PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
1156 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall; 1316 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall;
1157 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
1158 PhysicsActor.UnSubscribeEvents();
1159 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; 1317 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
1318 PhysicsActor.UnSubscribeEvents();
1319 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
1160 PhysicsActor = null; 1320 PhysicsActor = null;
1161 } 1321 }
1162// else 1322// else
@@ -1173,7 +1333,7 @@ namespace OpenSim.Region.Framework.Scenes
1173 /// <param name="pos"></param> 1333 /// <param name="pos"></param>
1174 public void Teleport(Vector3 pos) 1334 public void Teleport(Vector3 pos)
1175 { 1335 {
1176 TeleportWithMomentum(pos, null); 1336 TeleportWithMomentum(pos, Vector3.Zero);
1177 } 1337 }
1178 1338
1179 public void TeleportWithMomentum(Vector3 pos, Vector3? v) 1339 public void TeleportWithMomentum(Vector3 pos, Vector3? v)
@@ -1197,6 +1357,41 @@ namespace OpenSim.Region.Framework.Scenes
1197 SendTerseUpdateToAllClients(); 1357 SendTerseUpdateToAllClients();
1198 } 1358 }
1199 1359
1360 public void avnLocalTeleport(Vector3 newpos, Vector3? newvel, bool rotateToVelXY)
1361 {
1362 CheckLandingPoint(ref newpos);
1363 AbsolutePosition = newpos;
1364
1365 if (newvel.HasValue)
1366 {
1367 if ((Vector3)newvel == Vector3.Zero)
1368 {
1369 if (PhysicsActor != null)
1370 PhysicsActor.SetMomentum(Vector3.Zero);
1371 m_velocity = Vector3.Zero;
1372 }
1373 else
1374 {
1375 if (PhysicsActor != null)
1376 PhysicsActor.SetMomentum((Vector3)newvel);
1377 m_velocity = (Vector3)newvel;
1378
1379 if (rotateToVelXY)
1380 {
1381 Vector3 lookAt = (Vector3)newvel;
1382 lookAt.Z = 0;
1383 lookAt.Normalize();
1384 ControllingClient.SendLocalTeleport(newpos, lookAt, (uint)TeleportFlags.ViaLocation);
1385 return;
1386 }
1387 }
1388 }
1389
1390 SendTerseUpdateToAllClients();
1391 }
1392
1393
1394
1200 public void StopFlying() 1395 public void StopFlying()
1201 { 1396 {
1202 Vector3 pos = AbsolutePosition; 1397 Vector3 pos = AbsolutePosition;
@@ -1385,6 +1580,14 @@ namespace OpenSim.Region.Framework.Scenes
1385 PhysicsActor.Size = new Vector3(0.45f, 0.6f, height); 1580 PhysicsActor.Size = new Vector3(0.45f, 0.6f, height);
1386 } 1581 }
1387 1582
1583 public void SetSize(Vector3 size, float feetoffset)
1584 {
1585// TODO: Merge the physics bits
1586// if (PhysicsActor != null && !IsChildAgent)
1587// PhysicsActor.setAvatarSize(size, feetoffset);
1588
1589 }
1590
1388 private bool WaitForUpdateAgent(IClientAPI client) 1591 private bool WaitForUpdateAgent(IClientAPI client)
1389 { 1592 {
1390 // Before the source region executes UpdateAgent 1593 // Before the source region executes UpdateAgent
@@ -1444,7 +1647,8 @@ namespace OpenSim.Region.Framework.Scenes
1444 1647
1445 Vector3 look = Velocity; 1648 Vector3 look = Velocity;
1446 1649
1447 if ((look.X == 0) && (look.Y == 0) && (look.Z == 0)) 1650 // if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
1651 if ((Math.Abs(look.X) < 0.1) && (Math.Abs(look.Y) < 0.1) && (Math.Abs(look.Z) < 0.1))
1448 { 1652 {
1449 look = new Vector3(0.99f, 0.042f, 0); 1653 look = new Vector3(0.99f, 0.042f, 0);
1450 } 1654 }
@@ -1514,11 +1718,12 @@ namespace OpenSim.Region.Framework.Scenes
1514 { 1718 {
1515 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); 1719 IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
1516 if (m_agentTransfer != null) 1720 if (m_agentTransfer != null)
1517 Util.FireAndForget(delegate { m_agentTransfer.EnableChildAgents(this); }); 1721 m_agentTransfer.EnableChildAgents(this);
1518 1722
1519 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>(); 1723 IFriendsModule friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
1520 if (friendsModule != null) 1724 if (friendsModule != null)
1521 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); 1725 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
1726
1522 } 1727 }
1523 1728
1524 // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region 1729 // XXX: If we force an update here, then multiple attachments do appear correctly on a destination region
@@ -1544,36 +1749,69 @@ namespace OpenSim.Region.Framework.Scenes
1544 /// <param name="collisionPoint"></param> 1749 /// <param name="collisionPoint"></param>
1545 /// <param name="localid"></param> 1750 /// <param name="localid"></param>
1546 /// <param name="distance"></param> 1751 /// <param name="distance"></param>
1752 ///
1753
1754 private void UpdateCameraCollisionPlane(Vector4 plane)
1755 {
1756 if (m_lastCameraCollisionPlane != plane)
1757 {
1758 m_lastCameraCollisionPlane = plane;
1759 ControllingClient.SendCameraConstraint(plane);
1760 }
1761 }
1762
1547 public void RayCastCameraCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 pNormal) 1763 public void RayCastCameraCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 pNormal)
1548 { 1764 {
1549 const float POSITION_TOLERANCE = 0.02f; 1765 const float POSITION_TOLERANCE = 0.02f;
1550 const float VELOCITY_TOLERANCE = 0.02f;
1551 const float ROTATION_TOLERANCE = 0.02f; 1766 const float ROTATION_TOLERANCE = 0.02f;
1552 1767
1553 if (m_followCamAuto) 1768 m_doingCamRayCast = false;
1769 if (hitYN && localid != LocalId)
1554 { 1770 {
1555 if (hitYN) 1771 SceneObjectGroup group = m_scene.GetGroupByPrim(localid);
1772 bool IsPrim = group != null;
1773 if (IsPrim)
1556 { 1774 {
1557 CameraConstraintActive = true; 1775 SceneObjectPart part = group.GetPart(localid);
1558 //m_log.DebugFormat("[RAYCASTRESULT]: {0}, {1}, {2}, {3}", hitYN, collisionPoint, localid, distance); 1776 if (part != null && !part.VolumeDetectActive)
1559 1777 {
1560 Vector3 normal = Vector3.Normalize(new Vector3(0f, 0f, collisionPoint.Z) - collisionPoint); 1778 CameraConstraintActive = true;
1561 ControllingClient.SendCameraConstraint(new Vector4(normal.X, normal.Y, normal.Z, -1 * Vector3.Distance(new Vector3(0,0,collisionPoint.Z),collisionPoint))); 1779 pNormal.X = (float) Math.Round(pNormal.X, 2);
1780 pNormal.Y = (float) Math.Round(pNormal.Y, 2);
1781 pNormal.Z = (float) Math.Round(pNormal.Z, 2);
1782 pNormal.Normalize();
1783 collisionPoint.X = (float) Math.Round(collisionPoint.X, 1);
1784 collisionPoint.Y = (float) Math.Round(collisionPoint.Y, 1);
1785 collisionPoint.Z = (float) Math.Round(collisionPoint.Z, 1);
1786
1787 Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z,
1788 Vector3.Dot(collisionPoint, pNormal));
1789 UpdateCameraCollisionPlane(plane);
1790 }
1562 } 1791 }
1563 else 1792 else
1564 { 1793 {
1565 if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) || 1794 CameraConstraintActive = true;
1566 !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) || 1795 pNormal.X = (float) Math.Round(pNormal.X, 2);
1567 !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE)) 1796 pNormal.Y = (float) Math.Round(pNormal.Y, 2);
1568 { 1797 pNormal.Z = (float) Math.Round(pNormal.Z, 2);
1569 if (CameraConstraintActive) 1798 pNormal.Normalize();
1570 { 1799 collisionPoint.X = (float) Math.Round(collisionPoint.X, 1);
1571 ControllingClient.SendCameraConstraint(new Vector4(0f, 0.5f, 0.9f, -3000f)); 1800 collisionPoint.Y = (float) Math.Round(collisionPoint.Y, 1);
1572 CameraConstraintActive = false; 1801 collisionPoint.Z = (float) Math.Round(collisionPoint.Z, 1);
1573 } 1802
1574 } 1803 Vector4 plane = new Vector4(pNormal.X, pNormal.Y, pNormal.Z,
1804 Vector3.Dot(collisionPoint, pNormal));
1805 UpdateCameraCollisionPlane(plane);
1575 } 1806 }
1576 } 1807 }
1808 else if (!m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
1809 !Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE))
1810 {
1811 Vector4 plane = new Vector4(0.9f, 0.0f, 0.361f, -9000f); // not right...
1812 UpdateCameraCollisionPlane(plane);
1813 CameraConstraintActive = false;
1814 }
1577 } 1815 }
1578 1816
1579 /// <summary> 1817 /// <summary>
@@ -1647,6 +1885,41 @@ namespace OpenSim.Region.Framework.Scenes
1647 StandUp(); 1885 StandUp();
1648 } 1886 }
1649 1887
1888 // Raycast from the avatar's head to the camera to see if there's anything blocking the view
1889 // this exclude checks may not be complete
1890
1891 if (m_movementUpdateCount % NumMovementsBetweenRayCast == 0 && m_scene.PhysicsScene.SupportsRayCast())
1892 {
1893 if (!m_doingCamRayCast && !m_mouseLook && ParentID == 0)
1894 {
1895 Vector3 posAdjusted = AbsolutePosition;
1896// posAdjusted.Z += 0.5f * Appearance.AvatarSize.Z - 0.5f;
1897 posAdjusted.Z += 1.0f; // viewer current camera focus point
1898 Vector3 tocam = CameraPosition - posAdjusted;
1899 tocam.X = (float)Math.Round(tocam.X, 1);
1900 tocam.Y = (float)Math.Round(tocam.Y, 1);
1901 tocam.Z = (float)Math.Round(tocam.Z, 1);
1902
1903 float distTocamlen = tocam.Length();
1904 if (distTocamlen > 0.3f)
1905 {
1906 tocam *= (1.0f / distTocamlen);
1907 posAdjusted.X = (float)Math.Round(posAdjusted.X, 1);
1908 posAdjusted.Y = (float)Math.Round(posAdjusted.Y, 1);
1909 posAdjusted.Z = (float)Math.Round(posAdjusted.Z, 1);
1910
1911 m_doingCamRayCast = true;
1912 m_scene.PhysicsScene.RaycastWorld(posAdjusted, tocam, distTocamlen + 1.0f, RayCastCameraCallback);
1913 }
1914 }
1915 else if (CameraConstraintActive && (m_mouseLook || ParentID != 0))
1916 {
1917 Vector4 plane = new Vector4(0.9f, 0.0f, 0.361f, -10000f); // not right...
1918 UpdateCameraCollisionPlane(plane);
1919 CameraConstraintActive = false;
1920 }
1921 }
1922
1650 uint flagsForScripts = (uint)flags; 1923 uint flagsForScripts = (uint)flags;
1651 flags = RemoveIgnoredControls(flags, IgnoredControls); 1924 flags = RemoveIgnoredControls(flags, IgnoredControls);
1652 1925
@@ -2207,7 +2480,8 @@ namespace OpenSim.Region.Framework.Scenes
2207// m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name); 2480// m_log.DebugFormat("[SCENE PRESENCE]: Resetting move to target for {0}", Name);
2208 2481
2209 MovingToTarget = false; 2482 MovingToTarget = false;
2210 MoveToPositionTarget = Vector3.Zero; 2483// MoveToPositionTarget = Vector3.Zero;
2484 m_forceToApply = null; // cancel possible last action
2211 2485
2212 // We need to reset the control flag as the ScenePresenceAnimator uses this to determine the correct 2486 // We need to reset the control flag as the ScenePresenceAnimator uses this to determine the correct
2213 // resting animation (e.g. hover or stand). NPCs don't have a client that will quickly reset this flag. 2487 // resting animation (e.g. hover or stand). NPCs don't have a client that will quickly reset this flag.
@@ -2230,6 +2504,9 @@ namespace OpenSim.Region.Framework.Scenes
2230 2504
2231 if (satOnObject) 2505 if (satOnObject)
2232 { 2506 {
2507 PrevSitOffset = m_pos; // Save sit offset
2508 UnRegisterSeatControls(part.ParentGroup.UUID);
2509
2233 TaskInventoryDictionary taskIDict = part.TaskInventory; 2510 TaskInventoryDictionary taskIDict = part.TaskInventory;
2234 if (taskIDict != null) 2511 if (taskIDict != null)
2235 { 2512 {
@@ -2245,6 +2522,7 @@ namespace OpenSim.Region.Framework.Scenes
2245 } 2522 }
2246 } 2523 }
2247 2524
2525 part.ParentGroup.DeleteAvatar(UUID);
2248 Vector3 sitPartWorldPosition = part.GetWorldPosition(); 2526 Vector3 sitPartWorldPosition = part.GetWorldPosition();
2249 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 2527 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
2250 2528
@@ -2305,6 +2583,9 @@ namespace OpenSim.Region.Framework.Scenes
2305 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); 2583 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
2306 } 2584 }
2307 2585
2586 else if (PhysicsActor == null)
2587 AddToPhysicalScene(false);
2588
2308 Animator.TrySetMovementAnimation("STAND"); 2589 Animator.TrySetMovementAnimation("STAND");
2309 TriggerScenePresenceUpdated(); 2590 TriggerScenePresenceUpdated();
2310 } 2591 }
@@ -2353,11 +2634,8 @@ namespace OpenSim.Region.Framework.Scenes
2353 if (part == null) 2634 if (part == null)
2354 return; 2635 return;
2355 2636
2356 // TODO: determine position to sit at based on scene geometry; don't trust offset from client
2357 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
2358
2359 if (PhysicsActor != null) 2637 if (PhysicsActor != null)
2360 m_sitAvatarHeight = PhysicsActor.Size.Z; 2638 m_sitAvatarHeight = PhysicsActor.Size.Z * 0.5f;
2361 2639
2362 bool canSit = false; 2640 bool canSit = false;
2363 2641
@@ -2384,33 +2662,32 @@ namespace OpenSim.Region.Framework.Scenes
2384 } 2662 }
2385 else 2663 else
2386 { 2664 {
2665 if (PhysicsSit(part,offset)) // physics engine
2666 return;
2667
2387 Vector3 pos = part.AbsolutePosition + offset; 2668 Vector3 pos = part.AbsolutePosition + offset;
2388 2669
2389 if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10) 2670 if (Util.GetDistanceTo(AbsolutePosition, pos) <= 10)
2390 { 2671 {
2391// m_log.DebugFormat(
2392// "[SCENE PRESENCE]: Sitting {0} on {1} {2} because sit target is unset and within 10m",
2393// Name, part.Name, part.LocalId);
2394
2395 AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight); 2672 AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight);
2396 canSit = true; 2673 canSit = true;
2397 } 2674 }
2398// else
2399// {
2400// m_log.DebugFormat(
2401// "[SCENE PRESENCE]: Ignoring sit request of {0} on {1} {2} because sit target is unset and outside 10m",
2402// Name, part.Name, part.LocalId);
2403// }
2404 } 2675 }
2405 2676
2406 if (canSit) 2677 if (canSit)
2407 { 2678 {
2679
2408 if (PhysicsActor != null) 2680 if (PhysicsActor != null)
2409 { 2681 {
2410 // We can remove the physicsActor until they stand up. 2682 // We can remove the physicsActor until they stand up.
2411 RemoveFromPhysicalScene(); 2683 RemoveFromPhysicalScene();
2412 } 2684 }
2413 2685
2686 if (MovingToTarget)
2687 ResetMoveToTarget();
2688
2689 Velocity = Vector3.Zero;
2690
2414 part.AddSittingAvatar(UUID); 2691 part.AddSittingAvatar(UUID);
2415 2692
2416 cameraAtOffset = part.GetCameraAtOffset(); 2693 cameraAtOffset = part.GetCameraAtOffset();
@@ -2454,14 +2731,6 @@ namespace OpenSim.Region.Framework.Scenes
2454 m_requestedSitTargetID = part.LocalId; 2731 m_requestedSitTargetID = part.LocalId;
2455 m_requestedSitTargetUUID = part.UUID; 2732 m_requestedSitTargetUUID = part.UUID;
2456 2733
2457// m_log.DebugFormat("[SIT]: Client requested Sit Position: {0}", offset);
2458
2459 if (m_scene.PhysicsScene.SupportsRayCast())
2460 {
2461 //m_scene.PhysicsScene.RaycastWorld(Vector3.Zero,Vector3.Zero, 0.01f,new RaycastCallback());
2462 //SitRayCastAvatarPosition(part);
2463 //return;
2464 }
2465 } 2734 }
2466 else 2735 else
2467 { 2736 {
@@ -2471,197 +2740,115 @@ namespace OpenSim.Region.Framework.Scenes
2471 SendSitResponse(targetID, offset, Quaternion.Identity); 2740 SendSitResponse(targetID, offset, Quaternion.Identity);
2472 } 2741 }
2473 2742
2474 /* 2743 // returns false if does not suport so older sit can be tried
2475 public void SitRayCastAvatarPosition(SceneObjectPart part) 2744 public bool PhysicsSit(SceneObjectPart part, Vector3 offset)
2476 {
2477 Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
2478 Vector3 StartRayCastPosition = AbsolutePosition;
2479 Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
2480 float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
2481 m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastAvatarPositionResponse);
2482 }
2483
2484 public void SitRayCastAvatarPositionResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal)
2485 { 2745 {
2486 SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID); 2746// TODO: Pull in these bits
2487 if (part != null) 2747 return false;
2488 { 2748/*
2489 if (hitYN) 2749 if (part == null || part.ParentGroup.IsAttachment)
2490 {
2491 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
2492 {
2493 SitRaycastFindEdge(collisionPoint, normal);
2494 m_log.DebugFormat("[SIT]: Raycast Avatar Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
2495 }
2496 else
2497 {
2498 SitRayCastAvatarPositionCameraZ(part);
2499 }
2500 }
2501 else
2502 {
2503 SitRayCastAvatarPositionCameraZ(part);
2504 }
2505 }
2506 else
2507 { 2750 {
2508 ControllingClient.SendAlertMessage("Sit position no longer exists"); 2751 return true;
2509 m_requestedSitTargetUUID = UUID.Zero;
2510 m_requestedSitTargetID = 0;
2511 m_requestedSitOffset = Vector3.Zero;
2512 } 2752 }
2513 2753
2514 } 2754 if ( m_scene.PhysicsScene == null)
2515 2755 return false;
2516 public void SitRayCastAvatarPositionCameraZ(SceneObjectPart part)
2517 {
2518 // Next, try to raycast from the camera Z position
2519 Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
2520 Vector3 StartRayCastPosition = AbsolutePosition; StartRayCastPosition.Z = CameraPosition.Z;
2521 Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
2522 float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
2523 m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastAvatarPositionCameraZResponse);
2524 }
2525 2756
2526 public void SitRayCastAvatarPositionCameraZResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal) 2757 if (part.PhysActor == null)
2527 {
2528 SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
2529 if (part != null)
2530 { 2758 {
2531 if (hitYN) 2759 // none physcis shape
2532 { 2760 if (part.PhysicsShapeType == (byte)PhysicsShapeType.None)
2533 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f)) 2761 ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
2534 {
2535 SitRaycastFindEdge(collisionPoint, normal);
2536 m_log.DebugFormat("[SIT]: Raycast Avatar Position + CameraZ succeeded at point: {0}, normal:{1}", collisionPoint, normal);
2537 }
2538 else
2539 {
2540 SitRayCastCameraPosition(part);
2541 }
2542 }
2543 else 2762 else
2544 { 2763 { // non physical phantom TODO
2545 SitRayCastCameraPosition(part); 2764 ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
2765 return false;
2546 } 2766 }
2547 } 2767 return true;
2548 else
2549 {
2550 ControllingClient.SendAlertMessage("Sit position no longer exists");
2551 m_requestedSitTargetUUID = UUID.Zero;
2552 m_requestedSitTargetID = 0;
2553 m_requestedSitOffset = Vector3.Zero;
2554 } 2768 }
2555 2769
2556 }
2557 2770
2558 public void SitRayCastCameraPosition(SceneObjectPart part) 2771 // not doing autopilot
2559 { 2772 m_requestedSitTargetID = 0;
2560 // Next, try to raycast from the camera position
2561 Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
2562 Vector3 StartRayCastPosition = CameraPosition;
2563 Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
2564 float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
2565 m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastCameraPositionResponse);
2566 }
2567 2773
2568 public void SitRayCastCameraPositionResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal) 2774 if (m_scene.PhysicsScene.SitAvatar(part.PhysActor, AbsolutePosition, CameraPosition, offset, new Vector3(0.35f, 0, 0.65f), PhysicsSitResponse) != 0)
2569 { 2775 return true;
2570 SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID);
2571 if (part != null)
2572 {
2573 if (hitYN)
2574 {
2575 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
2576 {
2577 SitRaycastFindEdge(collisionPoint, normal);
2578 m_log.DebugFormat("[SIT]: Raycast Camera Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
2579 }
2580 else
2581 {
2582 SitRayHorizontal(part);
2583 }
2584 }
2585 else
2586 {
2587 SitRayHorizontal(part);
2588 }
2589 }
2590 else
2591 {
2592 ControllingClient.SendAlertMessage("Sit position no longer exists");
2593 m_requestedSitTargetUUID = UUID.Zero;
2594 m_requestedSitTargetID = 0;
2595 m_requestedSitOffset = Vector3.Zero;
2596 }
2597 2776
2777 return false;
2778*/
2598 } 2779 }
2599 2780
2600 public void SitRayHorizontal(SceneObjectPart part) 2781
2782 private bool CanEnterLandPosition(Vector3 testPos)
2601 { 2783 {
2602 // Next, try to raycast from the avatar position to fwd 2784 ILandObject land = m_scene.LandChannel.GetLandObject(testPos.X, testPos.Y);
2603 Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset; 2785
2604 Vector3 StartRayCastPosition = CameraPosition; 2786 if (land == null || land.LandData.Name == "NO_LAND")
2605 Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition); 2787 return true;
2606 float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition); 2788
2607 m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastHorizontalResponse); 2789 return land.CanBeOnThisLand(UUID,testPos.Z);
2608 } 2790 }
2609 2791
2610 public void SitRayCastHorizontalResponse(bool hitYN, Vector3 collisionPoint, uint localid, float pdistance, Vector3 normal) 2792 // status
2793 // < 0 ignore
2794 // 0 bad sit spot
2795 public void PhysicsSitResponse(int status, uint partID, Vector3 offset, Quaternion Orientation)
2611 { 2796 {
2612 SceneObjectPart part = FindNextAvailableSitTarget(m_requestedSitTargetUUID); 2797 if (status < 0)
2613 if (part != null) 2798 return;
2799
2800 if (status == 0)
2614 { 2801 {
2615 if (hitYN) 2802 ControllingClient.SendAlertMessage(" There is no suitable surface to sit on, try another spot.");
2616 { 2803 return;
2617 if (collisionPoint.ApproxEquals(m_requestedSitOffset + part.AbsolutePosition, 0.2f))
2618 {
2619 SitRaycastFindEdge(collisionPoint, normal);
2620 m_log.DebugFormat("[SIT]: Raycast Horizontal Position succeeded at point: {0}, normal:{1}", collisionPoint, normal);
2621 // Next, try to raycast from the camera position
2622 Vector3 EndRayCastPosition = part.AbsolutePosition + m_requestedSitOffset;
2623 Vector3 StartRayCastPosition = CameraPosition;
2624 Vector3 direction = Vector3.Normalize(EndRayCastPosition - StartRayCastPosition);
2625 float distance = Vector3.Distance(EndRayCastPosition, StartRayCastPosition);
2626 //m_scene.PhysicsScene.RaycastWorld(StartRayCastPosition, direction, distance, SitRayCastResponseAvatarPosition);
2627 }
2628 else
2629 {
2630 ControllingClient.SendAlertMessage("Sit position not accessable.");
2631 m_requestedSitTargetUUID = UUID.Zero;
2632 m_requestedSitTargetID = 0;
2633 m_requestedSitOffset = Vector3.Zero;
2634 }
2635 }
2636 else
2637 {
2638 ControllingClient.SendAlertMessage("Sit position not accessable.");
2639 m_requestedSitTargetUUID = UUID.Zero;
2640 m_requestedSitTargetID = 0;
2641 m_requestedSitOffset = Vector3.Zero;
2642 }
2643 } 2804 }
2644 else 2805
2806 SceneObjectPart part = m_scene.GetSceneObjectPart(partID);
2807 if (part == null)
2808 return;
2809
2810 Vector3 targetPos = part.GetWorldPosition() + offset * part.GetWorldRotation();
2811 if(!CanEnterLandPosition(targetPos))
2645 { 2812 {
2646 ControllingClient.SendAlertMessage("Sit position no longer exists"); 2813 ControllingClient.SendAlertMessage(" Sit position on restricted land, try another spot");
2647 m_requestedSitTargetUUID = UUID.Zero; 2814 return;
2648 m_requestedSitTargetID = 0;
2649 m_requestedSitOffset = Vector3.Zero;
2650 } 2815 }
2651 2816
2652 } 2817 RemoveFromPhysicalScene();
2653 2818
2654 private void SitRaycastFindEdge(Vector3 collisionPoint, Vector3 collisionNormal) 2819 if (MovingToTarget)
2655 { 2820 ResetMoveToTarget();
2656 int i = 0; 2821
2657 //throw new NotImplementedException(); 2822 Velocity = Vector3.Zero;
2658 //m_requestedSitTargetUUID = UUID.Zero; 2823
2659 //m_requestedSitTargetID = 0; 2824 part.AddSittingAvatar(UUID);
2660 //m_requestedSitOffset = Vector3.Zero; 2825
2826 Vector3 cameraAtOffset = part.GetCameraAtOffset();
2827 Vector3 cameraEyeOffset = part.GetCameraEyeOffset();
2828 bool forceMouselook = part.GetForceMouselook();
2829
2830 ControllingClient.SendSitResponse(
2831 part.UUID, offset, Orientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
2832
2833 // not using autopilot
2834
2835 Rotation = Orientation;
2836 m_pos = offset;
2837
2838 m_requestedSitTargetID = 0;
2839 part.ParentGroup.AddAvatar(UUID);
2840
2841 ParentPart = part;
2842 ParentID = part.LocalId;
2843 if(status == 3)
2844 Animator.TrySetMovementAnimation("SIT_GROUND");
2845 else
2846 Animator.TrySetMovementAnimation("SIT");
2847 SendAvatarDataToAllAgents();
2661 2848
2662 SendSitResponse(ControllingClient, m_requestedSitTargetUUID, collisionPoint - m_requestedSitOffset, Quaternion.Identity); 2849 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
2663 } 2850 }
2664 */ 2851
2665 2852
2666 public void HandleAgentSit(IClientAPI remoteClient, UUID agentID) 2853 public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
2667 { 2854 {
@@ -2681,6 +2868,7 @@ namespace OpenSim.Region.Framework.Scenes
2681 return; 2868 return;
2682 } 2869 }
2683 2870
2871
2684 if (part.SitTargetAvatar == UUID) 2872 if (part.SitTargetAvatar == UUID)
2685 { 2873 {
2686 Vector3 sitTargetPos = part.SitTargetPosition; 2874 Vector3 sitTargetPos = part.SitTargetPosition;
@@ -2695,7 +2883,28 @@ namespace OpenSim.Region.Framework.Scenes
2695 2883
2696 //Quaternion result = (sitTargetOrient * vq) * nq; 2884 //Quaternion result = (sitTargetOrient * vq) * nq;
2697 2885
2698 Vector3 newPos = sitTargetPos + SIT_TARGET_ADJUSTMENT; 2886 double x, y, z, m;
2887
2888 Quaternion r = sitTargetOrient;
2889 m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
2890
2891 if (Math.Abs(1.0 - m) > 0.000001)
2892 {
2893 m = 1.0 / Math.Sqrt(m);
2894 r.X *= (float)m;
2895 r.Y *= (float)m;
2896 r.Z *= (float)m;
2897 r.W *= (float)m;
2898 }
2899
2900 x = 2 * (r.X * r.Z + r.Y * r.W);
2901 y = 2 * (-r.X * r.W + r.Y * r.Z);
2902 z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
2903
2904 Vector3 up = new Vector3((float)x, (float)y, (float)z);
2905 Vector3 sitOffset = up * Appearance.AvatarHeight * 0.02638f;
2906
2907 Vector3 newPos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
2699 Quaternion newRot; 2908 Quaternion newRot;
2700 2909
2701 if (part.IsRoot) 2910 if (part.IsRoot)
@@ -2712,6 +2921,8 @@ namespace OpenSim.Region.Framework.Scenes
2712 2921
2713 m_pos = newPos; 2922 m_pos = newPos;
2714 Rotation = newRot; 2923 Rotation = newRot;
2924
2925// ParentPosition = part.AbsolutePosition;
2715 } 2926 }
2716 else 2927 else
2717 { 2928 {
@@ -2719,11 +2930,14 @@ namespace OpenSim.Region.Framework.Scenes
2719 // being sat upon. 2930 // being sat upon.
2720 m_pos -= part.GroupPosition; 2931 m_pos -= part.GroupPosition;
2721 2932
2933// ParentPosition = part.AbsolutePosition;
2934
2722// m_log.DebugFormat( 2935// m_log.DebugFormat(
2723// "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target", 2936// "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target",
2724// Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId); 2937// Name, part.AbsolutePosition, m_pos, ParentPosition, part.Name, part.LocalId);
2725 } 2938 }
2726 2939
2940 part.ParentGroup.AddAvatar(UUID);
2727 ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID); 2941 ParentPart = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
2728 ParentID = m_requestedSitTargetID; 2942 ParentID = m_requestedSitTargetID;
2729 m_AngularVelocity = Vector3.Zero; 2943 m_AngularVelocity = Vector3.Zero;
@@ -2834,8 +3048,8 @@ namespace OpenSim.Region.Framework.Scenes
2834 direc.Z *= 2.6f; 3048 direc.Z *= 2.6f;
2835 3049
2836 // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored. 3050 // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored.
2837 Animator.TrySetMovementAnimation("PREJUMP"); 3051// Animator.TrySetMovementAnimation("PREJUMP");
2838 Animator.TrySetMovementAnimation("JUMP"); 3052// Animator.TrySetMovementAnimation("JUMP");
2839 } 3053 }
2840 } 3054 }
2841 } 3055 }
@@ -2844,6 +3058,7 @@ namespace OpenSim.Region.Framework.Scenes
2844 3058
2845 // TODO: Add the force instead of only setting it to support multiple forces per frame? 3059 // TODO: Add the force instead of only setting it to support multiple forces per frame?
2846 m_forceToApply = direc; 3060 m_forceToApply = direc;
3061 Animator.UpdateMovementAnimations();
2847 } 3062 }
2848 3063
2849 #endregion 3064 #endregion
@@ -2861,16 +3076,12 @@ namespace OpenSim.Region.Framework.Scenes
2861 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to 3076 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to
2862 // grab the latest PhysicsActor velocity, whereas m_velocity is often 3077 // grab the latest PhysicsActor velocity, whereas m_velocity is often
2863 // storing a requested force instead of an actual traveling velocity 3078 // storing a requested force instead of an actual traveling velocity
3079 if (Appearance.AvatarSize != m_lastSize && !IsLoggingIn)
3080 SendAvatarDataToAllAgents();
2864 3081
2865 // Throw away duplicate or insignificant updates 3082 if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
2866 if ( 3083 !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
2867 // If the velocity has become zero, send it no matter what. 3084 !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE))
2868 (Velocity != m_lastVelocity && Velocity == Vector3.Zero)
2869 // otherwise, if things have changed reasonably, send the update
2870 || (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE)
2871 || !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE)
2872 || !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE)))
2873
2874 { 3085 {
2875 SendTerseUpdateToAllClients(); 3086 SendTerseUpdateToAllClients();
2876 3087
@@ -3031,8 +3242,8 @@ namespace OpenSim.Region.Framework.Scenes
3031 // appearance goes into the avatar update packet 3242 // appearance goes into the avatar update packet
3032 SendAvatarDataToAllAgents(); 3243 SendAvatarDataToAllAgents();
3033 3244
3034 // This invocation always shows up in the viewer logs as an error. 3245 // This invocation always shows up in the viewer logs as an error. Is it needed?
3035 // SendAppearanceToAgent(this); 3246 SendAppearanceToAgent(this);
3036 3247
3037 // If we are using the the cached appearance then send it out to everyone 3248 // If we are using the the cached appearance then send it out to everyone
3038 if (cachedappearance) 3249 if (cachedappearance)
@@ -3063,6 +3274,8 @@ namespace OpenSim.Region.Framework.Scenes
3063 return; 3274 return;
3064 } 3275 }
3065 3276
3277 m_lastSize = Appearance.AvatarSize;
3278
3066 int count = 0; 3279 int count = 0;
3067 m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence) 3280 m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
3068 { 3281 {
@@ -3170,6 +3383,8 @@ namespace OpenSim.Region.Framework.Scenes
3170 3383
3171 avatar.ControllingClient.SendAppearance( 3384 avatar.ControllingClient.SendAppearance(
3172 UUID, Appearance.VisualParams, Appearance.Texture.GetBytes()); 3385 UUID, Appearance.VisualParams, Appearance.Texture.GetBytes());
3386
3387
3173 } 3388 }
3174 3389
3175 #endregion 3390 #endregion
@@ -3243,8 +3458,9 @@ namespace OpenSim.Region.Framework.Scenes
3243 3458
3244 // If we don't have a PhysActor, we can't cross anyway 3459 // If we don't have a PhysActor, we can't cross anyway
3245 // Also don't do this while sat, sitting avatars cross with the 3460 // Also don't do this while sat, sitting avatars cross with the
3246 // object they sit on. 3461 // object they sit on. ParentUUID denoted a pending sit, don't
3247 if (ParentID != 0 || PhysicsActor == null) 3462 // interfere with it.
3463 if (ParentID != 0 || PhysicsActor == null || ParentUUID != UUID.Zero)
3248 return; 3464 return;
3249 3465
3250 if (!IsInTransit) 3466 if (!IsInTransit)
@@ -3588,6 +3804,9 @@ namespace OpenSim.Region.Framework.Scenes
3588 cAgent.AlwaysRun = SetAlwaysRun; 3804 cAgent.AlwaysRun = SetAlwaysRun;
3589 3805
3590 cAgent.Appearance = new AvatarAppearance(Appearance); 3806 cAgent.Appearance = new AvatarAppearance(Appearance);
3807
3808 cAgent.ParentPart = ParentUUID;
3809 cAgent.SitOffset = PrevSitOffset;
3591 3810
3592 lock (scriptedcontrols) 3811 lock (scriptedcontrols)
3593 { 3812 {
@@ -3596,7 +3815,7 @@ namespace OpenSim.Region.Framework.Scenes
3596 3815
3597 foreach (ScriptControllers c in scriptedcontrols.Values) 3816 foreach (ScriptControllers c in scriptedcontrols.Values)
3598 { 3817 {
3599 controls[i++] = new ControllerData(c.itemID, (uint)c.ignoreControls, (uint)c.eventControls); 3818 controls[i++] = new ControllerData(c.objectID, c.itemID, (uint)c.ignoreControls, (uint)c.eventControls);
3600 } 3819 }
3601 cAgent.Controllers = controls; 3820 cAgent.Controllers = controls;
3602 } 3821 }
@@ -3630,6 +3849,8 @@ namespace OpenSim.Region.Framework.Scenes
3630 CameraAtAxis = cAgent.AtAxis; 3849 CameraAtAxis = cAgent.AtAxis;
3631 CameraLeftAxis = cAgent.LeftAxis; 3850 CameraLeftAxis = cAgent.LeftAxis;
3632 CameraUpAxis = cAgent.UpAxis; 3851 CameraUpAxis = cAgent.UpAxis;
3852 ParentUUID = cAgent.ParentPart;
3853 PrevSitOffset = cAgent.SitOffset;
3633 3854
3634 // When we get to the point of re-computing neighbors everytime this 3855 // When we get to the point of re-computing neighbors everytime this
3635 // changes, then start using the agent's drawdistance rather than the 3856 // changes, then start using the agent's drawdistance rather than the
@@ -3667,6 +3888,7 @@ namespace OpenSim.Region.Framework.Scenes
3667 foreach (ControllerData c in cAgent.Controllers) 3888 foreach (ControllerData c in cAgent.Controllers)
3668 { 3889 {
3669 ScriptControllers sc = new ScriptControllers(); 3890 ScriptControllers sc = new ScriptControllers();
3891 sc.objectID = c.ObjectID;
3670 sc.itemID = c.ItemID; 3892 sc.itemID = c.ItemID;
3671 sc.ignoreControls = (ScriptControlled)c.IgnoreControls; 3893 sc.ignoreControls = (ScriptControlled)c.IgnoreControls;
3672 sc.eventControls = (ScriptControlled)c.EventControls; 3894 sc.eventControls = (ScriptControlled)c.EventControls;
@@ -3732,20 +3954,27 @@ namespace OpenSim.Region.Framework.Scenes
3732 } 3954 }
3733 3955
3734 if (Appearance.AvatarHeight == 0) 3956 if (Appearance.AvatarHeight == 0)
3735 Appearance.SetHeight(); 3957// Appearance.SetHeight();
3958 Appearance.SetSize(new Vector3(0.45f,0.6f,1.9f));
3736 3959
3737 PhysicsScene scene = m_scene.PhysicsScene; 3960 PhysicsScene scene = m_scene.PhysicsScene;
3738 3961
3739 Vector3 pVec = AbsolutePosition; 3962 Vector3 pVec = AbsolutePosition;
3740 3963
3964/*
3965 PhysicsActor = scene.AddAvatar(
3966 LocalId, Firstname + "." + Lastname, pVec,
3967 new Vector3(0.45f, 0.6f, Appearance.AvatarHeight), isFlying);
3968*/
3969
3741 PhysicsActor = scene.AddAvatar( 3970 PhysicsActor = scene.AddAvatar(
3742 LocalId, Firstname + "." + Lastname, pVec, 3971 LocalId, Firstname + "." + Lastname, pVec,
3743 new Vector3(0f, 0f, Appearance.AvatarHeight), isFlying); 3972 Appearance.AvatarBoxSize, isFlying);
3744 3973
3745 //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; 3974 //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
3746 PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; 3975 PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
3747 PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong 3976 PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
3748 PhysicsActor.SubscribeEvents(500); 3977 PhysicsActor.SubscribeEvents(100);
3749 PhysicsActor.LocalID = LocalId; 3978 PhysicsActor.LocalID = LocalId;
3750 } 3979 }
3751 3980
@@ -3759,6 +3988,7 @@ namespace OpenSim.Region.Framework.Scenes
3759 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true); 3988 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true);
3760 } 3989 }
3761 3990
3991
3762 /// <summary> 3992 /// <summary>
3763 /// Event called by the physics plugin to tell the avatar about a collision. 3993 /// Event called by the physics plugin to tell the avatar about a collision.
3764 /// </summary> 3994 /// </summary>
@@ -3772,7 +4002,7 @@ namespace OpenSim.Region.Framework.Scenes
3772 /// <param name="e"></param> 4002 /// <param name="e"></param>
3773 public void PhysicsCollisionUpdate(EventArgs e) 4003 public void PhysicsCollisionUpdate(EventArgs e)
3774 { 4004 {
3775 if (IsChildAgent) 4005 if (IsChildAgent || Animator == null)
3776 return; 4006 return;
3777 4007
3778 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) 4008 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
@@ -3789,7 +4019,6 @@ namespace OpenSim.Region.Framework.Scenes
3789 CollisionEventUpdate collisionData = (CollisionEventUpdate)e; 4019 CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
3790 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList; 4020 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
3791 4021
3792 CollisionPlane = Vector4.UnitW;
3793 4022
3794// // No collisions at all means we may be flying. Update always 4023// // No collisions at all means we may be flying. Update always
3795// // to make falling work 4024// // to make falling work
@@ -3799,34 +4028,7 @@ namespace OpenSim.Region.Framework.Scenes
3799// m_lastColCount = coldata.Count; 4028// m_lastColCount = coldata.Count;
3800// } 4029// }
3801 4030
3802 if (coldata.Count != 0) 4031 CollisionPlane = Vector4.UnitW;
3803 {
3804 switch (Animator.CurrentMovementAnimation)
3805 {
3806 case "STAND":
3807 case "WALK":
3808 case "RUN":
3809 case "CROUCH":
3810 case "CROUCHWALK":
3811 {
3812 ContactPoint lowest;
3813 lowest.SurfaceNormal = Vector3.Zero;
3814 lowest.Position = Vector3.Zero;
3815 lowest.Position.Z = Single.NaN;
3816
3817 foreach (ContactPoint contact in coldata.Values)
3818 {
3819 if (Single.IsNaN(lowest.Position.Z) || contact.Position.Z < lowest.Position.Z)
3820 {
3821 lowest = contact;
3822 }
3823 }
3824
3825 CollisionPlane = new Vector4(-lowest.SurfaceNormal, -Vector3.Dot(lowest.Position, lowest.SurfaceNormal));
3826 }
3827 break;
3828 }
3829 }
3830 4032
3831 // Gods do not take damage and Invulnerable is set depending on parcel/region flags 4033 // Gods do not take damage and Invulnerable is set depending on parcel/region flags
3832 if (Invulnerable || GodLevel > 0) 4034 if (Invulnerable || GodLevel > 0)
@@ -3925,6 +4127,12 @@ namespace OpenSim.Region.Framework.Scenes
3925 // m_reprioritizationTimer.Dispose(); 4127 // m_reprioritizationTimer.Dispose();
3926 4128
3927 RemoveFromPhysicalScene(); 4129 RemoveFromPhysicalScene();
4130
4131 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
4132
4133// if (Animator != null)
4134// Animator.Close();
4135 Animator = null;
3928 4136
3929 LifecycleState = ScenePresenceState.Removed; 4137 LifecycleState = ScenePresenceState.Removed;
3930 } 4138 }
@@ -4160,10 +4368,18 @@ namespace OpenSim.Region.Framework.Scenes
4160 4368
4161 public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, UUID Script_item_UUID) 4369 public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, UUID Script_item_UUID)
4162 { 4370 {
4371 SceneObjectPart p = m_scene.GetSceneObjectPart(Obj_localID);
4372 if (p == null)
4373 return;
4374
4375 ControllingClient.SendTakeControls(controls, false, false);
4376 ControllingClient.SendTakeControls(controls, true, false);
4377
4163 ScriptControllers obj = new ScriptControllers(); 4378 ScriptControllers obj = new ScriptControllers();
4164 obj.ignoreControls = ScriptControlled.CONTROL_ZERO; 4379 obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
4165 obj.eventControls = ScriptControlled.CONTROL_ZERO; 4380 obj.eventControls = ScriptControlled.CONTROL_ZERO;
4166 4381
4382 obj.objectID = p.ParentGroup.UUID;
4167 obj.itemID = Script_item_UUID; 4383 obj.itemID = Script_item_UUID;
4168 if (pass_on == 0 && accept == 0) 4384 if (pass_on == 0 && accept == 0)
4169 { 4385 {
@@ -4212,6 +4428,21 @@ namespace OpenSim.Region.Framework.Scenes
4212 ControllingClient.SendTakeControls(int.MaxValue, false, false); 4428 ControllingClient.SendTakeControls(int.MaxValue, false, false);
4213 } 4429 }
4214 4430
4431 private void UnRegisterSeatControls(UUID obj)
4432 {
4433 List<UUID> takers = new List<UUID>();
4434
4435 foreach (ScriptControllers c in scriptedcontrols.Values)
4436 {
4437 if (c.objectID == obj)
4438 takers.Add(c.itemID);
4439 }
4440 foreach (UUID t in takers)
4441 {
4442 UnRegisterControlEventsToScript(0, t);
4443 }
4444 }
4445
4215 public void UnRegisterControlEventsToScript(uint Obj_localID, UUID Script_item_UUID) 4446 public void UnRegisterControlEventsToScript(uint Obj_localID, UUID Script_item_UUID)
4216 { 4447 {
4217 ScriptControllers takecontrols; 4448 ScriptControllers takecontrols;
@@ -4541,6 +4772,12 @@ namespace OpenSim.Region.Framework.Scenes
4541 4772
4542 private void CheckAndAdjustLandingPoint(ref Vector3 pos) 4773 private void CheckAndAdjustLandingPoint(ref Vector3 pos)
4543 { 4774 {
4775 string reason;
4776
4777 // Honor bans
4778 if (!m_scene.TestLandRestrictions(UUID, out reason, ref pos.X, ref pos.Y))
4779 return;
4780
4544 SceneObjectGroup telehub = null; 4781 SceneObjectGroup telehub = null;
4545 if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject)) != null) 4782 if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject)) != null)
4546 { 4783 {
@@ -4580,11 +4817,119 @@ namespace OpenSim.Region.Framework.Scenes
4580 pos = land.LandData.UserLocation; 4817 pos = land.LandData.UserLocation;
4581 } 4818 }
4582 } 4819 }
4583 4820
4584 land.SendLandUpdateToClient(ControllingClient); 4821 land.SendLandUpdateToClient(ControllingClient);
4585 } 4822 }
4586 } 4823 }
4587 4824
4825 private DetectedObject CreateDetObject(SceneObjectPart obj)
4826 {
4827 DetectedObject detobj = new DetectedObject();
4828 detobj.keyUUID = obj.UUID;
4829 detobj.nameStr = obj.Name;
4830 detobj.ownerUUID = obj.OwnerID;
4831 detobj.posVector = obj.AbsolutePosition;
4832 detobj.rotQuat = obj.GetWorldRotation();
4833 detobj.velVector = obj.Velocity;
4834 detobj.colliderType = 0;
4835 detobj.groupUUID = obj.GroupID;
4836
4837 return detobj;
4838 }
4839
4840 private DetectedObject CreateDetObject(ScenePresence av)
4841 {
4842 DetectedObject detobj = new DetectedObject();
4843 detobj.keyUUID = av.UUID;
4844 detobj.nameStr = av.ControllingClient.Name;
4845 detobj.ownerUUID = av.UUID;
4846 detobj.posVector = av.AbsolutePosition;
4847 detobj.rotQuat = av.Rotation;
4848 detobj.velVector = av.Velocity;
4849 detobj.colliderType = 0;
4850 detobj.groupUUID = av.ControllingClient.ActiveGroupId;
4851
4852 return detobj;
4853 }
4854
4855 private DetectedObject CreateDetObjectForGround()
4856 {
4857 DetectedObject detobj = new DetectedObject();
4858 detobj.keyUUID = UUID.Zero;
4859 detobj.nameStr = "";
4860 detobj.ownerUUID = UUID.Zero;
4861 detobj.posVector = AbsolutePosition;
4862 detobj.rotQuat = Quaternion.Identity;
4863 detobj.velVector = Vector3.Zero;
4864 detobj.colliderType = 0;
4865 detobj.groupUUID = UUID.Zero;
4866
4867 return detobj;
4868 }
4869
4870 private ColliderArgs CreateColliderArgs(SceneObjectPart dest, List<uint> colliders)
4871 {
4872 ColliderArgs colliderArgs = new ColliderArgs();
4873 List<DetectedObject> colliding = new List<DetectedObject>();
4874 foreach (uint localId in colliders)
4875 {
4876 if (localId == 0)
4877 continue;
4878
4879 SceneObjectPart obj = m_scene.GetSceneObjectPart(localId);
4880 if (obj != null)
4881 {
4882 if (!dest.CollisionFilteredOut(obj.UUID, obj.Name))
4883 colliding.Add(CreateDetObject(obj));
4884 }
4885 else
4886 {
4887 ScenePresence av = m_scene.GetScenePresence(localId);
4888 if (av != null && (!av.IsChildAgent))
4889 {
4890 if (!dest.CollisionFilteredOut(av.UUID, av.Name))
4891 colliding.Add(CreateDetObject(av));
4892 }
4893 }
4894 }
4895
4896 colliderArgs.Colliders = colliding;
4897
4898 return colliderArgs;
4899 }
4900
4901 private delegate void ScriptCollidingNotification(uint localID, ColliderArgs message);
4902
4903 private void SendCollisionEvent(SceneObjectGroup dest, scriptEvents ev, List<uint> colliders, ScriptCollidingNotification notify)
4904 {
4905 ColliderArgs CollidingMessage;
4906
4907 if (colliders.Count > 0)
4908 {
4909 if ((dest.RootPart.ScriptEvents & ev) != 0)
4910 {
4911 CollidingMessage = CreateColliderArgs(dest.RootPart, colliders);
4912
4913 if (CollidingMessage.Colliders.Count > 0)
4914 notify(dest.RootPart.LocalId, CollidingMessage);
4915 }
4916 }
4917 }
4918
4919 private void SendLandCollisionEvent(SceneObjectGroup dest, scriptEvents ev, ScriptCollidingNotification notify)
4920 {
4921 if ((dest.RootPart.ScriptEvents & ev) != 0)
4922 {
4923 ColliderArgs LandCollidingMessage = new ColliderArgs();
4924 List<DetectedObject> colliding = new List<DetectedObject>();
4925
4926 colliding.Add(CreateDetObjectForGround());
4927 LandCollidingMessage.Colliders = colliding;
4928
4929 notify(dest.RootPart.LocalId, LandCollidingMessage);
4930 }
4931 }
4932
4588 private void TeleportFlagsDebug() { 4933 private void TeleportFlagsDebug() {
4589 4934
4590 // Some temporary debugging help to show all the TeleportFlags we have... 4935 // Some temporary debugging help to show all the TeleportFlags we have...
@@ -4609,6 +4954,5 @@ namespace OpenSim.Region.Framework.Scenes
4609 m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************"); 4954 m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
4610 4955
4611 } 4956 }
4612
4613 } 4957 }
4614} 4958}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
index acaeb90..0911f00 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -111,15 +111,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
111 111
112 SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart; 112 SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene).RootPart;
113 113
114 // We need to preserve this here because phys actor is removed by the sit.
115 Vector3 spPhysActorSize = m_sp.PhysicsActor.Size;
114 m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero); 116 m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero);
115 117
116 // FIXME: This is different for live avatars - z position is adjusted. This is half the height of the
117 // default avatar.
118 // Curiously, Vector3.ToString() will not display the last two places of the float. For example,
119 // printing out npc.AbsolutePosition will give <0, 0, 0.8454993> not <0, 0, 0.845499337>
120 Assert.That( 118 Assert.That(
121 m_sp.AbsolutePosition, 119 m_sp.AbsolutePosition,
122 Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.845499337f))); 120 Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, spPhysActorSize.Z / 2)));
123 121
124 m_sp.StandUp(); 122 m_sp.StandUp();
125 123
@@ -147,9 +145,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
147 145
148 Assert.That(part.SitTargetAvatar, Is.EqualTo(m_sp.UUID)); 146 Assert.That(part.SitTargetAvatar, Is.EqualTo(m_sp.UUID));
149 Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId)); 147 Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId));
150 Assert.That( 148// Assert.That(
151 m_sp.AbsolutePosition, 149// m_sp.AbsolutePosition,
152 Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT)); 150// Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT));
153 Assert.That(m_sp.PhysicsActor, Is.Null); 151 Assert.That(m_sp.PhysicsActor, Is.Null);
154 152
155 Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1)); 153 Assert.That(part.GetSittingAvatarsCount(), Is.EqualTo(1));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index dd27294..1e59e3f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -62,8 +62,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
62 = AssetHelpers.CreateAsset(corruptAssetUuid, AssetType.Notecard, "CORRUPT ASSET", UUID.Zero); 62 = AssetHelpers.CreateAsset(corruptAssetUuid, AssetType.Notecard, "CORRUPT ASSET", UUID.Zero);
63 m_assetService.Store(corruptAsset); 63 m_assetService.Store(corruptAsset);
64 64
65 IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>(); 65 IDictionary<UUID, sbyte> foundAssetUuids = new Dictionary<UUID, sbyte>();
66 m_uuidGatherer.GatherAssetUuids(corruptAssetUuid, AssetType.Object, foundAssetUuids); 66 m_uuidGatherer.GatherAssetUuids(corruptAssetUuid, (sbyte)AssetType.Object, foundAssetUuids);
67 67
68 // We count the uuid as gathered even if the asset itself is corrupt. 68 // We count the uuid as gathered even if the asset itself is corrupt.
69 Assert.That(foundAssetUuids.Count, Is.EqualTo(1)); 69 Assert.That(foundAssetUuids.Count, Is.EqualTo(1));
@@ -78,9 +78,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
78 TestHelpers.InMethod(); 78 TestHelpers.InMethod();
79 79
80 UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); 80 UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
81 IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>(); 81 IDictionary<UUID, sbyte> foundAssetUuids = new Dictionary<UUID, sbyte>();
82 82
83 m_uuidGatherer.GatherAssetUuids(missingAssetUuid, AssetType.Object, foundAssetUuids); 83 m_uuidGatherer.GatherAssetUuids(missingAssetUuid, (sbyte)AssetType.Object, foundAssetUuids);
84 84
85 // We count the uuid as gathered even if the asset itself is missing. 85 // We count the uuid as gathered even if the asset itself is missing.
86 Assert.That(foundAssetUuids.Count, Is.EqualTo(1)); 86 Assert.That(foundAssetUuids.Count, Is.EqualTo(1));
@@ -103,8 +103,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
103 AssetBase ncAsset = AssetHelpers.CreateNotecardAsset(ncAssetId, soAssetId.ToString()); 103 AssetBase ncAsset = AssetHelpers.CreateNotecardAsset(ncAssetId, soAssetId.ToString());
104 m_assetService.Store(ncAsset); 104 m_assetService.Store(ncAsset);
105 105
106 IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>(); 106 IDictionary<UUID, sbyte> foundAssetUuids = new Dictionary<UUID, sbyte>();
107 m_uuidGatherer.GatherAssetUuids(ncAssetId, AssetType.Notecard, foundAssetUuids); 107 m_uuidGatherer.GatherAssetUuids(ncAssetId, (sbyte)AssetType.Notecard, foundAssetUuids);
108 108
109 // We count the uuid as gathered even if the asset itself is corrupt. 109 // We count the uuid as gathered even if the asset itself is corrupt.
110 Assert.That(foundAssetUuids.Count, Is.EqualTo(2)); 110 Assert.That(foundAssetUuids.Count, Is.EqualTo(2));
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 3e074b9..75a51b5 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -38,6 +38,7 @@ using OpenMetaverse.StructuredData;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Framework.Scenes.Serialization; 39using OpenSim.Region.Framework.Scenes.Serialization;
40using OpenSim.Services.Interfaces; 40using OpenSim.Services.Interfaces;
41using OpenSimAssetType = OpenSim.Framework.SLUtil.OpenSimAssetType;
41 42
42namespace OpenSim.Region.Framework.Scenes 43namespace OpenSim.Region.Framework.Scenes
43{ 44{
@@ -83,7 +84,7 @@ namespace OpenSim.Region.Framework.Scenes
83 /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param> 84 /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param>
84 /// <param name="assetType">The type of the asset for the uuid given</param> 85 /// <param name="assetType">The type of the asset for the uuid given</param>
85 /// <param name="assetUuids">The assets gathered</param> 86 /// <param name="assetUuids">The assets gathered</param>
86 public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids) 87 public void GatherAssetUuids(UUID assetUuid, sbyte assetType, IDictionary<UUID, sbyte> assetUuids)
87 { 88 {
88 // avoid infinite loops 89 // avoid infinite loops
89 if (assetUuids.ContainsKey(assetUuid)) 90 if (assetUuids.ContainsKey(assetUuid))
@@ -93,23 +94,27 @@ namespace OpenSim.Region.Framework.Scenes
93 { 94 {
94 assetUuids[assetUuid] = assetType; 95 assetUuids[assetUuid] = assetType;
95 96
96 if (AssetType.Bodypart == assetType || AssetType.Clothing == assetType) 97 if ((sbyte)AssetType.Bodypart == assetType || (sbyte)AssetType.Clothing == assetType)
97 { 98 {
98 GetWearableAssetUuids(assetUuid, assetUuids); 99 GetWearableAssetUuids(assetUuid, assetUuids);
99 } 100 }
100 else if (AssetType.Gesture == assetType) 101 else if ((sbyte)AssetType.Gesture == assetType)
101 { 102 {
102 GetGestureAssetUuids(assetUuid, assetUuids); 103 GetGestureAssetUuids(assetUuid, assetUuids);
103 } 104 }
104 else if (AssetType.Notecard == assetType) 105 else if ((sbyte)AssetType.Notecard == assetType)
105 { 106 {
106 GetTextEmbeddedAssetUuids(assetUuid, assetUuids); 107 GetTextEmbeddedAssetUuids(assetUuid, assetUuids);
107 } 108 }
108 else if (AssetType.LSLText == assetType) 109 else if ((sbyte)AssetType.LSLText == assetType)
109 { 110 {
110 GetTextEmbeddedAssetUuids(assetUuid, assetUuids); 111 GetTextEmbeddedAssetUuids(assetUuid, assetUuids);
111 } 112 }
112 else if (AssetType.Object == assetType) 113 else if ((sbyte)OpenSimAssetType.Material == assetType)
114 {
115 GetMaterialAssetUuids(assetUuid, assetUuids);
116 }
117 else if ((sbyte)AssetType.Object == assetType)
113 { 118 {
114 GetSceneObjectAssetUuids(assetUuid, assetUuids); 119 GetSceneObjectAssetUuids(assetUuid, assetUuids);
115 } 120 }
@@ -136,7 +141,7 @@ namespace OpenSim.Region.Framework.Scenes
136 /// A dictionary which is populated with the asset UUIDs gathered and the type of that asset. 141 /// A dictionary which is populated with the asset UUIDs gathered and the type of that asset.
137 /// For assets where the type is not clear (e.g. UUIDs extracted from LSL and notecards), the type is Unknown. 142 /// For assets where the type is not clear (e.g. UUIDs extracted from LSL and notecards), the type is Unknown.
138 /// </param> 143 /// </param>
139 public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary<UUID, AssetType> assetUuids) 144 public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary<UUID, sbyte> assetUuids)
140 { 145 {
141// m_log.DebugFormat( 146// m_log.DebugFormat(
142// "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID); 147// "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
@@ -156,7 +161,7 @@ namespace OpenSim.Region.Framework.Scenes
156 { 161 {
157 // Get the prim's default texture. This will be used for faces which don't have their own texture 162 // Get the prim's default texture. This will be used for faces which don't have their own texture
158 if (textureEntry.DefaultTexture != null) 163 if (textureEntry.DefaultTexture != null)
159 assetUuids[textureEntry.DefaultTexture.TextureID] = AssetType.Texture; 164 assetUuids[textureEntry.DefaultTexture.TextureID] = (sbyte)AssetType.Texture;
160 165
161 if (textureEntry.FaceTextures != null) 166 if (textureEntry.FaceTextures != null)
162 { 167 {
@@ -164,20 +169,20 @@ namespace OpenSim.Region.Framework.Scenes
164 foreach (Primitive.TextureEntryFace texture in textureEntry.FaceTextures) 169 foreach (Primitive.TextureEntryFace texture in textureEntry.FaceTextures)
165 { 170 {
166 if (texture != null) 171 if (texture != null)
167 assetUuids[texture.TextureID] = AssetType.Texture; 172 assetUuids[texture.TextureID] = (sbyte)AssetType.Texture;
168 } 173 }
169 } 174 }
170 } 175 }
171 176
172 // If the prim is a sculpt then preserve this information too 177 // If the prim is a sculpt then preserve this information too
173 if (part.Shape.SculptTexture != UUID.Zero) 178 if (part.Shape.SculptTexture != UUID.Zero)
174 assetUuids[part.Shape.SculptTexture] = AssetType.Texture; 179 assetUuids[part.Shape.SculptTexture] = (sbyte)AssetType.Texture;
175 180
176 if (part.Shape.ProjectionTextureUUID != UUID.Zero) 181 if (part.Shape.ProjectionTextureUUID != UUID.Zero)
177 assetUuids[part.Shape.ProjectionTextureUUID] = AssetType.Texture; 182 assetUuids[part.Shape.ProjectionTextureUUID] = (sbyte)AssetType.Texture;
178 183
179 if (part.CollisionSound != UUID.Zero) 184 if (part.CollisionSound != UUID.Zero)
180 assetUuids[part.CollisionSound] = AssetType.Sound; 185 assetUuids[part.CollisionSound] = (sbyte)AssetType.Sound;
181 186
182 if (part.ParticleSystem.Length > 0) 187 if (part.ParticleSystem.Length > 0)
183 { 188 {
@@ -185,7 +190,7 @@ namespace OpenSim.Region.Framework.Scenes
185 { 190 {
186 Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0); 191 Primitive.ParticleSystem ps = new Primitive.ParticleSystem(part.ParticleSystem, 0);
187 if (ps.Texture != UUID.Zero) 192 if (ps.Texture != UUID.Zero)
188 assetUuids[ps.Texture] = AssetType.Texture; 193 assetUuids[ps.Texture] = (sbyte)AssetType.Texture;
189 } 194 }
190 catch (Exception e) 195 catch (Exception e)
191 { 196 {
@@ -205,7 +210,7 @@ namespace OpenSim.Region.Framework.Scenes
205// tii.Name, tii.Type, part.Name, part.UUID); 210// tii.Name, tii.Type, part.Name, part.UUID);
206 211
207 if (!assetUuids.ContainsKey(tii.AssetID)) 212 if (!assetUuids.ContainsKey(tii.AssetID))
208 GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids); 213 GatherAssetUuids(tii.AssetID, (sbyte)tii.Type, assetUuids);
209 } 214 }
210 215
211 // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed 216 // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed
@@ -214,7 +219,9 @@ namespace OpenSim.Region.Framework.Scenes
214 // Scene.EventManager is present. 219 // Scene.EventManager is present.
215// part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids); 220// part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
216 221
217 GatherMaterialsUuids(part, assetUuids); 222
223 // still needed to retrieve textures used as materials for any parts containing legacy materials stored in DynAttrs
224 GatherMaterialsUuids(part, assetUuids);
218 } 225 }
219 catch (Exception e) 226 catch (Exception e)
220 { 227 {
@@ -225,7 +232,7 @@ namespace OpenSim.Region.Framework.Scenes
225 } 232 }
226 } 233 }
227 } 234 }
228 235
229// /// <summary> 236// /// <summary>
230// /// The callback made when we request the asset for an object from the asset service. 237// /// The callback made when we request the asset for an object from the asset service.
231// /// </summary> 238// /// </summary>
@@ -241,10 +248,12 @@ namespace OpenSim.Region.Framework.Scenes
241 248
242 /// <summary> 249 /// <summary>
243 /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps 250 /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
251 /// stored in legacy format in part.DynAttrs
244 /// </summary> 252 /// </summary>
245 /// <param name="part"></param> 253 /// <param name="part"></param>
246 /// <param name="assetUuids"></param> 254 /// <param name="assetUuids"></param>
247 public void GatherMaterialsUuids(SceneObjectPart part, IDictionary<UUID, AssetType> assetUuids) 255 //public void GatherMaterialsUuids(SceneObjectPart part, IDictionary<UUID, AssetType> assetUuids)
256 public void GatherMaterialsUuids(SceneObjectPart part, IDictionary<UUID, sbyte> assetUuids)
248 { 257 {
249 // scan thru the dynAttrs map of this part for any textures used as materials 258 // scan thru the dynAttrs map of this part for any textures used as materials
250 OSD osdMaterials = null; 259 OSD osdMaterials = null;
@@ -280,7 +289,7 @@ namespace OpenSim.Region.Framework.Scenes
280 UUID normalMapId = mat["NormMap"].AsUUID(); 289 UUID normalMapId = mat["NormMap"].AsUUID();
281 if (normalMapId != UUID.Zero) 290 if (normalMapId != UUID.Zero)
282 { 291 {
283 assetUuids[normalMapId] = AssetType.Texture; 292 assetUuids[normalMapId] = (sbyte)AssetType.Texture;
284 //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString()); 293 //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
285 } 294 }
286 } 295 }
@@ -289,7 +298,7 @@ namespace OpenSim.Region.Framework.Scenes
289 UUID specularMapId = mat["SpecMap"].AsUUID(); 298 UUID specularMapId = mat["SpecMap"].AsUUID();
290 if (specularMapId != UUID.Zero) 299 if (specularMapId != UUID.Zero)
291 { 300 {
292 assetUuids[specularMapId] = AssetType.Texture; 301 assetUuids[specularMapId] = (sbyte)AssetType.Texture;
293 //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString()); 302 //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
294 } 303 }
295 } 304 }
@@ -344,7 +353,7 @@ namespace OpenSim.Region.Framework.Scenes
344 /// </summary> 353 /// </summary>
345 /// <param name="scriptUuid"></param> 354 /// <param name="scriptUuid"></param>
346 /// <param name="assetUuids">Dictionary in which to record the references</param> 355 /// <param name="assetUuids">Dictionary in which to record the references</param>
347 private void GetTextEmbeddedAssetUuids(UUID embeddingAssetId, IDictionary<UUID, AssetType> assetUuids) 356 private void GetTextEmbeddedAssetUuids(UUID embeddingAssetId, IDictionary<UUID, sbyte> assetUuids)
348 { 357 {
349// m_log.DebugFormat("[ASSET GATHERER]: Getting assets for uuid references in asset {0}", embeddingAssetId); 358// m_log.DebugFormat("[ASSET GATHERER]: Getting assets for uuid references in asset {0}", embeddingAssetId);
350 359
@@ -364,7 +373,7 @@ namespace OpenSim.Region.Framework.Scenes
364 373
365 // Embedded asset references (if not false positives) could be for many types of asset, so we will 374 // Embedded asset references (if not false positives) could be for many types of asset, so we will
366 // label these as unknown. 375 // label these as unknown.
367 assetUuids[uuid] = AssetType.Unknown; 376 assetUuids[uuid] = (sbyte)AssetType.Unknown;
368 } 377 }
369 } 378 }
370 } 379 }
@@ -374,7 +383,7 @@ namespace OpenSim.Region.Framework.Scenes
374 /// </summary> 383 /// </summary>
375 /// <param name="wearableAssetUuid"></param> 384 /// <param name="wearableAssetUuid"></param>
376 /// <param name="assetUuids">Dictionary in which to record the references</param> 385 /// <param name="assetUuids">Dictionary in which to record the references</param>
377 private void GetWearableAssetUuids(UUID wearableAssetUuid, IDictionary<UUID, AssetType> assetUuids) 386 private void GetWearableAssetUuids(UUID wearableAssetUuid, IDictionary<UUID, sbyte> assetUuids)
378 { 387 {
379 AssetBase assetBase = GetAsset(wearableAssetUuid); 388 AssetBase assetBase = GetAsset(wearableAssetUuid);
380 389
@@ -389,7 +398,7 @@ namespace OpenSim.Region.Framework.Scenes
389 398
390 foreach (UUID uuid in wearableAsset.Textures.Values) 399 foreach (UUID uuid in wearableAsset.Textures.Values)
391 { 400 {
392 assetUuids[uuid] = AssetType.Texture; 401 assetUuids[uuid] = (sbyte)AssetType.Texture;
393 } 402 }
394 } 403 }
395 } 404 }
@@ -401,7 +410,7 @@ namespace OpenSim.Region.Framework.Scenes
401 /// </summary> 410 /// </summary>
402 /// <param name="sceneObject"></param> 411 /// <param name="sceneObject"></param>
403 /// <param name="assetUuids"></param> 412 /// <param name="assetUuids"></param>
404 private void GetSceneObjectAssetUuids(UUID sceneObjectUuid, IDictionary<UUID, AssetType> assetUuids) 413 private void GetSceneObjectAssetUuids(UUID sceneObjectUuid, IDictionary<UUID, sbyte> assetUuids)
405 { 414 {
406 AssetBase objectAsset = GetAsset(sceneObjectUuid); 415 AssetBase objectAsset = GetAsset(sceneObjectUuid);
407 416
@@ -430,7 +439,7 @@ namespace OpenSim.Region.Framework.Scenes
430 /// </summary> 439 /// </summary>
431 /// <param name="gestureUuid"></param> 440 /// <param name="gestureUuid"></param>
432 /// <param name="assetUuids"></param> 441 /// <param name="assetUuids"></param>
433 private void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, AssetType> assetUuids) 442 private void GetGestureAssetUuids(UUID gestureUuid, IDictionary<UUID, sbyte> assetUuids)
434 { 443 {
435 AssetBase assetBase = GetAsset(gestureUuid); 444 AssetBase assetBase = GetAsset(gestureUuid);
436 if (null == assetBase) 445 if (null == assetBase)
@@ -464,9 +473,29 @@ namespace OpenSim.Region.Framework.Scenes
464 // If it can be parsed as a UUID, it is an asset ID 473 // If it can be parsed as a UUID, it is an asset ID
465 UUID uuid; 474 UUID uuid;
466 if (UUID.TryParse(id, out uuid)) 475 if (UUID.TryParse(id, out uuid))
467 assetUuids[uuid] = AssetType.Animation; 476 assetUuids[uuid] = (sbyte)AssetType.Animation;
468 } 477 }
469 } 478 }
479
480 /// <summary>
481 /// Get the asset uuid's referenced in a material.
482 /// </summary>
483 private void GetMaterialAssetUuids(UUID materialUuid, IDictionary<UUID, sbyte> assetUuids)
484 {
485 AssetBase assetBase = GetAsset(materialUuid);
486 if (null == assetBase)
487 return;
488
489 OSDMap mat = (OSDMap)OSDParser.DeserializeLLSDXml(assetBase.Data);
490
491 UUID normMap = mat["NormMap"].AsUUID();
492 if (normMap != UUID.Zero)
493 assetUuids[normMap] = (sbyte)AssetType.Texture;
494
495 UUID specMap = mat["SpecMap"].AsUUID();
496 if (specMap != UUID.Zero)
497 assetUuids[specMap] = (sbyte)AssetType.Texture;
498 }
470 } 499 }
471 500
472 public class HGUuidGatherer : UuidGatherer 501 public class HGUuidGatherer : UuidGatherer
generated by cgit v1.1 at 2024-12-26 17:54:49 +0000