aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs10
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityInventory.cs3
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs32
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEstateModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEventQueue.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IInterregionComms.cs8
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionConsole.cs4
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRestartModule.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs1
-rw-r--r--OpenSim/Region/Framework/Interfaces/ISnmpModule.cs27
-rw-r--r--OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs13
-rw-r--r--OpenSim/Region/Framework/Interfaces/IWorldComm.cs2
-rw-r--r--OpenSim/Region/Framework/ModuleLoader.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs20
-rw-r--r--OpenSim/Region/Framework/Scenes/CollisionSounds.cs304
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs25
-rw-r--r--OpenSim/Region/Framework/Scenes/KeyframeMotion.cs422
-rw-r--r--OpenSim/Region/Framework/Scenes/Prioritizer.cs16
-rw-r--r--OpenSim/Region/Framework/Scenes/SOPMaterial.cs95
-rw-r--r--OpenSim/Region/Framework/Scenes/SOPVehicle.cs791
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs321
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs95
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs810
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs32
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs477
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs267
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs17
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs1348
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs1701
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs782
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs590
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs135
-rw-r--r--OpenSim/Region/Framework/Scenes/SimStatsReporter.cs93
-rw-r--r--OpenSim/Region/Framework/Scenes/UndoState.cs367
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs4
37 files changed, 6843 insertions, 1982 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 8155eab..90a13a7 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Xml;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using OpenMetaverse; 31using OpenMetaverse;
31using OpenSim.Framework; 32using OpenSim.Framework;
@@ -83,7 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces
83 /// <param name="AttachmentPt"></param> 84 /// <param name="AttachmentPt"></param>
84 /// <param name="silent"></param> 85 /// <param name="silent"></param>
85 /// <returns>true if the object was successfully attached, false otherwise</returns> 86 /// <returns>true if the object was successfully attached, false otherwise</returns>
86 bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool temp); 87 bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo, bool temp);
87 88
88 /// <summary> 89 /// <summary>
89 /// Rez an attachment from user inventory and change inventory status to match. 90 /// Rez an attachment from user inventory and change inventory status to match.
@@ -92,7 +93,11 @@ namespace OpenSim.Region.Framework.Interfaces
92 /// <param name="itemID"></param> 93 /// <param name="itemID"></param>
93 /// <param name="AttachmentPt"></param> 94 /// <param name="AttachmentPt"></param>
94 /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> 95 /// <returns>The scene object that was attached. Null if the scene object could not be found</returns>
95 SceneObjectGroup RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt); 96 ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt);
97
98 // Same as above, but also load script states from a separate doc
99 ISceneEntity RezSingleAttachmentFromInventory(
100 IScenePresence presence, UUID itemID, uint AttachmentPt, XmlDocument doc);
96 101
97 /// <summary> 102 /// <summary>
98 /// Rez multiple attachments from a user's inventory 103 /// Rez multiple attachments from a user's inventory
@@ -115,7 +120,6 @@ namespace OpenSim.Region.Framework.Interfaces
115 /// <param name="grp">The attachment to detach.</param> 120 /// <param name="grp">The attachment to detach.</param>
116 void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup grp); 121 void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup grp);
117 122
118 /// <summary>
119 /// Update the position of an attachment. 123 /// Update the position of an attachment.
120 /// </summary> 124 /// </summary>
121 /// <param name="sog"></param> 125 /// <param name="sog"></param>
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 8d62847..4274cbe 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -133,6 +133,8 @@ namespace OpenSim.Region.Framework.Interfaces
133 /// </returns> 133 /// </returns>
134 bool CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource); 134 bool CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource);
135 135
136 ArrayList CreateScriptInstanceEr(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource);
137
136 /// <summary> 138 /// <summary>
137 /// Stop and remove a script which is in this prim's inventory from the scene. 139 /// Stop and remove a script which is in this prim's inventory from the scene.
138 /// </summary> 140 /// </summary>
@@ -295,5 +297,6 @@ namespace OpenSim.Region.Framework.Interfaces
295 /// A <see cref="Dictionary`2"/> 297 /// A <see cref="Dictionary`2"/>
296 /// </returns> 298 /// </returns>
297 Dictionary<UUID, string> GetScriptStates(); 299 Dictionary<UUID, string> GetScriptStates();
300 Dictionary<UUID, string> GetScriptStates(bool oldIDs);
298 } 301 }
299} 302}
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 69be83e..5bc8e51 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, uint neighbourx, uint neighboury, GridRegion neighbourRegion, bool isFlying, string version);
39
38 public interface IEntityTransferModule 40 public interface IEntityTransferModule
39 { 41 {
40 /// <summary> 42 /// <summary>
@@ -50,29 +52,10 @@ namespace OpenSim.Region.Framework.Interfaces
50 /// <param name='teleportFlags'></param> 52 /// <param name='teleportFlags'></param>
51 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags); 53 void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags);
52 54
53 /// <summary> 55 bool TeleportHome(UUID id, IClientAPI client);
54 /// Teleport an agent directly to a given region without checking whether the region should be subsituted.
55 /// </summary>
56 /// <remarks>
57 /// Please use Teleport() instead unless you know exactly what you're doing.
58 /// Do not use for same region teleports.
59 /// </remarks>
60 /// <param name='sp'></param>
61 /// <param name='reg'></param>
62 /// <param name='finalDestination'>/param>
63 /// <param name='position'></param>
64 /// <param name='lookAt'></param>
65 /// <param name='teleportFlags'></param>
66 void DoTeleport(
67 ScenePresence sp, GridRegion reg, GridRegion finalDestination,
68 Vector3 position, Vector3 lookAt, uint teleportFlags);
69 56
70 /// <summary> 57 void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination,
71 /// Teleports the agent for the given client to their home destination. 58 Vector3 position, Vector3 lookAt, uint teleportFlags);
72 /// </summary>
73 /// <param name='id'></param>
74 /// <param name='client'></param>
75 void TeleportHome(UUID id, IClientAPI client);
76 59
77 /// <summary> 60 /// <summary>
78 /// Show whether the given agent is being teleported. 61 /// Show whether the given agent is being teleported.
@@ -89,7 +72,12 @@ namespace OpenSim.Region.Framework.Interfaces
89 72
90 void EnableChildAgent(ScenePresence agent, GridRegion region); 73 void EnableChildAgent(ScenePresence agent, GridRegion region);
91 74
75 GridRegion GetDestination(Scene scene, UUID agentID, Vector3 pos, out uint xDest, out uint yDest, out string version, out Vector3 newpos);
76
92 void Cross(SceneObjectGroup sog, Vector3 position, bool silent); 77 void Cross(SceneObjectGroup sog, Vector3 position, bool silent);
78
79 ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, GridRegion neighbourRegion, bool isFlying, string version);
80
93 } 81 }
94 82
95 public interface IUserAgentVerificationModule 83 public interface IUserAgentVerificationModule
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 15cd238..ca2ad94 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -45,6 +45,8 @@ namespace OpenSim.Region.Framework.Interfaces
45 /// Tell all clients about the current state of the region (terrain textures, water height, etc.). 45 /// Tell all clients about the current state of the region (terrain textures, water height, etc.).
46 /// </summary> 46 /// </summary>
47 void sendRegionHandshakeToAll(); 47 void sendRegionHandshakeToAll();
48 void TriggerEstateInfoChange();
49 void TriggerRegionInfoChange();
48 50
49 void setEstateTerrainBaseTexture(int level, UUID texture); 51 void setEstateTerrainBaseTexture(int level, UUID texture);
50 void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue); 52 void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue);
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index bfa5d17..5512642 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -59,5 +59,7 @@ namespace OpenSim.Region.Framework.Interfaces
59 void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); 59 void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID);
60 OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono); 60 OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono);
61 OSD BuildEvent(string eventName, OSD eventBody); 61 OSD BuildEvent(string eventName, OSD eventBody);
62 void partPhysicsProperties(uint localID, byte physhapetype, float density, float friction, float bounce, float gravmod, UUID avatarID);
63
62 } 64 }
63} 65}
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
index 2d6287f..67a500f 100644
--- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
@@ -68,6 +68,14 @@ namespace OpenSim.Region.Framework.Interfaces
68 bool SendReleaseAgent(ulong regionHandle, UUID id, string uri); 68 bool SendReleaseAgent(ulong regionHandle, UUID id, string uri);
69 69
70 /// <summary> 70 /// <summary>
71 /// Close chid agent.
72 /// </summary>
73 /// <param name="regionHandle"></param>
74 /// <param name="id"></param>
75 /// <returns></returns>
76 bool SendCloseChildAgent(ulong regionHandle, UUID id);
77
78 /// <summary>
71 /// Close agent. 79 /// Close agent.
72 /// </summary> 80 /// </summary>
73 /// <param name="regionHandle"></param> 81 /// <param name="regionHandle"></param>
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs b/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs
index 4d261d6..5d5ce34 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionConsole.cs
@@ -30,8 +30,12 @@ using OpenSim.Framework;
30 30
31namespace OpenSim.Region.Framework.Interfaces 31namespace OpenSim.Region.Framework.Interfaces
32{ 32{
33 public delegate void ConsoleMessage(UUID toAgentID, string message);
34
33 public interface IRegionConsole 35 public interface IRegionConsole
34 { 36 {
37 event ConsoleMessage OnConsoleMessage;
38
35 bool RunCommand(string command, UUID invokerID); 39 bool RunCommand(string command, UUID invokerID);
36 void SendConsoleOutput(UUID agentID, string message); 40 void SendConsoleOutput(UUID agentID, string message);
37 void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn); 41 void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn);
diff --git a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
index c68550f..9b25beb 100644
--- a/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRestartModule.cs
@@ -35,5 +35,6 @@ namespace OpenSim.Region.Framework.Interfaces
35 TimeSpan TimeUntilRestart { get; } 35 TimeSpan TimeUntilRestart { get; }
36 void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice); 36 void ScheduleRestart(UUID initiator, string message, int[] alerts, bool notice);
37 void AbortRestart(string message); 37 void AbortRestart(string message);
38 void DelayRestart(int seconds, string message);
38 } 39 }
39} 40}
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
index 085b5ca..3e97a7a 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
@@ -116,6 +116,8 @@ namespace OpenSim.Region.Framework.Interfaces
116 /// <param name="regionUUID">the region UUID</param> 116 /// <param name="regionUUID">the region UUID</param>
117 void RemoveRegionEnvironmentSettings(UUID regionUUID); 117 void RemoveRegionEnvironmentSettings(UUID regionUUID);
118 118
119 UUID[] GetObjectIDs(UUID regionID);
120
119 void SaveExtra(UUID regionID, string name, string value); 121 void SaveExtra(UUID regionID, string name, string value);
120 122
121 void RemoveExtra(UUID regionID, string name); 123 void RemoveExtra(UUID regionID, string name);
diff --git a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
index 3787ca0..17bd48b 100644
--- a/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISimulationDataStore.cs
@@ -106,6 +106,7 @@ namespace OpenSim.Region.Framework.Interfaces
106 RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID); 106 RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID);
107 void StoreRegionWindlightSettings(RegionLightShareData wl); 107 void StoreRegionWindlightSettings(RegionLightShareData wl);
108 void RemoveRegionWindlightSettings(UUID regionID); 108 void RemoveRegionWindlightSettings(UUID regionID);
109 UUID[] GetObjectIDs(UUID regionID);
109 110
110 /// <summary> 111 /// <summary>
111 /// Load Environment settings from region storage 112 /// Load Environment settings from region storage
diff --git a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
new file mode 100644
index 0000000..e01f649
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
@@ -0,0 +1,27 @@
1///////////////////////////////////////////////////////////////////
2//
3// (c) Careminster LImited, Melanie Thielker and the Meta7 Team
4//
5// This file is not open source. All rights reserved
6// Mod 2
7
8using OpenSim.Region.Framework.Scenes;
9
10public interface ISnmpModule
11{
12 void Trap(int code, string Message, Scene scene);
13 void Critical(string Message, Scene scene);
14 void Warning(string Message, Scene scene);
15 void Major(string Message, Scene scene);
16 void ColdStart(int step , Scene scene);
17 void Shutdown(int step , Scene scene);
18 //
19 // Node Start/stop events
20 //
21 void LinkUp(Scene scene);
22 void LinkDown(Scene scene);
23 void BootInfo(string data, Scene scene);
24 void trapDebug(string Module,string data, Scene scene);
25 void trapXMRE(int data, string Message, Scene scene);
26
27}
diff --git a/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs b/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs
new file mode 100644
index 0000000..d1a4d8e
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IUserAccountCacheModule.cs
@@ -0,0 +1,13 @@
1///////////////////////////////////////////////////////////////////
2//
3// (c) Careminster Limited, Melanie Thielker and the Meta7 Team
4//
5// This file is not open source. All rights reserved
6//
7
8using OpenSim.Region.Framework.Scenes;
9
10public interface IUserAccountCacheModule
11{
12 void Remove(string name);
13}
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index 4e74781..e8e375e 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -103,7 +103,7 @@ namespace OpenSim.Region.Framework.Interfaces
103 /// <param name='msg'> 103 /// <param name='msg'>
104 /// Message. 104 /// Message.
105 /// </param> 105 /// </param>
106 void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg); 106 bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error);
107 107
108 /// <summary> 108 /// <summary>
109 /// Are there any listen events ready to be dispatched? 109 /// Are there any listen events ready to be dispatched?
diff --git a/OpenSim/Region/Framework/ModuleLoader.cs b/OpenSim/Region/Framework/ModuleLoader.cs
index 14ecd44..32ee674 100644
--- a/OpenSim/Region/Framework/ModuleLoader.cs
+++ b/OpenSim/Region/Framework/ModuleLoader.cs
@@ -227,7 +227,8 @@ namespace OpenSim.Region.Framework
227 pluginAssembly.FullName, e.Message, e.StackTrace); 227 pluginAssembly.FullName, e.Message, e.StackTrace);
228 228
229 // justincc: Right now this is fatal to really get the user's attention 229 // justincc: Right now this is fatal to really get the user's attention
230 throw e; 230 // TomMeta: WTF? No, how about we /don't/ throw a fatal exception when there's no need to?
231 //throw e;
231 } 232 }
232 } 233 }
233 234
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index ff53f45..50a176b 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -79,13 +79,13 @@ namespace OpenSim.Region.Framework.Scenes.Animation
79 m_scenePresence = sp; 79 m_scenePresence = sp;
80 CurrentMovementAnimation = "CROUCH"; 80 CurrentMovementAnimation = "CROUCH";
81 } 81 }
82 82
83 public void AddAnimation(UUID animID, UUID objectID) 83 public void AddAnimation(UUID animID, UUID objectID)
84 { 84 {
85 if (m_scenePresence.IsChildAgent) 85 if (m_scenePresence.IsChildAgent)
86 return; 86 return;
87 87
88// m_log.DebugFormat("[SCENE PRESENCE ANIMATOR]: Adding animation {0} for {1}", animID, m_scenePresence.Name); 88 // m_log.DebugFormat("[SCENE PRESENCE ANIMATOR]: Adding animation {0} for {1}", animID, m_scenePresence.Name);
89 89
90 if (m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, objectID)) 90 if (m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, objectID))
91 SendAnimPack(); 91 SendAnimPack();
@@ -117,6 +117,22 @@ namespace OpenSim.Region.Framework.Scenes.Animation
117 SendAnimPack(); 117 SendAnimPack();
118 } 118 }
119 119
120 public void avnChangeAnim(UUID animID, bool addRemove, bool sendPack)
121 {
122 if (m_scenePresence.IsChildAgent)
123 return;
124
125 if (animID != UUID.Zero)
126 {
127 if (addRemove)
128 m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero);
129 else
130 m_animations.Remove(animID);
131 }
132 if(sendPack)
133 SendAnimPack();
134 }
135
120 // Called from scripts 136 // Called from scripts
121 public void RemoveAnimation(string name) 137 public void RemoveAnimation(string name)
122 { 138 {
diff --git a/OpenSim/Region/Framework/Scenes/CollisionSounds.cs b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
new file mode 100644
index 0000000..075724e
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/CollisionSounds.cs
@@ -0,0 +1,304 @@
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// Ubit 2012
28
29using System;
30using System.Reflection;
31using System.Collections.Generic;
32using OpenMetaverse;
33using OpenSim.Framework;
34using log4net;
35
36namespace OpenSim.Region.Framework.Scenes
37{
38 public struct CollisionForSoundInfo
39 {
40 public uint colliderID;
41 public Vector3 position;
42 public float relativeVel;
43 }
44
45 public static class CollisionSounds
46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48
49 private const int MaxMaterials = 7;
50 // part part
51
52 private static UUID snd_StoneStone = new UUID("be7295c0-a158-11e1-b3dd-0800200c9a66");
53 private static UUID snd_StoneMetal = new UUID("be7295c0-a158-11e1-b3dd-0800201c9a66");
54 private static UUID snd_StoneGlass = new UUID("be7295c0-a158-11e1-b3dd-0800202c9a66");
55 private static UUID snd_StoneWood = new UUID("be7295c0-a158-11e1-b3dd-0800203c9a66");
56 private static UUID snd_StoneFlesh = new UUID("be7295c0-a158-11e1-b3dd-0800204c9a66");
57 private static UUID snd_StonePlastic = new UUID("be7295c0-a158-11e1-b3dd-0800205c9a66");
58 private static UUID snd_StoneRubber = new UUID("be7295c0-a158-11e1-b3dd-0800206c9a66");
59
60 private static UUID snd_MetalMetal = new UUID("be7295c0-a158-11e1-b3dd-0801201c9a66");
61 private static UUID snd_MetalGlass = new UUID("be7295c0-a158-11e1-b3dd-0801202c9a66");
62 private static UUID snd_MetalWood = new UUID("be7295c0-a158-11e1-b3dd-0801203c9a66");
63 private static UUID snd_MetalFlesh = new UUID("be7295c0-a158-11e1-b3dd-0801204c9a66");
64 private static UUID snd_MetalPlastic = new UUID("be7295c0-a158-11e1-b3dd-0801205c9a66");
65 private static UUID snd_MetalRubber = new UUID("be7295c0-a158-11e1-b3dd-0801206c9a66");
66
67 private static UUID snd_GlassGlass = new UUID("be7295c0-a158-11e1-b3dd-0802202c9a66");
68 private static UUID snd_GlassWood = new UUID("be7295c0-a158-11e1-b3dd-0802203c9a66");
69 private static UUID snd_GlassFlesh = new UUID("be7295c0-a158-11e1-b3dd-0802204c9a66");
70 private static UUID snd_GlassPlastic = new UUID("be7295c0-a158-11e1-b3dd-0802205c9a66");
71 private static UUID snd_GlassRubber = new UUID("be7295c0-a158-11e1-b3dd-0802206c9a66");
72
73 private static UUID snd_WoodWood = new UUID("be7295c0-a158-11e1-b3dd-0803203c9a66");
74 private static UUID snd_WoodFlesh = new UUID("be7295c0-a158-11e1-b3dd-0803204c9a66");
75 private static UUID snd_WoodPlastic = new UUID("be7295c0-a158-11e1-b3dd-0803205c9a66");
76 private static UUID snd_WoodRubber = new UUID("be7295c0-a158-11e1-b3dd-0803206c9a66");
77
78 private static UUID snd_FleshFlesh = new UUID("be7295c0-a158-11e1-b3dd-0804204c9a66");
79 private static UUID snd_FleshPlastic = new UUID("be7295c0-a158-11e1-b3dd-0804205c9a66");
80 private static UUID snd_FleshRubber = new UUID("be7295c0-a158-11e1-b3dd-0804206c9a66");
81
82 private static UUID snd_PlasticPlastic = new UUID("be7295c0-a158-11e1-b3dd-0805205c9a66");
83 private static UUID snd_PlasticRubber = new UUID("be7295c0-a158-11e1-b3dd-0805206c9a66");
84
85 private static UUID snd_RubberRubber = new UUID("be7295c0-a158-11e1-b3dd-0806206c9a66");
86
87 // terrain part
88 private static UUID snd_TerrainStone = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
89 private static UUID snd_TerrainMetal = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
90 private static UUID snd_TerrainGlass = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
91 private static UUID snd_TerrainWood = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
92 private static UUID snd_TerrainFlesh = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
93 private static UUID snd_TerrainPlastic = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
94 private static UUID snd_TerrainRubber = new UUID("be7295c0-a158-11e1-b3dd-0807200c9a66");
95
96 public static UUID[] m_TerrainPart = {
97 snd_TerrainStone,
98 snd_TerrainMetal,
99 snd_TerrainGlass,
100 snd_TerrainWood,
101 snd_TerrainFlesh,
102 snd_TerrainPlastic,
103 snd_TerrainRubber
104 };
105
106 // simetric sounds
107 public static UUID[] m_PartPart = {
108 snd_StoneStone, snd_StoneMetal, snd_StoneGlass, snd_StoneWood, snd_StoneFlesh, snd_StonePlastic, snd_StoneRubber,
109 snd_StoneMetal, snd_MetalMetal, snd_MetalGlass, snd_MetalWood, snd_MetalFlesh, snd_MetalPlastic, snd_MetalRubber,
110 snd_StoneGlass, snd_MetalGlass, snd_GlassGlass, snd_GlassWood, snd_GlassFlesh, snd_GlassPlastic, snd_GlassRubber,
111 snd_StoneWood, snd_MetalWood, snd_GlassWood, snd_WoodWood, snd_WoodFlesh, snd_WoodPlastic, snd_WoodRubber,
112 snd_StoneFlesh, snd_MetalFlesh, snd_GlassFlesh, snd_WoodFlesh, snd_FleshFlesh, snd_FleshPlastic, snd_FleshRubber,
113 snd_StonePlastic, snd_MetalPlastic, snd_GlassPlastic, snd_WoodPlastic, snd_FleshPlastic, snd_PlasticPlastic, snd_PlasticRubber,
114 snd_StoneRubber, snd_MetalRubber, snd_GlassRubber, snd_WoodRubber, snd_FleshRubber, snd_PlasticRubber, snd_RubberRubber
115 };
116
117 public static void PartCollisionSound(SceneObjectPart part, List<CollisionForSoundInfo> collidersinfolist)
118 {
119 if (collidersinfolist.Count == 0 || part == null)
120 return;
121
122 if (part.VolumeDetectActive || (part.Flags & PrimFlags.Physics) == 0)
123 return;
124
125 if (part.ParentGroup == null)
126 return;
127
128 if (part.CollisionSoundType < 0)
129 return;
130
131 float volume = 0.0f;
132 bool HaveSound = false;
133
134 UUID soundID = part.CollisionSound;
135
136 if (part.CollisionSoundType > 0)
137 {
138 // soundID = part.CollisionSound;
139 volume = part.CollisionSoundVolume;
140 if (volume == 0.0f)
141 return;
142 HaveSound = true;
143 }
144
145 bool doneownsound = false;
146
147 int thisMaterial = (int)part.Material;
148 if (thisMaterial >= MaxMaterials)
149 thisMaterial = 3;
150 int thisMatScaled = thisMaterial * MaxMaterials;
151
152 CollisionForSoundInfo colInfo;
153 uint id;
154
155 for(int i = 0; i< collidersinfolist.Count; i++)
156 {
157 colInfo = collidersinfolist[i];
158
159 id = colInfo.colliderID;
160 if (id == 0) // terrain collision
161 {
162 if (!doneownsound)
163 {
164 if (!HaveSound)
165 {
166 volume = Math.Abs(colInfo.relativeVel);
167 if (volume < 0.2f)
168 continue;
169
170 volume *= volume * .0625f; // 4m/s == full volume
171 if (volume > 1.0f)
172 volume = 1.0f;
173
174 soundID = m_TerrainPart[thisMaterial];
175 }
176 part.SendCollisionSound(soundID, volume, colInfo.position);
177 doneownsound = true;
178 }
179 continue;
180 }
181
182 SceneObjectPart otherPart = part.ParentGroup.Scene.GetSceneObjectPart(id);
183 if (otherPart != null)
184 {
185 if (otherPart.CollisionSoundType < 0 || otherPart.VolumeDetectActive)
186 continue;
187
188 if (!HaveSound)
189 {
190 if (otherPart.CollisionSoundType > 0)
191 {
192 soundID = otherPart.CollisionSound;
193 volume = otherPart.CollisionSoundVolume;
194 if (volume == 0.0f)
195 continue;
196 }
197 else
198 {
199 volume = Math.Abs(colInfo.relativeVel);
200 if (volume < 0.2f)
201 continue;
202
203 volume *= volume * .0625f; // 4m/s == full volume
204 if (volume > 1.0f)
205 volume = 1.0f;
206
207 int otherMaterial = (int)otherPart.Material;
208 if (otherMaterial >= MaxMaterials)
209 otherMaterial = 3;
210
211 soundID = m_PartPart[thisMatScaled + otherMaterial];
212 }
213 }
214
215 if (doneownsound)
216 otherPart.SendCollisionSound(soundID, volume, colInfo.position);
217 else
218 {
219 part.SendCollisionSound(soundID, volume, colInfo.position);
220 doneownsound = true;
221 }
222 }
223 }
224 }
225
226 public static void AvatarCollisionSound(ScenePresence av, List<CollisionForSoundInfo> collidersinfolist)
227 {
228 if (collidersinfolist.Count == 0 || av == null)
229 return;
230
231 UUID soundID;
232 int otherMaterial;
233
234 int thisMaterial = 4; // flesh
235
236 int thisMatScaled = thisMaterial * MaxMaterials;
237
238 // bool doneownsound = false;
239
240 CollisionForSoundInfo colInfo;
241 uint id;
242 float volume;
243
244 for(int i = 0; i< collidersinfolist.Count; i++)
245 {
246 colInfo = collidersinfolist[i];
247
248 id = colInfo.colliderID;
249
250 if (id == 0) // no terrain collision sounds for now
251 {
252 continue;
253// volume = Math.Abs(colInfo.relativeVel);
254// if (volume < 0.2f)
255// continue;
256
257 }
258
259 SceneObjectPart otherPart = av.Scene.GetSceneObjectPart(id);
260 if (otherPart != null)
261 {
262 if (otherPart.CollisionSoundType < 0)
263 continue;
264 if (otherPart.CollisionSoundType > 0 && otherPart.CollisionSoundVolume > 0f)
265 otherPart.SendCollisionSound(otherPart.CollisionSound, otherPart.CollisionSoundVolume, colInfo.position);
266 else
267 {
268 volume = Math.Abs(colInfo.relativeVel);
269 // Most noral collisions (running into walls, stairs)
270 // should never be heard.
271 if (volume < 3.2f)
272 continue;
273// m_log.DebugFormat("Collision speed was {0}", volume);
274
275 // Cap to 0.2 times volume because climbing stairs should not be noisy
276 // Also changed scaling
277 volume *= volume * .0125f; // 4m/s == volume 0.2
278 if (volume > 0.2f)
279 volume = 0.2f;
280 otherMaterial = (int)otherPart.Material;
281 if (otherMaterial >= MaxMaterials)
282 otherMaterial = 3;
283
284 soundID = m_PartPart[thisMatScaled + otherMaterial];
285 otherPart.SendCollisionSound(soundID, volume, colInfo.position);
286 }
287 continue;
288 }
289/*
290 else if (!doneownsound)
291 {
292 ScenePresence otherav = av.Scene.GetScenePresence(Id);
293 if (otherav != null && (!otherav.IsChildAgent))
294 {
295 soundID = snd_FleshFlesh;
296 av.SendCollisionSound(soundID, 1.0);
297 doneownsound = true;
298 }
299 }
300 */
301 }
302 }
303 }
304}
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 4d65be9..eee5960 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -59,8 +59,12 @@ namespace OpenSim.Region.Framework.Scenes
59 59
60 public delegate void OnTerrainTickDelegate(); 60 public delegate void OnTerrainTickDelegate();
61 61
62 public delegate void OnTerrainUpdateDelegate();
63
62 public event OnTerrainTickDelegate OnTerrainTick; 64 public event OnTerrainTickDelegate OnTerrainTick;
63 65
66 public event OnTerrainUpdateDelegate OnTerrainUpdate;
67
64 public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup); 68 public delegate void OnBackupDelegate(ISimulationDataService datastore, bool forceBackup);
65 69
66 public event OnBackupDelegate OnBackup; 70 public event OnBackupDelegate OnBackup;
@@ -908,6 +912,26 @@ namespace OpenSim.Region.Framework.Scenes
908 } 912 }
909 } 913 }
910 } 914 }
915 public void TriggerTerrainUpdate()
916 {
917 OnTerrainUpdateDelegate handlerTerrainUpdate = OnTerrainUpdate;
918 if (handlerTerrainUpdate != null)
919 {
920 foreach (OnTerrainUpdateDelegate d in handlerTerrainUpdate.GetInvocationList())
921 {
922 try
923 {
924 d();
925 }
926 catch (Exception e)
927 {
928 m_log.ErrorFormat(
929 "[EVENT MANAGER]: Delegate for TriggerTerrainUpdate failed - continuing. {0} {1}",
930 e.Message, e.StackTrace);
931 }
932 }
933 }
934 }
911 935
912 public void TriggerTerrainTick() 936 public void TriggerTerrainTick()
913 { 937 {
@@ -1198,6 +1222,7 @@ namespace OpenSim.Region.Framework.Scenes
1198 m_log.ErrorFormat( 1222 m_log.ErrorFormat(
1199 "[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing. {0} {1}", 1223 "[EVENT MANAGER]: Delegate for TriggerRemoveScript failed - continuing. {0} {1}",
1200 e.Message, e.StackTrace); 1224 e.Message, e.StackTrace);
1225 m_log.ErrorFormat(Environment.StackTrace);
1201 } 1226 }
1202 } 1227 }
1203 } 1228 }
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
new file mode 100644
index 0000000..b7b0d27
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -0,0 +1,422 @@
1// Proprietary code of Avination Virtual Limited
2// (c) 2012 Melanie Thielker
3//
4
5using System;
6using System.Timers;
7using System.Collections;
8using System.Collections.Generic;
9using System.IO;
10using System.Diagnostics;
11using System.Reflection;
12using System.Threading;
13using OpenMetaverse;
14using OpenSim.Framework;
15using OpenSim.Region.Framework.Interfaces;
16using OpenSim.Region.Physics.Manager;
17using OpenSim.Region.Framework.Scenes.Serialization;
18using System.Runtime.Serialization.Formatters.Binary;
19using System.Runtime.Serialization;
20using Timer = System.Timers.Timer;
21using log4net;
22
23namespace OpenSim.Region.Framework.Scenes
24{
25 [Serializable]
26 public class KeyframeMotion
27 {
28 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
29
30 public enum PlayMode : int
31 {
32 Forward = 0,
33 Reverse = 1,
34 Loop = 2,
35 PingPong = 3
36 };
37
38 [Flags]
39 public enum DataFormat : int
40 {
41 Translation = 1,
42 Rotation = 2
43 }
44
45 [Serializable]
46 public struct Keyframe
47 {
48 public Vector3? Position;
49 public Quaternion? Rotation;
50 public Quaternion StartRotation;
51 public int TimeMS;
52 public int TimeTotal;
53 public Vector3 AngularVelocity;
54 };
55
56 private Vector3 m_basePosition;
57 private Quaternion m_baseRotation;
58 private Vector3 m_serializedPosition;
59
60 private Keyframe m_currentFrame;
61 private List<Keyframe> m_frames = new List<Keyframe>();
62
63 private Keyframe[] m_keyframes;
64
65 [NonSerialized()]
66 protected Timer m_timer = new Timer();
67
68 [NonSerialized()]
69 private SceneObjectGroup m_group;
70
71 private PlayMode m_mode = PlayMode.Forward;
72 private DataFormat m_data = DataFormat.Translation | DataFormat.Rotation;
73
74 private bool m_running = false;
75 [NonSerialized()]
76 private bool m_selected = false;
77
78 private int m_iterations = 0;
79
80 private const double timerInterval = 50.0;
81
82 public DataFormat Data
83 {
84 get { return m_data; }
85 }
86
87 public bool Selected
88 {
89 set
90 {
91 if (value)
92 {
93 // Once we're let go, recompute positions
94 if (m_selected)
95 UpdateSceneObject(m_group);
96 }
97 else
98 {
99 // Save selection position in case we get moved
100 if (!m_selected)
101 m_serializedPosition = m_group.AbsolutePosition;
102 }
103 m_selected = value; }
104 }
105
106 public static KeyframeMotion FromData(SceneObjectGroup grp, Byte[] data)
107 {
108 MemoryStream ms = new MemoryStream(data);
109
110 BinaryFormatter fmt = new BinaryFormatter();
111
112 KeyframeMotion newMotion = (KeyframeMotion)fmt.Deserialize(ms);
113
114 // This will be started when position is updated
115 newMotion.m_timer = new Timer();
116 newMotion.m_timer.Interval = (int)timerInterval;
117 newMotion.m_timer.AutoReset = true;
118 newMotion.m_timer.Elapsed += newMotion.OnTimer;
119
120 return newMotion;
121 }
122
123 public void UpdateSceneObject(SceneObjectGroup grp)
124 {
125 m_group = grp;
126 Vector3 offset = grp.AbsolutePosition - m_serializedPosition;
127
128 m_basePosition += offset;
129 m_currentFrame.Position += offset;
130 for (int i = 0 ; i < m_frames.Count ; i++)
131 {
132 Keyframe k = m_frames[i];
133 k.Position += offset;
134 m_frames[i] = k;
135 }
136
137 if (m_running)
138 Start();
139 }
140
141 public KeyframeMotion(SceneObjectGroup grp, PlayMode mode, DataFormat data)
142 {
143 m_mode = mode;
144 m_data = data;
145
146 m_group = grp;
147 m_basePosition = grp.AbsolutePosition;
148 m_baseRotation = grp.GroupRotation;
149
150 m_timer.Interval = (int)timerInterval;
151 m_timer.AutoReset = true;
152 m_timer.Elapsed += OnTimer;
153 }
154
155 public void SetKeyframes(Keyframe[] frames)
156 {
157 m_keyframes = frames;
158 }
159
160 public void Start()
161 {
162 if (m_keyframes.Length > 0)
163 m_timer.Start();
164 m_running = true;
165 }
166
167 public void Stop()
168 {
169 // Failed object creation
170 if (m_timer == null)
171 return;
172 m_timer.Stop();
173
174 m_basePosition = m_group.AbsolutePosition;
175 m_baseRotation = m_group.GroupRotation;
176
177 m_group.RootPart.Velocity = Vector3.Zero;
178 m_group.RootPart.UpdateAngularVelocity(Vector3.Zero);
179 m_group.SendGroupRootTerseUpdate();
180
181 m_frames.Clear();
182 m_running = false;
183 }
184
185 public void Pause()
186 {
187 m_group.RootPart.Velocity = Vector3.Zero;
188 m_group.RootPart.UpdateAngularVelocity(Vector3.Zero);
189 m_group.SendGroupRootTerseUpdate();
190
191 m_timer.Stop();
192 m_running = false;
193 }
194
195 private void GetNextList()
196 {
197 m_frames.Clear();
198 Vector3 pos = m_basePosition;
199 Quaternion rot = m_baseRotation;
200
201 if (m_mode == PlayMode.Loop || m_mode == PlayMode.PingPong || m_iterations == 0)
202 {
203 int direction = 1;
204 if (m_mode == PlayMode.Reverse || ((m_mode == PlayMode.PingPong) && ((m_iterations & 1) != 0)))
205 direction = -1;
206
207 int start = 0;
208 int end = m_keyframes.Length;
209// if (m_mode == PlayMode.PingPong && m_keyframes.Length > 1)
210// end = m_keyframes.Length - 1;
211
212 if (direction < 0)
213 {
214 start = m_keyframes.Length - 1;
215 end = -1;
216// if (m_mode == PlayMode.PingPong && m_keyframes.Length > 1)
217// end = 0;
218 }
219
220 for (int i = start; i != end ; i += direction)
221 {
222 Keyframe k = m_keyframes[i];
223
224 if (k.Position.HasValue)
225 k.Position = (k.Position * direction) + pos;
226 else
227 k.Position = pos;
228
229 k.StartRotation = rot;
230 if (k.Rotation.HasValue)
231 {
232 if (direction == -1)
233 k.Rotation = Quaternion.Conjugate((Quaternion)k.Rotation);
234 k.Rotation = rot * k.Rotation;
235 }
236 else
237 {
238 k.Rotation = rot;
239 }
240
241 float angle = 0;
242
243 float aa = k.StartRotation.X * k.StartRotation.X + k.StartRotation.Y * k.StartRotation.Y + k.StartRotation.Z * k.StartRotation.Z + k.StartRotation.W * k.StartRotation.W;
244 float bb = ((Quaternion)k.Rotation).X * ((Quaternion)k.Rotation).X + ((Quaternion)k.Rotation).Y * ((Quaternion)k.Rotation).Y + ((Quaternion)k.Rotation).Z * ((Quaternion)k.Rotation).Z + ((Quaternion)k.Rotation).W * ((Quaternion)k.Rotation).W;
245 float aa_bb = aa * bb;
246
247 if (aa_bb == 0)
248 {
249 angle = 0;
250 }
251 else
252 {
253 float ab = k.StartRotation.X * ((Quaternion)k.Rotation).X +
254 k.StartRotation.Y * ((Quaternion)k.Rotation).Y +
255 k.StartRotation.Z * ((Quaternion)k.Rotation).Z +
256 k.StartRotation.W * ((Quaternion)k.Rotation).W;
257 float q = (ab * ab) / aa_bb;
258
259 if (q > 1.0f)
260 {
261 angle = 0;
262 }
263 else
264 {
265 angle = (float)Math.Acos(2 * q - 1);
266 }
267 }
268
269 k.AngularVelocity = (new Vector3(0, 0, 1) * (Quaternion)k.Rotation) * (angle / (k.TimeMS / 1000));
270 k.TimeTotal = k.TimeMS;
271
272 m_frames.Add(k);
273
274 pos = (Vector3)k.Position;
275 rot = (Quaternion)k.Rotation;
276 }
277
278 m_basePosition = pos;
279 m_baseRotation = rot;
280
281 m_iterations++;
282 }
283 }
284
285 protected void OnTimer(object sender, ElapsedEventArgs e)
286 {
287 if (m_frames.Count == 0)
288 {
289 GetNextList();
290
291 if (m_frames.Count == 0)
292 {
293 Stop();
294 return;
295 }
296
297 m_currentFrame = m_frames[0];
298 }
299
300 if (m_selected)
301 {
302 if (m_group.RootPart.Velocity != Vector3.Zero)
303 {
304 m_group.RootPart.Velocity = Vector3.Zero;
305 m_group.SendGroupRootTerseUpdate();
306 }
307 return;
308 }
309
310 // Do the frame processing
311 double steps = (double)m_currentFrame.TimeMS / timerInterval;
312 float complete = ((float)m_currentFrame.TimeTotal - (float)m_currentFrame.TimeMS) / (float)m_currentFrame.TimeTotal;
313
314 if (steps <= 1.0)
315 {
316 m_currentFrame.TimeMS = 0;
317
318 m_group.AbsolutePosition = (Vector3)m_currentFrame.Position;
319 m_group.UpdateGroupRotationR((Quaternion)m_currentFrame.Rotation);
320 }
321 else
322 {
323 Vector3 v = (Vector3)m_currentFrame.Position - m_group.AbsolutePosition;
324 Vector3 motionThisFrame = v / (float)steps;
325 v = v * 1000 / m_currentFrame.TimeMS;
326
327 bool update = false;
328
329 if (Vector3.Mag(motionThisFrame) >= 0.05f)
330 {
331 m_group.AbsolutePosition += motionThisFrame;
332 m_group.RootPart.Velocity = v;
333 update = true;
334 }
335
336 if ((Quaternion)m_currentFrame.Rotation != m_group.GroupRotation)
337 {
338 Quaternion current = m_group.GroupRotation;
339
340 Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, complete);
341
342 float angle = 0;
343
344 float aa = current.X * current.X + current.Y * current.Y + current.Z * current.Z + current.W * current.W;
345 float bb = step.X * step.X + step.Y * step.Y + step.Z * step.Z + step.W * step.W;
346 float aa_bb = aa * bb;
347
348 if (aa_bb == 0)
349 {
350 angle = 0;
351 }
352 else
353 {
354 float ab = current.X * step.X +
355 current.Y * step.Y +
356 current.Z * step.Z +
357 current.W * step.W;
358 float q = (ab * ab) / aa_bb;
359
360 if (q > 1.0f)
361 {
362 angle = 0;
363 }
364 else
365 {
366 angle = (float)Math.Acos(2 * q - 1);
367 }
368 }
369
370 if (angle > 0.01f)
371 {
372 m_group.UpdateGroupRotationR(step);
373 //m_group.RootPart.UpdateAngularVelocity(m_currentFrame.AngularVelocity / 2);
374 update = true;
375 }
376 }
377
378 if (update)
379 m_group.SendGroupRootTerseUpdate();
380 }
381
382 m_currentFrame.TimeMS -= (int)timerInterval;
383
384 if (m_currentFrame.TimeMS <= 0)
385 {
386 m_group.RootPart.Velocity = Vector3.Zero;
387 m_group.RootPart.UpdateAngularVelocity(Vector3.Zero);
388 m_group.SendGroupRootTerseUpdate();
389
390 m_frames.RemoveAt(0);
391 if (m_frames.Count > 0)
392 m_currentFrame = m_frames[0];
393 }
394 }
395
396 public Byte[] Serialize()
397 {
398 MemoryStream ms = new MemoryStream();
399 m_timer.Stop();
400
401 BinaryFormatter fmt = new BinaryFormatter();
402 SceneObjectGroup tmp = m_group;
403 m_group = null;
404 m_serializedPosition = tmp.AbsolutePosition;
405 fmt.Serialize(ms, this);
406 m_group = tmp;
407 return ms.ToArray();
408 }
409
410 public void CrossingFailure()
411 {
412 // The serialization has stopped the timer, so let's wait a moment
413 // then retry the crossing. We'll get back here if it fails.
414 Util.FireAndForget(delegate (object x)
415 {
416 Thread.Sleep(60000);
417 if (m_running)
418 m_timer.Start();
419 });
420 }
421 }
422}
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 1b10e3c..ddae073 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Region.Framework.Scenes
157 157
158 private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity) 158 private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity)
159 { 159 {
160 uint pqueue = ComputeDistancePriority(client,entity,true); 160 uint pqueue = ComputeDistancePriority(client,entity,false);
161 161
162 ScenePresence presence = m_scene.GetScenePresence(client.AgentId); 162 ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
163 if (presence != null) 163 if (presence != null)
@@ -212,9 +212,15 @@ namespace OpenSim.Region.Framework.Scenes
212 } 212 }
213 213
214 // Use the camera position for local agents and avatar position for remote agents 214 // Use the camera position for local agents and avatar position for remote agents
215 Vector3 presencePos = (presence.IsChildAgent) ? 215 // Why would I want that? They could be camming but I still see them at the
216 presence.AbsolutePosition : 216 // avatar position, so why should I update them as if they were at their
217 presence.CameraPosition; 217 // camera positions? Makes no sense!
218 // TODO: Fix this mess
219 //Vector3 presencePos = (presence.IsChildAgent) ?
220 // presence.AbsolutePosition :
221 // presence.CameraPosition;
222
223 Vector3 presencePos = presence.AbsolutePosition;
218 224
219 // Compute the distance... 225 // Compute the distance...
220 double distance = Vector3.Distance(presencePos, entityPos); 226 double distance = Vector3.Distance(presencePos, entityPos);
@@ -226,7 +232,7 @@ namespace OpenSim.Region.Framework.Scenes
226 232
227 for (int i = 0; i < queues - 1; i++) 233 for (int i = 0; i < queues - 1; i++)
228 { 234 {
229 if (distance < 10 * Math.Pow(2.0,i)) 235 if (distance < 30 * Math.Pow(2.0,i))
230 break; 236 break;
231 pqueue++; 237 pqueue++;
232 } 238 }
diff --git a/OpenSim/Region/Framework/Scenes/SOPMaterial.cs b/OpenSim/Region/Framework/Scenes/SOPMaterial.cs
new file mode 100644
index 0000000..10ac37c
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/SOPMaterial.cs
@@ -0,0 +1,95 @@
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 System.Collections.Generic;
30using OpenMetaverse;
31using OpenSim.Framework;
32
33namespace OpenSim.Region.Framework.Scenes
34{
35 public static class SOPMaterialData
36 {
37 public enum SopMaterial : int // redundante and not in use for now
38 {
39 Stone = 0,
40 Metal = 1,
41 Glass = 2,
42 Wood = 3,
43 Flesh = 4,
44 Plastic = 5,
45 Rubber = 6,
46 light = 7 // compatibility with old viewers
47 }
48
49 private struct MaterialData
50 {
51 public float friction;
52 public float bounce;
53 public MaterialData(float f, float b)
54 {
55 friction = f;
56 bounce = b;
57 }
58 }
59
60 private static MaterialData[] m_materialdata = {
61 new MaterialData(0.8f,0.4f), // Stone
62 new MaterialData(0.3f,0.4f), // Metal
63 new MaterialData(0.2f,0.7f), // Glass
64 new MaterialData(0.6f,0.5f), // Wood
65 new MaterialData(0.9f,0.3f), // Flesh
66 new MaterialData(0.4f,0.7f), // Plastic
67 new MaterialData(0.9f,0.95f), // Rubber
68 new MaterialData(0.0f,0.0f) // light ??
69 };
70
71 public static Material MaxMaterial
72 {
73 get { return (Material)(m_materialdata.Length - 1); }
74 }
75
76 public static float friction(Material material)
77 {
78 int indx = (int)material;
79 if (indx < m_materialdata.Length)
80 return (m_materialdata[indx].friction);
81 else
82 return 0;
83 }
84
85 public static float bounce(Material material)
86 {
87 int indx = (int)material;
88 if (indx < m_materialdata.Length)
89 return (m_materialdata[indx].bounce);
90 else
91 return 0;
92 }
93
94 }
95} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/SOPVehicle.cs b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
new file mode 100644
index 0000000..9cb901a
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/SOPVehicle.cs
@@ -0,0 +1,791 @@
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 System.Collections.Generic;
30using OpenMetaverse;
31using OpenSim.Framework;
32using OpenSim.Region.Physics.Manager;
33using System.Text;
34using System.IO;
35using System.Xml;
36using OpenSim.Framework.Serialization;
37using OpenSim.Framework.Serialization.External;
38using OpenSim.Region.Framework.Scenes.Serialization;
39
40namespace OpenSim.Region.Framework.Scenes
41{
42 public class SOPVehicle
43 {
44 public VehicleData vd;
45
46 public Vehicle Type
47 {
48 get { return vd.m_type; }
49 }
50
51 public SOPVehicle()
52 {
53 vd = new VehicleData();
54 ProcessTypeChange(Vehicle.TYPE_NONE); // is needed?
55 }
56
57 public void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
58 {
59 float len;
60 float timestep = 0.01f;
61 switch (pParam)
62 {
63 case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
64 if (pValue < 0f) pValue = 0f;
65 if (pValue > 1f) pValue = 1f;
66 vd.m_angularDeflectionEfficiency = pValue;
67 break;
68 case Vehicle.ANGULAR_DEFLECTION_TIMESCALE:
69 if (pValue < timestep) pValue = timestep;
70 vd.m_angularDeflectionTimescale = pValue;
71 break;
72 case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE:
73 if (pValue < timestep) pValue = timestep;
74 else if (pValue > 120) pValue = 120;
75 vd.m_angularMotorDecayTimescale = pValue;
76 break;
77 case Vehicle.ANGULAR_MOTOR_TIMESCALE:
78 if (pValue < timestep) pValue = timestep;
79 vd.m_angularMotorTimescale = pValue;
80 break;
81 case Vehicle.BANKING_EFFICIENCY:
82 if (pValue < -1f) pValue = -1f;
83 if (pValue > 1f) pValue = 1f;
84 vd.m_bankingEfficiency = pValue;
85 break;
86 case Vehicle.BANKING_MIX:
87 if (pValue < 0f) pValue = 0f;
88 if (pValue > 1f) pValue = 1f;
89 vd.m_bankingMix = pValue;
90 break;
91 case Vehicle.BANKING_TIMESCALE:
92 if (pValue < timestep) pValue = timestep;
93 vd.m_bankingTimescale = pValue;
94 break;
95 case Vehicle.BUOYANCY:
96 if (pValue < -1f) pValue = -1f;
97 if (pValue > 1f) pValue = 1f;
98 vd.m_VehicleBuoyancy = pValue;
99 break;
100 case Vehicle.HOVER_EFFICIENCY:
101 if (pValue < 0f) pValue = 0f;
102 if (pValue > 1f) pValue = 1f;
103 vd.m_VhoverEfficiency = pValue;
104 break;
105 case Vehicle.HOVER_HEIGHT:
106 vd.m_VhoverHeight = pValue;
107 break;
108 case Vehicle.HOVER_TIMESCALE:
109 if (pValue < timestep) pValue = timestep;
110 vd.m_VhoverTimescale = pValue;
111 break;
112 case Vehicle.LINEAR_DEFLECTION_EFFICIENCY:
113 if (pValue < 0f) pValue = 0f;
114 if (pValue > 1f) pValue = 1f;
115 vd.m_linearDeflectionEfficiency = pValue;
116 break;
117 case Vehicle.LINEAR_DEFLECTION_TIMESCALE:
118 if (pValue < timestep) pValue = timestep;
119 vd.m_linearDeflectionTimescale = pValue;
120 break;
121 case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE:
122 if (pValue < timestep) pValue = timestep;
123 else if (pValue > 120) pValue = 120;
124 vd.m_linearMotorDecayTimescale = pValue;
125 break;
126 case Vehicle.LINEAR_MOTOR_TIMESCALE:
127 if (pValue < timestep) pValue = timestep;
128 vd.m_linearMotorTimescale = pValue;
129 break;
130 case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY:
131 if (pValue < 0f) pValue = 0f;
132 if (pValue > 1f) pValue = 1f;
133 vd.m_verticalAttractionEfficiency = pValue;
134 break;
135 case Vehicle.VERTICAL_ATTRACTION_TIMESCALE:
136 if (pValue < timestep) pValue = timestep;
137 vd.m_verticalAttractionTimescale = pValue;
138 break;
139
140 // These are vector properties but the engine lets you use a single float value to
141 // set all of the components to the same value
142 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
143 if (pValue < timestep) pValue = timestep;
144 vd.m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
145 break;
146 case Vehicle.ANGULAR_MOTOR_DIRECTION:
147 vd.m_angularMotorDirection = new Vector3(pValue, pValue, pValue);
148 len = vd.m_angularMotorDirection.Length();
149 if (len > 12.566f)
150 vd.m_angularMotorDirection *= (12.566f / len);
151 break;
152 case Vehicle.LINEAR_FRICTION_TIMESCALE:
153 if (pValue < timestep) pValue = timestep;
154 vd.m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue);
155 break;
156 case Vehicle.LINEAR_MOTOR_DIRECTION:
157 vd.m_linearMotorDirection = new Vector3(pValue, pValue, pValue);
158 len = vd.m_linearMotorDirection.Length();
159 if (len > 30.0f)
160 vd.m_linearMotorDirection *= (30.0f / len);
161 break;
162 case Vehicle.LINEAR_MOTOR_OFFSET:
163 vd.m_linearMotorOffset = new Vector3(pValue, pValue, pValue);
164 len = vd.m_linearMotorOffset.Length();
165 if (len > 100.0f)
166 vd.m_linearMotorOffset *= (100.0f / len);
167 break;
168 }
169 }//end ProcessFloatVehicleParam
170
171 public void ProcessVectorVehicleParam(Vehicle pParam, Vector3 pValue)
172 {
173 float len;
174 float timestep = 0.01f;
175 switch (pParam)
176 {
177 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
178 if (pValue.X < timestep) pValue.X = timestep;
179 if (pValue.Y < timestep) pValue.Y = timestep;
180 if (pValue.Z < timestep) pValue.Z = timestep;
181
182 vd.m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
183 break;
184 case Vehicle.ANGULAR_MOTOR_DIRECTION:
185 vd.m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
186 // Limit requested angular speed to 2 rps= 4 pi rads/sec
187 len = vd.m_angularMotorDirection.Length();
188 if (len > 12.566f)
189 vd.m_angularMotorDirection *= (12.566f / len);
190 break;
191 case Vehicle.LINEAR_FRICTION_TIMESCALE:
192 if (pValue.X < timestep) pValue.X = timestep;
193 if (pValue.Y < timestep) pValue.Y = timestep;
194 if (pValue.Z < timestep) pValue.Z = timestep;
195 vd.m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
196 break;
197 case Vehicle.LINEAR_MOTOR_DIRECTION:
198 vd.m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
199 len = vd.m_linearMotorDirection.Length();
200 if (len > 30.0f)
201 vd.m_linearMotorDirection *= (30.0f / len);
202 break;
203 case Vehicle.LINEAR_MOTOR_OFFSET:
204 vd.m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
205 len = vd.m_linearMotorOffset.Length();
206 if (len > 100.0f)
207 vd.m_linearMotorOffset *= (100.0f / len);
208 break;
209 }
210 }//end ProcessVectorVehicleParam
211
212 public void ProcessRotationVehicleParam(Vehicle pParam, Quaternion pValue)
213 {
214 switch (pParam)
215 {
216 case Vehicle.REFERENCE_FRAME:
217 vd.m_referenceFrame = pValue;
218 break;
219 }
220 }//end ProcessRotationVehicleParam
221
222 public void ProcessVehicleFlags(int pParam, bool remove)
223 {
224 if (remove)
225 {
226 vd.m_flags &= ~((VehicleFlag)pParam);
227 }
228 else
229 {
230 vd.m_flags |= (VehicleFlag)pParam;
231 }
232 }//end ProcessVehicleFlags
233
234 public void ProcessTypeChange(Vehicle pType)
235 {
236 vd.m_linearMotorDirection = Vector3.Zero;
237 vd.m_angularMotorDirection = Vector3.Zero;
238 vd.m_linearMotorOffset = Vector3.Zero;
239 vd.m_referenceFrame = Quaternion.Identity;
240
241 // Set Defaults For Type
242 vd.m_type = pType;
243 switch (pType)
244 {
245 case Vehicle.TYPE_NONE:
246 vd.m_linearFrictionTimescale = new Vector3(1000, 1000, 1000);
247 vd.m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
248 vd.m_linearMotorTimescale = 1000;
249 vd.m_linearMotorDecayTimescale = 120;
250 vd.m_angularMotorTimescale = 1000;
251 vd.m_angularMotorDecayTimescale = 1000;
252 vd.m_VhoverHeight = 0;
253 vd.m_VhoverEfficiency = 1;
254 vd.m_VhoverTimescale = 1000;
255 vd.m_VehicleBuoyancy = 0;
256 vd.m_linearDeflectionEfficiency = 0;
257 vd.m_linearDeflectionTimescale = 1000;
258 vd.m_angularDeflectionEfficiency = 0;
259 vd.m_angularDeflectionTimescale = 1000;
260 vd.m_bankingEfficiency = 0;
261 vd.m_bankingMix = 1;
262 vd.m_bankingTimescale = 1000;
263 vd.m_verticalAttractionEfficiency = 0;
264 vd.m_verticalAttractionTimescale = 1000;
265
266 vd.m_flags = (VehicleFlag)0;
267 break;
268
269 case Vehicle.TYPE_SLED:
270 vd.m_linearFrictionTimescale = new Vector3(30, 1, 1000);
271 vd.m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
272 vd.m_linearMotorTimescale = 1000;
273 vd.m_linearMotorDecayTimescale = 120;
274 vd.m_angularMotorTimescale = 1000;
275 vd.m_angularMotorDecayTimescale = 120;
276 vd.m_VhoverHeight = 0;
277 vd.m_VhoverEfficiency = 1;
278 vd.m_VhoverTimescale = 10;
279 vd.m_VehicleBuoyancy = 0;
280 vd.m_linearDeflectionEfficiency = 1;
281 vd.m_linearDeflectionTimescale = 1;
282 vd.m_angularDeflectionEfficiency = 0;
283 vd.m_angularDeflectionTimescale = 1000;
284 vd.m_bankingEfficiency = 0;
285 vd.m_bankingMix = 1;
286 vd.m_bankingTimescale = 10;
287 vd.m_flags &=
288 ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
289 VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
290 vd.m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
291 break;
292 case Vehicle.TYPE_CAR:
293 vd.m_linearFrictionTimescale = new Vector3(100, 2, 1000);
294 vd.m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
295 vd.m_linearMotorTimescale = 1;
296 vd.m_linearMotorDecayTimescale = 60;
297 vd.m_angularMotorTimescale = 1;
298 vd.m_angularMotorDecayTimescale = 0.8f;
299 vd.m_VhoverHeight = 0;
300 vd.m_VhoverEfficiency = 0;
301 vd.m_VhoverTimescale = 1000;
302 vd.m_VehicleBuoyancy = 0;
303 vd.m_linearDeflectionEfficiency = 1;
304 vd.m_linearDeflectionTimescale = 2;
305 vd.m_angularDeflectionEfficiency = 0;
306 vd.m_angularDeflectionTimescale = 10;
307 vd.m_verticalAttractionEfficiency = 1f;
308 vd.m_verticalAttractionTimescale = 10f;
309 vd.m_bankingEfficiency = -0.2f;
310 vd.m_bankingMix = 1;
311 vd.m_bankingTimescale = 1;
312 vd.m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
313 vd.m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY |
314 VehicleFlag.LIMIT_MOTOR_UP | VehicleFlag.HOVER_UP_ONLY);
315 break;
316 case Vehicle.TYPE_BOAT:
317 vd.m_linearFrictionTimescale = new Vector3(10, 3, 2);
318 vd.m_angularFrictionTimescale = new Vector3(10, 10, 10);
319 vd.m_linearMotorTimescale = 5;
320 vd.m_linearMotorDecayTimescale = 60;
321 vd.m_angularMotorTimescale = 4;
322 vd.m_angularMotorDecayTimescale = 4;
323 vd.m_VhoverHeight = 0;
324 vd.m_VhoverEfficiency = 0.5f;
325 vd.m_VhoverTimescale = 2;
326 vd.m_VehicleBuoyancy = 1;
327 vd.m_linearDeflectionEfficiency = 0.5f;
328 vd.m_linearDeflectionTimescale = 3;
329 vd.m_angularDeflectionEfficiency = 0.5f;
330 vd.m_angularDeflectionTimescale = 5;
331 vd.m_verticalAttractionEfficiency = 0.5f;
332 vd.m_verticalAttractionTimescale = 5f;
333 vd.m_bankingEfficiency = -0.3f;
334 vd.m_bankingMix = 0.8f;
335 vd.m_bankingTimescale = 1;
336 vd.m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY |
337 VehicleFlag.HOVER_GLOBAL_HEIGHT |
338 VehicleFlag.HOVER_UP_ONLY |
339 VehicleFlag.LIMIT_ROLL_ONLY);
340 vd.m_flags |= (VehicleFlag.NO_DEFLECTION_UP |
341 VehicleFlag.LIMIT_MOTOR_UP |
342 VehicleFlag.HOVER_WATER_ONLY);
343 break;
344 case Vehicle.TYPE_AIRPLANE:
345 vd.m_linearFrictionTimescale = new Vector3(200, 10, 5);
346 vd.m_angularFrictionTimescale = new Vector3(20, 20, 20);
347 vd.m_linearMotorTimescale = 2;
348 vd.m_linearMotorDecayTimescale = 60;
349 vd.m_angularMotorTimescale = 4;
350 vd.m_angularMotorDecayTimescale = 8;
351 vd.m_VhoverHeight = 0;
352 vd.m_VhoverEfficiency = 0.5f;
353 vd.m_VhoverTimescale = 1000;
354 vd.m_VehicleBuoyancy = 0;
355 vd.m_linearDeflectionEfficiency = 0.5f;
356 vd.m_linearDeflectionTimescale = 0.5f;
357 vd.m_angularDeflectionEfficiency = 1;
358 vd.m_angularDeflectionTimescale = 2;
359 vd.m_verticalAttractionEfficiency = 0.9f;
360 vd.m_verticalAttractionTimescale = 2f;
361 vd.m_bankingEfficiency = 1;
362 vd.m_bankingMix = 0.7f;
363 vd.m_bankingTimescale = 2;
364 vd.m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY |
365 VehicleFlag.HOVER_TERRAIN_ONLY |
366 VehicleFlag.HOVER_GLOBAL_HEIGHT |
367 VehicleFlag.HOVER_UP_ONLY |
368 VehicleFlag.NO_DEFLECTION_UP |
369 VehicleFlag.LIMIT_MOTOR_UP);
370 vd.m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
371 break;
372 case Vehicle.TYPE_BALLOON:
373 vd.m_linearFrictionTimescale = new Vector3(5, 5, 5);
374 vd.m_angularFrictionTimescale = new Vector3(10, 10, 10);
375 vd.m_linearMotorTimescale = 5;
376 vd.m_linearMotorDecayTimescale = 60;
377 vd.m_angularMotorTimescale = 6;
378 vd.m_angularMotorDecayTimescale = 10;
379 vd.m_VhoverHeight = 5;
380 vd.m_VhoverEfficiency = 0.8f;
381 vd.m_VhoverTimescale = 10;
382 vd.m_VehicleBuoyancy = 1;
383 vd.m_linearDeflectionEfficiency = 0;
384 vd.m_linearDeflectionTimescale = 5;
385 vd.m_angularDeflectionEfficiency = 0;
386 vd.m_angularDeflectionTimescale = 5;
387 vd.m_verticalAttractionEfficiency = 0f;
388 vd.m_verticalAttractionTimescale = 1000f;
389 vd.m_bankingEfficiency = 0;
390 vd.m_bankingMix = 0.7f;
391 vd.m_bankingTimescale = 5;
392 vd.m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY |
393 VehicleFlag.HOVER_TERRAIN_ONLY |
394 VehicleFlag.HOVER_UP_ONLY |
395 VehicleFlag.NO_DEFLECTION_UP |
396 VehicleFlag.LIMIT_MOTOR_UP);
397 vd.m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY |
398 VehicleFlag.HOVER_GLOBAL_HEIGHT);
399 break;
400 }
401 }
402 public void SetVehicle(PhysicsActor ph)
403 {
404 if (ph == null)
405 return;
406 ph.SetVehicle(vd);
407 }
408
409 private XmlTextWriter writer;
410
411 private void XWint(string name, int i)
412 {
413 writer.WriteElementString(name, i.ToString());
414 }
415
416 private void XWfloat(string name, float f)
417 {
418 writer.WriteElementString(name, f.ToString(Utils.EnUsCulture));
419 }
420
421 private void XWVector(string name, Vector3 vec)
422 {
423 writer.WriteStartElement(name);
424 writer.WriteElementString("X", vec.X.ToString(Utils.EnUsCulture));
425 writer.WriteElementString("Y", vec.Y.ToString(Utils.EnUsCulture));
426 writer.WriteElementString("Z", vec.Z.ToString(Utils.EnUsCulture));
427 writer.WriteEndElement();
428 }
429
430 private void XWQuat(string name, Quaternion quat)
431 {
432 writer.WriteStartElement(name);
433 writer.WriteElementString("X", quat.X.ToString(Utils.EnUsCulture));
434 writer.WriteElementString("Y", quat.Y.ToString(Utils.EnUsCulture));
435 writer.WriteElementString("Z", quat.Z.ToString(Utils.EnUsCulture));
436 writer.WriteElementString("W", quat.W.ToString(Utils.EnUsCulture));
437 writer.WriteEndElement();
438 }
439
440 public void ToXml2(XmlTextWriter twriter)
441 {
442 writer = twriter;
443 writer.WriteStartElement("Vehicle");
444
445 XWint("TYPE", (int)vd.m_type);
446 XWint("FLAGS", (int)vd.m_flags);
447
448 // Linear properties
449 XWVector("LMDIR", vd.m_linearMotorDirection);
450 XWVector("LMFTIME", vd.m_linearFrictionTimescale);
451 XWfloat("LMDTIME", vd.m_linearMotorDecayTimescale);
452 XWfloat("LMTIME", vd.m_linearMotorTimescale);
453 XWVector("LMOFF", vd.m_linearMotorOffset);
454
455 //Angular properties
456 XWVector("AMDIR", vd.m_angularMotorDirection);
457 XWfloat("AMTIME", vd.m_angularMotorTimescale);
458 XWfloat("AMDTIME", vd.m_angularMotorDecayTimescale);
459 XWVector("AMFTIME", vd.m_angularFrictionTimescale);
460
461 //Deflection properties
462 XWfloat("ADEFF", vd.m_angularDeflectionEfficiency);
463 XWfloat("ADTIME", vd.m_angularDeflectionTimescale);
464 XWfloat("LDEFF", vd.m_linearDeflectionEfficiency);
465 XWfloat("LDTIME", vd.m_linearDeflectionTimescale);
466
467 //Banking properties
468 XWfloat("BEFF", vd.m_bankingEfficiency);
469 XWfloat("BMIX", vd.m_bankingMix);
470 XWfloat("BTIME", vd.m_bankingTimescale);
471
472 //Hover and Buoyancy properties
473 XWfloat("HHEI", vd.m_VhoverHeight);
474 XWfloat("HEFF", vd.m_VhoverEfficiency);
475 XWfloat("HTIME", vd.m_VhoverTimescale);
476 XWfloat("VBUO", vd.m_VehicleBuoyancy);
477
478 //Attractor properties
479 XWfloat("VAEFF", vd.m_verticalAttractionEfficiency);
480 XWfloat("VATIME", vd.m_verticalAttractionTimescale);
481
482 XWQuat("REF_FRAME", vd.m_referenceFrame);
483
484 writer.WriteEndElement();
485 writer = null;
486 }
487
488
489
490 XmlTextReader reader;
491
492 private int XRint()
493 {
494 return reader.ReadElementContentAsInt();
495 }
496
497 private float XRfloat()
498 {
499 return reader.ReadElementContentAsFloat();
500 }
501
502 public Vector3 XRvector()
503 {
504 Vector3 vec;
505 reader.ReadStartElement();
506 vec.X = reader.ReadElementContentAsFloat();
507 vec.Y = reader.ReadElementContentAsFloat();
508 vec.Z = reader.ReadElementContentAsFloat();
509 reader.ReadEndElement();
510 return vec;
511 }
512
513 public Quaternion XRquat()
514 {
515 Quaternion q;
516 reader.ReadStartElement();
517 q.X = reader.ReadElementContentAsFloat();
518 q.Y = reader.ReadElementContentAsFloat();
519 q.Z = reader.ReadElementContentAsFloat();
520 q.W = reader.ReadElementContentAsFloat();
521 reader.ReadEndElement();
522 return q;
523 }
524
525 public static bool EReadProcessors(
526 Dictionary<string, Action> processors,
527 XmlTextReader xtr)
528 {
529 bool errors = false;
530
531 string nodeName = string.Empty;
532 while (xtr.NodeType != XmlNodeType.EndElement)
533 {
534 nodeName = xtr.Name;
535
536 // m_log.DebugFormat("[ExternalRepresentationUtils]: Processing: {0}", nodeName);
537
538 Action p = null;
539 if (processors.TryGetValue(xtr.Name, out p))
540 {
541 // m_log.DebugFormat("[ExternalRepresentationUtils]: Found {0} processor, nodeName);
542
543 try
544 {
545 p();
546 }
547 catch (Exception e)
548 {
549 errors = true;
550 if (xtr.NodeType == XmlNodeType.EndElement)
551 xtr.Read();
552 }
553 }
554 else
555 {
556 // m_log.DebugFormat("[LandDataSerializer]: caught unknown element {0}", nodeName);
557 xtr.ReadOuterXml(); // ignore
558 }
559 }
560
561 return errors;
562 }
563
564
565 public string ToXml2()
566 {
567 MemoryStream ms = new MemoryStream(512);
568 UTF8Encoding enc = new UTF8Encoding();
569 XmlTextWriter xwriter = new XmlTextWriter(ms, enc);
570 ToXml2(xwriter);
571 xwriter.Flush();
572 string s = ms.GetStreamString();
573 xwriter.Close();
574 return s;
575 }
576
577 public static SOPVehicle FromXml2(string text)
578 {
579 if (text == String.Empty)
580 return null;
581
582 UTF8Encoding enc = new UTF8Encoding();
583 MemoryStream ms = new MemoryStream(enc.GetBytes(text));
584 XmlTextReader xreader = new XmlTextReader(ms);
585
586 SOPVehicle v = new SOPVehicle();
587 bool error;
588
589 v.FromXml2(xreader, out error);
590
591 xreader.Close();
592
593 if (error)
594 {
595 v = null;
596 return null;
597 }
598 return v;
599 }
600
601 public static SOPVehicle FromXml2(XmlTextReader reader)
602 {
603 SOPVehicle vehicle = new SOPVehicle();
604
605 bool errors = false;
606
607 vehicle.FromXml2(reader, out errors);
608 if (errors)
609 return null;
610
611 return vehicle;
612 }
613
614 private void FromXml2(XmlTextReader _reader, out bool errors)
615 {
616 errors = false;
617 reader = _reader;
618
619 Dictionary<string, Action> m_VehicleXmlProcessors
620 = new Dictionary<string, Action>();
621
622 m_VehicleXmlProcessors.Add("TYPE", ProcessXR_type);
623 m_VehicleXmlProcessors.Add("FLAGS", ProcessXR_flags);
624
625 // Linear properties
626 m_VehicleXmlProcessors.Add("LMDIR", ProcessXR_linearMotorDirection);
627 m_VehicleXmlProcessors.Add("LMFTIME", ProcessXR_linearFrictionTimescale);
628 m_VehicleXmlProcessors.Add("LMDTIME", ProcessXR_linearMotorDecayTimescale);
629 m_VehicleXmlProcessors.Add("LMTIME", ProcessXR_linearMotorTimescale);
630 m_VehicleXmlProcessors.Add("LMOFF", ProcessXR_linearMotorOffset);
631
632 //Angular properties
633 m_VehicleXmlProcessors.Add("AMDIR", ProcessXR_angularMotorDirection);
634 m_VehicleXmlProcessors.Add("AMTIME", ProcessXR_angularMotorTimescale);
635 m_VehicleXmlProcessors.Add("AMDTIME", ProcessXR_angularMotorDecayTimescale);
636 m_VehicleXmlProcessors.Add("AMFTIME", ProcessXR_angularFrictionTimescale);
637
638 //Deflection properties
639 m_VehicleXmlProcessors.Add("ADEFF", ProcessXR_angularDeflectionEfficiency);
640 m_VehicleXmlProcessors.Add("ADTIME", ProcessXR_angularDeflectionTimescale);
641 m_VehicleXmlProcessors.Add("LDEFF", ProcessXR_linearDeflectionEfficiency);
642 m_VehicleXmlProcessors.Add("LDTIME", ProcessXR_linearDeflectionTimescale);
643
644 //Banking properties
645 m_VehicleXmlProcessors.Add("BEFF", ProcessXR_bankingEfficiency);
646 m_VehicleXmlProcessors.Add("BMIX", ProcessXR_bankingMix);
647 m_VehicleXmlProcessors.Add("BTIME", ProcessXR_bankingTimescale);
648
649 //Hover and Buoyancy properties
650 m_VehicleXmlProcessors.Add("HHEI", ProcessXR_VhoverHeight);
651 m_VehicleXmlProcessors.Add("HEFF", ProcessXR_VhoverEfficiency);
652 m_VehicleXmlProcessors.Add("HTIME", ProcessXR_VhoverTimescale);
653
654 m_VehicleXmlProcessors.Add("VBUO", ProcessXR_VehicleBuoyancy);
655
656 //Attractor properties
657 m_VehicleXmlProcessors.Add("VAEFF", ProcessXR_verticalAttractionEfficiency);
658 m_VehicleXmlProcessors.Add("VATIME", ProcessXR_verticalAttractionTimescale);
659
660 m_VehicleXmlProcessors.Add("REF_FRAME", ProcessXR_referenceFrame);
661
662 vd = new VehicleData();
663
664 reader.ReadStartElement("Vehicle", String.Empty);
665
666 errors = EReadProcessors(
667 m_VehicleXmlProcessors,
668 reader);
669
670 reader.ReadEndElement();
671 reader = null;
672 }
673
674 private void ProcessXR_type()
675 {
676 vd.m_type = (Vehicle)XRint();
677 }
678 private void ProcessXR_flags()
679 {
680 vd.m_flags = (VehicleFlag)XRint();
681 }
682 // Linear properties
683 private void ProcessXR_linearMotorDirection()
684 {
685 vd.m_linearMotorDirection = XRvector();
686 }
687
688 private void ProcessXR_linearFrictionTimescale()
689 {
690 vd.m_linearFrictionTimescale = XRvector();
691 }
692
693 private void ProcessXR_linearMotorDecayTimescale()
694 {
695 vd.m_linearMotorDecayTimescale = XRfloat();
696 }
697 private void ProcessXR_linearMotorTimescale()
698 {
699 vd.m_linearMotorTimescale = XRfloat();
700 }
701 private void ProcessXR_linearMotorOffset()
702 {
703 vd.m_linearMotorOffset = XRvector();
704 }
705
706
707 //Angular properties
708 private void ProcessXR_angularMotorDirection()
709 {
710 vd.m_angularMotorDirection = XRvector();
711 }
712 private void ProcessXR_angularMotorTimescale()
713 {
714 vd.m_angularMotorTimescale = XRfloat();
715 }
716 private void ProcessXR_angularMotorDecayTimescale()
717 {
718 vd.m_angularMotorDecayTimescale = XRfloat();
719 }
720 private void ProcessXR_angularFrictionTimescale()
721 {
722 vd.m_angularFrictionTimescale = XRvector();
723 }
724
725 //Deflection properties
726 private void ProcessXR_angularDeflectionEfficiency()
727 {
728 vd.m_angularDeflectionEfficiency = XRfloat();
729 }
730 private void ProcessXR_angularDeflectionTimescale()
731 {
732 vd.m_angularDeflectionTimescale = XRfloat();
733 }
734 private void ProcessXR_linearDeflectionEfficiency()
735 {
736 vd.m_linearDeflectionEfficiency = XRfloat();
737 }
738 private void ProcessXR_linearDeflectionTimescale()
739 {
740 vd.m_linearDeflectionTimescale = XRfloat();
741 }
742
743 //Banking properties
744 private void ProcessXR_bankingEfficiency()
745 {
746 vd.m_bankingEfficiency = XRfloat();
747 }
748 private void ProcessXR_bankingMix()
749 {
750 vd.m_bankingMix = XRfloat();
751 }
752 private void ProcessXR_bankingTimescale()
753 {
754 vd.m_bankingTimescale = XRfloat();
755 }
756
757 //Hover and Buoyancy properties
758 private void ProcessXR_VhoverHeight()
759 {
760 vd.m_VhoverHeight = XRfloat();
761 }
762 private void ProcessXR_VhoverEfficiency()
763 {
764 vd.m_VhoverEfficiency = XRfloat();
765 }
766 private void ProcessXR_VhoverTimescale()
767 {
768 vd.m_VhoverTimescale = XRfloat();
769 }
770
771 private void ProcessXR_VehicleBuoyancy()
772 {
773 vd.m_VehicleBuoyancy = XRfloat();
774 }
775
776 //Attractor properties
777 private void ProcessXR_verticalAttractionEfficiency()
778 {
779 vd.m_verticalAttractionEfficiency = XRfloat();
780 }
781 private void ProcessXR_verticalAttractionTimescale()
782 {
783 vd.m_verticalAttractionTimescale = XRfloat();
784 }
785
786 private void ProcessXR_referenceFrame()
787 {
788 vd.m_referenceFrame = XRquat();
789 }
790 }
791}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 3b59dc4..863aa49 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Framework.Scenes
169 return false; 169 return false;
170 } 170 }
171 } 171 }
172 172
173 if (InventoryService.AddItem(item)) 173 if (InventoryService.AddItem(item))
174 { 174 {
175 int userlevel = 0; 175 int userlevel = 0;
@@ -324,8 +324,7 @@ namespace OpenSim.Region.Framework.Scenes
324 324
325 // Update item with new asset 325 // Update item with new asset
326 item.AssetID = asset.FullID; 326 item.AssetID = asset.FullID;
327 if (group.UpdateInventoryItem(item)) 327 group.UpdateInventoryItem(item);
328 remoteClient.SendAgentAlertMessage("Script saved", false);
329 328
330 part.SendPropertiesToClient(remoteClient); 329 part.SendPropertiesToClient(remoteClient);
331 330
@@ -336,12 +335,7 @@ namespace OpenSim.Region.Framework.Scenes
336 { 335 {
337 // Needs to determine which engine was running it and use that 336 // Needs to determine which engine was running it and use that
338 // 337 //
339 part.Inventory.CreateScriptInstance(item.ItemID, 0, false, DefaultScriptEngine, 0); 338 errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0);
340 errors = part.Inventory.GetScriptErrors(item.ItemID);
341 }
342 else
343 {
344 remoteClient.SendAgentAlertMessage("Script saved", false);
345 } 339 }
346 340
347 // Tell anyone managing scripts that a script has been reloaded/changed 341 // Tell anyone managing scripts that a script has been reloaded/changed
@@ -409,6 +403,7 @@ namespace OpenSim.Region.Framework.Scenes
409 403
410 if (UUID.Zero == transactionID) 404 if (UUID.Zero == transactionID)
411 { 405 {
406 item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255);
412 item.Name = itemUpd.Name; 407 item.Name = itemUpd.Name;
413 item.Description = itemUpd.Description; 408 item.Description = itemUpd.Description;
414 409
@@ -795,6 +790,8 @@ namespace OpenSim.Region.Framework.Scenes
795 return; 790 return;
796 } 791 }
797 792
793 if (newName == null) newName = item.Name;
794
798 AssetBase asset = AssetService.Get(item.AssetID.ToString()); 795 AssetBase asset = AssetService.Get(item.AssetID.ToString());
799 796
800 if (asset != null) 797 if (asset != null)
@@ -855,6 +852,24 @@ namespace OpenSim.Region.Framework.Scenes
855 } 852 }
856 853
857 /// <summary> 854 /// <summary>
855 /// Move an item within the agent's inventory, and leave a copy (used in making a new outfit)
856 /// </summary>
857 public void MoveInventoryItemsLeaveCopy(IClientAPI remoteClient, List<InventoryItemBase> items, UUID destfolder)
858 {
859 List<InventoryItemBase> moveitems = new List<InventoryItemBase>();
860 foreach (InventoryItemBase b in items)
861 {
862 CopyInventoryItem(remoteClient, 0, remoteClient.AgentId, b.ID, b.Folder, null);
863 InventoryItemBase n = InventoryService.GetItem(b);
864 n.Folder = destfolder;
865 moveitems.Add(n);
866 remoteClient.SendInventoryItemCreateUpdate(n, 0);
867 }
868
869 MoveInventoryItem(remoteClient, moveitems);
870 }
871
872 /// <summary>
858 /// Move an item within the agent's inventory. 873 /// Move an item within the agent's inventory.
859 /// </summary> 874 /// </summary>
860 /// <param name="remoteClient"></param> 875 /// <param name="remoteClient"></param>
@@ -1216,6 +1231,10 @@ namespace OpenSim.Region.Framework.Scenes
1216 { 1231 {
1217 SceneObjectPart part = GetSceneObjectPart(primLocalId); 1232 SceneObjectPart part = GetSceneObjectPart(primLocalId);
1218 1233
1234 // Can't move a null item
1235 if (itemId == UUID.Zero)
1236 return;
1237
1219 if (null == part) 1238 if (null == part)
1220 { 1239 {
1221 m_log.WarnFormat( 1240 m_log.WarnFormat(
@@ -1320,21 +1339,28 @@ namespace OpenSim.Region.Framework.Scenes
1320 return; 1339 return;
1321 } 1340 }
1322 1341
1323 if (part.OwnerID != destPart.OwnerID) 1342 // Can't transfer this
1343 //
1344 if (part.OwnerID != destPart.OwnerID && (srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
1345 return;
1346
1347 bool overrideNoMod = false;
1348 if ((part.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0)
1349 overrideNoMod = true;
1350
1351 if (part.OwnerID != destPart.OwnerID && (destPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
1324 { 1352 {
1325 // Source must have transfer permissions 1353 // object cannot copy items to an object owned by a different owner
1326 if ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Transfer) == 0) 1354 // unless llAllowInventoryDrop has been called
1327 return;
1328 1355
1329 // Object cannot copy items to an object owned by a different owner 1356 return;
1330 // unless llAllowInventoryDrop has been called on the destination
1331 if ((destPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) == 0)
1332 return;
1333 } 1357 }
1334 1358
1335 // must have both move and modify permission to put an item in an object 1359 // must have both move and modify permission to put an item in an object
1336 if ((part.OwnerMask & ((uint)PermissionMask.Move | (uint)PermissionMask.Modify)) == 0) 1360 if (((part.OwnerMask & (uint)PermissionMask.Modify) == 0) && (!overrideNoMod))
1361 {
1337 return; 1362 return;
1363 }
1338 1364
1339 TaskInventoryItem destTaskItem = new TaskInventoryItem(); 1365 TaskInventoryItem destTaskItem = new TaskInventoryItem();
1340 1366
@@ -1390,6 +1416,14 @@ namespace OpenSim.Region.Framework.Scenes
1390 1416
1391 public UUID MoveTaskInventoryItems(UUID destID, string category, SceneObjectPart host, List<UUID> items) 1417 public UUID MoveTaskInventoryItems(UUID destID, string category, SceneObjectPart host, List<UUID> items)
1392 { 1418 {
1419 SceneObjectPart destPart = GetSceneObjectPart(destID);
1420 if (destPart != null) // Move into a prim
1421 {
1422 foreach(UUID itemID in items)
1423 MoveTaskInventoryItem(destID, host, itemID);
1424 return destID; // Prim folder ID == prim ID
1425 }
1426
1393 InventoryFolderBase rootFolder = InventoryService.GetRootFolder(destID); 1427 InventoryFolderBase rootFolder = InventoryService.GetRootFolder(destID);
1394 1428
1395 UUID newFolderID = UUID.Random(); 1429 UUID newFolderID = UUID.Random();
@@ -1572,12 +1606,12 @@ namespace OpenSim.Region.Framework.Scenes
1572 AgentTransactionsModule.HandleTaskItemUpdateFromTransaction( 1606 AgentTransactionsModule.HandleTaskItemUpdateFromTransaction(
1573 remoteClient, part, transactionID, currentItem); 1607 remoteClient, part, transactionID, currentItem);
1574 1608
1575 if ((InventoryType)itemInfo.InvType == InventoryType.Notecard) 1609// if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
1576 remoteClient.SendAgentAlertMessage("Notecard saved", false); 1610// remoteClient.SendAgentAlertMessage("Notecard saved", false);
1577 else if ((InventoryType)itemInfo.InvType == InventoryType.LSL) 1611// else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
1578 remoteClient.SendAgentAlertMessage("Script saved", false); 1612// remoteClient.SendAgentAlertMessage("Script saved", false);
1579 else 1613// else
1580 remoteClient.SendAgentAlertMessage("Item saved", false); 1614// remoteClient.SendAgentAlertMessage("Item saved", false);
1581 } 1615 }
1582 1616
1583 // Base ALWAYS has move 1617 // Base ALWAYS has move
@@ -1760,7 +1794,7 @@ namespace OpenSim.Region.Framework.Scenes
1760 } 1794 }
1761 1795
1762 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, 1796 AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType,
1763 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"), 1797 Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n\n touch_start(integer num)\n {\n }\n}"),
1764 agentID); 1798 agentID);
1765 AssetService.Store(asset); 1799 AssetService.Store(asset);
1766 1800
@@ -1916,23 +1950,32 @@ namespace OpenSim.Region.Framework.Scenes
1916 // build a list of eligible objects 1950 // build a list of eligible objects
1917 List<uint> deleteIDs = new List<uint>(); 1951 List<uint> deleteIDs = new List<uint>();
1918 List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>(); 1952 List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>();
1919 1953 List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>();
1920 // Start with true for both, then remove the flags if objects
1921 // that we can't derez are part of the selection
1922 bool permissionToTake = true;
1923 bool permissionToTakeCopy = true;
1924 bool permissionToDelete = true;
1925 1954
1926 foreach (uint localID in localIDs) 1955 foreach (uint localID in localIDs)
1927 { 1956 {
1957 // Start with true for both, then remove the flags if objects
1958 // that we can't derez are part of the selection
1959 bool permissionToTake = true;
1960 bool permissionToTakeCopy = true;
1961 bool permissionToDelete = true;
1962
1928 // Invalid id 1963 // Invalid id
1929 SceneObjectPart part = GetSceneObjectPart(localID); 1964 SceneObjectPart part = GetSceneObjectPart(localID);
1930 if (part == null) 1965 if (part == null)
1966 {
1967 //Client still thinks the object exists, kill it
1968 deleteIDs.Add(localID);
1931 continue; 1969 continue;
1970 }
1932 1971
1933 // Already deleted by someone else 1972 // Already deleted by someone else
1934 if (part.ParentGroup.IsDeleted) 1973 if (part.ParentGroup.IsDeleted)
1974 {
1975 //Client still thinks the object exists, kill it
1976 deleteIDs.Add(localID);
1935 continue; 1977 continue;
1978 }
1936 1979
1937 // Can't delete child prims 1980 // Can't delete child prims
1938 if (part != part.ParentGroup.RootPart) 1981 if (part != part.ParentGroup.RootPart)
@@ -1940,8 +1983,8 @@ namespace OpenSim.Region.Framework.Scenes
1940 1983
1941 SceneObjectGroup grp = part.ParentGroup; 1984 SceneObjectGroup grp = part.ParentGroup;
1942 1985
1943 deleteIDs.Add(localID); 1986 // If child prims have invalid perms, fix them
1944 deleteGroups.Add(grp); 1987 grp.AdjustChildPrimPermissions();
1945 1988
1946 // If child prims have invalid perms, fix them 1989 // If child prims have invalid perms, fix them
1947 grp.AdjustChildPrimPermissions(); 1990 grp.AdjustChildPrimPermissions();
@@ -1962,81 +2005,193 @@ namespace OpenSim.Region.Framework.Scenes
1962 } 2005 }
1963 else 2006 else
1964 { 2007 {
1965 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId)) 2008 if (action == DeRezAction.TakeCopy)
2009 {
2010 if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId))
2011 permissionToTakeCopy = false;
2012 }
2013 else
2014 {
1966 permissionToTakeCopy = false; 2015 permissionToTakeCopy = false;
1967 2016 }
1968 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId)) 2017 if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId))
1969 permissionToTake = false; 2018 permissionToTake = false;
1970 2019
1971 if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId)) 2020 if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId))
1972 permissionToDelete = false; 2021 permissionToDelete = false;
1973 } 2022 }
1974 }
1975 2023
1976 // Handle god perms 2024 // Handle god perms
1977 if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId)) 2025 if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
1978 { 2026 {
1979 permissionToTake = true; 2027 permissionToTake = true;
1980 permissionToTakeCopy = true; 2028 permissionToTakeCopy = true;
1981 permissionToDelete = true; 2029 permissionToDelete = true;
1982 } 2030 }
1983 2031
1984 // If we're re-saving, we don't even want to delete 2032 // If we're re-saving, we don't even want to delete
1985 if (action == DeRezAction.SaveToExistingUserInventoryItem) 2033 if (action == DeRezAction.SaveToExistingUserInventoryItem)
1986 permissionToDelete = false; 2034 permissionToDelete = false;
1987 2035
1988 // if we want to take a copy, we also don't want to delete 2036 // if we want to take a copy, we also don't want to delete
1989 // Note: after this point, the permissionToTakeCopy flag 2037 // Note: after this point, the permissionToTakeCopy flag
1990 // becomes irrelevant. It already includes the permissionToTake 2038 // becomes irrelevant. It already includes the permissionToTake
1991 // permission and after excluding no copy items here, we can 2039 // permission and after excluding no copy items here, we can
1992 // just use that. 2040 // just use that.
1993 if (action == DeRezAction.TakeCopy) 2041 if (action == DeRezAction.TakeCopy)
1994 { 2042 {
1995 // If we don't have permission, stop right here 2043 // If we don't have permission, stop right here
1996 if (!permissionToTakeCopy) 2044 if (!permissionToTakeCopy)
1997 return; 2045 return;
1998 2046
1999 permissionToTake = true; 2047 permissionToTake = true;
2000 // Don't delete 2048 // Don't delete
2001 permissionToDelete = false; 2049 permissionToDelete = false;
2002 } 2050 }
2003 2051
2004 if (action == DeRezAction.Return) 2052 if (action == DeRezAction.Return)
2005 {
2006 if (remoteClient != null)
2007 { 2053 {
2008 if (Permissions.CanReturnObjects( 2054 if (remoteClient != null)
2009 null,
2010 remoteClient.AgentId,
2011 deleteGroups))
2012 { 2055 {
2013 permissionToTake = true; 2056 if (Permissions.CanReturnObjects(
2014 permissionToDelete = true; 2057 null,
2015 2058 remoteClient.AgentId,
2016 foreach (SceneObjectGroup g in deleteGroups) 2059 new List<SceneObjectGroup>() {grp}))
2017 { 2060 {
2018 AddReturn(g.OwnerID == g.GroupID ? g.LastOwnerID : g.OwnerID, g.Name, g.AbsolutePosition, "parcel owner return"); 2061 permissionToTake = true;
2062 permissionToDelete = true;
2063
2064 AddReturn(grp.OwnerID == grp.GroupID ? grp.LastOwnerID : grp.OwnerID, grp.Name, grp.AbsolutePosition, "parcel owner return");
2019 } 2065 }
2020 } 2066 }
2067 else // Auto return passes through here with null agent
2068 {
2069 permissionToTake = true;
2070 permissionToDelete = true;
2071 }
2021 } 2072 }
2022 else // Auto return passes through here with null agent 2073
2074 if (permissionToTake && (!permissionToDelete))
2075 takeGroups.Add(grp);
2076
2077 if (permissionToDelete)
2023 { 2078 {
2024 permissionToTake = true; 2079 if (permissionToTake)
2025 permissionToDelete = true; 2080 deleteGroups.Add(grp);
2081 deleteIDs.Add(grp.LocalId);
2026 } 2082 }
2027 } 2083 }
2028 2084
2029 if (permissionToTake && (action != DeRezAction.Delete || this.m_useTrashOnDelete)) 2085 SendKillObject(deleteIDs);
2086
2087 if (deleteGroups.Count > 0)
2030 { 2088 {
2089 foreach (SceneObjectGroup g in deleteGroups)
2090 deleteIDs.Remove(g.LocalId);
2091
2031 m_asyncSceneObjectDeleter.DeleteToInventory( 2092 m_asyncSceneObjectDeleter.DeleteToInventory(
2032 action, destinationID, deleteGroups, remoteClient, 2093 action, destinationID, deleteGroups, remoteClient,
2033 permissionToDelete); 2094 true);
2034 } 2095 }
2035 else if (permissionToDelete) 2096 if (takeGroups.Count > 0)
2097 {
2098 m_asyncSceneObjectDeleter.DeleteToInventory(
2099 action, destinationID, takeGroups, remoteClient,
2100 false);
2101 }
2102 if (deleteIDs.Count > 0)
2036 { 2103 {
2037 foreach (SceneObjectGroup g in deleteGroups) 2104 foreach (SceneObjectGroup g in deleteGroups)
2038 DeleteSceneObject(g, false); 2105 DeleteSceneObject(g, true);
2106 }
2107 }
2108
2109 public UUID attachObjectAssetStore(IClientAPI remoteClient, SceneObjectGroup grp, UUID AgentId, out UUID itemID)
2110 {
2111 itemID = UUID.Zero;
2112 if (grp != null)
2113 {
2114 Vector3 inventoryStoredPosition = new Vector3
2115 (((grp.AbsolutePosition.X > (int)Constants.RegionSize)
2116 ? 250
2117 : grp.AbsolutePosition.X)
2118 ,
2119 (grp.AbsolutePosition.X > (int)Constants.RegionSize)
2120 ? 250
2121 : grp.AbsolutePosition.X,
2122 grp.AbsolutePosition.Z);
2123
2124 Vector3 originalPosition = grp.AbsolutePosition;
2125
2126 grp.AbsolutePosition = inventoryStoredPosition;
2127
2128 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
2129
2130 grp.AbsolutePosition = originalPosition;
2131
2132 AssetBase asset = CreateAsset(
2133 grp.GetPartName(grp.LocalId),
2134 grp.GetPartDescription(grp.LocalId),
2135 (sbyte)AssetType.Object,
2136 Utils.StringToBytes(sceneObjectXml),
2137 remoteClient.AgentId);
2138 AssetService.Store(asset);
2139
2140 InventoryItemBase item = new InventoryItemBase();
2141 item.CreatorId = grp.RootPart.CreatorID.ToString();
2142 item.CreatorData = grp.RootPart.CreatorData;
2143 item.Owner = remoteClient.AgentId;
2144 item.ID = UUID.Random();
2145 item.AssetID = asset.FullID;
2146 item.Description = asset.Description;
2147 item.Name = asset.Name;
2148 item.AssetType = asset.Type;
2149 item.InvType = (int)InventoryType.Object;
2150
2151 InventoryFolderBase folder = InventoryService.GetFolderForType(remoteClient.AgentId, AssetType.Object);
2152 if (folder != null)
2153 item.Folder = folder.ID;
2154 else // oopsies
2155 item.Folder = UUID.Zero;
2156
2157 // Set up base perms properly
2158 uint permsBase = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify);
2159 permsBase &= grp.RootPart.BaseMask;
2160 permsBase |= (uint)PermissionMask.Move;
2161
2162 // Make sure we don't lock it
2163 grp.RootPart.NextOwnerMask |= (uint)PermissionMask.Move;
2164
2165 if ((remoteClient.AgentId != grp.RootPart.OwnerID) && Permissions.PropagatePermissions())
2166 {
2167 item.BasePermissions = permsBase & grp.RootPart.NextOwnerMask;
2168 item.CurrentPermissions = permsBase & grp.RootPart.NextOwnerMask;
2169 item.NextPermissions = permsBase & grp.RootPart.NextOwnerMask;
2170 item.EveryOnePermissions = permsBase & grp.RootPart.EveryoneMask & grp.RootPart.NextOwnerMask;
2171 item.GroupPermissions = permsBase & grp.RootPart.GroupMask & grp.RootPart.NextOwnerMask;
2172 }
2173 else
2174 {
2175 item.BasePermissions = permsBase;
2176 item.CurrentPermissions = permsBase & grp.RootPart.OwnerMask;
2177 item.NextPermissions = permsBase & grp.RootPart.NextOwnerMask;
2178 item.EveryOnePermissions = permsBase & grp.RootPart.EveryoneMask;
2179 item.GroupPermissions = permsBase & grp.RootPart.GroupMask;
2180 }
2181 item.CreationDate = Util.UnixTimeSinceEpoch();
2182
2183 // sets itemID so client can show item as 'attached' in inventory
2184 grp.FromItemID = item.ID;
2185
2186 if (AddInventoryItem(item))
2187 remoteClient.SendInventoryItemCreateUpdate(item, 0);
2188 else
2189 m_dialogModule.SendAlertToUser(remoteClient, "Operation failed");
2190
2191 itemID = item.ID;
2192 return item.AssetID;
2039 } 2193 }
2194 return UUID.Zero;
2040 } 2195 }
2041 2196
2042 /// <summary> 2197 /// <summary>
@@ -2166,6 +2321,9 @@ namespace OpenSim.Region.Framework.Scenes
2166 2321
2167 public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running) 2322 public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running)
2168 { 2323 {
2324 if (!Permissions.CanEditScript(itemID, objectID, controllingClient.AgentId))
2325 return;
2326
2169 SceneObjectPart part = GetSceneObjectPart(objectID); 2327 SceneObjectPart part = GetSceneObjectPart(objectID);
2170 if (part == null) 2328 if (part == null)
2171 return; 2329 return;
@@ -2222,7 +2380,10 @@ namespace OpenSim.Region.Framework.Scenes
2222 } 2380 }
2223 else 2381 else
2224 { 2382 {
2225 if (!Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)) 2383 if (!Permissions.IsGod(remoteClient.AgentId) && sog.OwnerID != remoteClient.AgentId)
2384 continue;
2385
2386 if (!Permissions.CanTransferObject(sog.UUID, groupID))
2226 continue; 2387 continue;
2227 2388
2228 if (sog.GroupID != groupID) 2389 if (sog.GroupID != groupID)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 6e53951..7e781c3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -38,9 +38,8 @@ namespace OpenSim.Region.Framework.Scenes
38{ 38{
39 public partial class Scene 39 public partial class Scene
40 { 40 {
41 41 public void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
42 protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName, 42 UUID fromID, bool fromAgent, bool broadcast, UUID destination)
43 UUID fromID, UUID targetID, bool fromAgent, bool broadcast)
44 { 43 {
45 OSChatMessage args = new OSChatMessage(); 44 OSChatMessage args = new OSChatMessage();
46 45
@@ -50,6 +49,7 @@ namespace OpenSim.Region.Framework.Scenes
50 args.Position = fromPos; 49 args.Position = fromPos;
51 args.SenderUUID = fromID; 50 args.SenderUUID = fromID;
52 args.Scene = this; 51 args.Scene = this;
52 args.Destination = destination;
53 53
54 if (fromAgent) 54 if (fromAgent)
55 { 55 {
@@ -64,18 +64,18 @@ namespace OpenSim.Region.Framework.Scenes
64 } 64 }
65 65
66 args.From = fromName; 66 args.From = fromName;
67 args.TargetUUID = targetID; 67 //args.
68 68
69 if (broadcast) 69 if (broadcast)
70 EventManager.TriggerOnChatBroadcast(this, args); 70 EventManager.TriggerOnChatBroadcast(this, args);
71 else 71 else
72 EventManager.TriggerOnChatFromWorld(this, args); 72 EventManager.TriggerOnChatFromWorld(this, args);
73 } 73 }
74 74
75 protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName, 75 protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
76 UUID fromID, bool fromAgent, bool broadcast) 76 UUID fromID, bool fromAgent, bool broadcast)
77 { 77 {
78 SimChat(message, type, channel, fromPos, fromName, fromID, UUID.Zero, fromAgent, broadcast); 78 SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, broadcast, UUID.Zero);
79 } 79 }
80 80
81 /// <summary> 81 /// <summary>
@@ -115,19 +115,6 @@ namespace OpenSim.Region.Framework.Scenes
115 { 115 {
116 SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, true); 116 SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, true);
117 } 117 }
118 /// <summary>
119 ///
120 /// </summary>
121 /// <param name="message"></param>
122 /// <param name="type"></param>
123 /// <param name="fromPos"></param>
124 /// <param name="fromName"></param>
125 /// <param name="fromAgentID"></param>
126 /// <param name="targetID"></param>
127 public void SimChatToAgent(UUID targetID, byte[] message, Vector3 fromPos, string fromName, UUID fromID, bool fromAgent)
128 {
129 SimChat(message, ChatTypeEnum.Say, 0, fromPos, fromName, fromID, targetID, fromAgent, false);
130 }
131 118
132 /// <summary> 119 /// <summary>
133 /// Invoked when the client requests a prim. 120 /// Invoked when the client requests a prim.
@@ -149,27 +136,47 @@ namespace OpenSim.Region.Framework.Scenes
149 /// <param name="remoteClient"></param> 136 /// <param name="remoteClient"></param>
150 public void SelectPrim(uint primLocalID, IClientAPI remoteClient) 137 public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
151 { 138 {
139 /*
140 SceneObjectPart part = GetSceneObjectPart(primLocalID);
141
142 if (null == part)
143 return;
144
145 if (part.IsRoot)
146 {
147 SceneObjectGroup sog = part.ParentGroup;
148 sog.SendPropertiesToClient(remoteClient);
149
150 // A prim is only tainted if it's allowed to be edited by the person clicking it.
151 if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)
152 || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId))
153 {
154 sog.IsSelected = true;
155 EventManager.TriggerParcelPrimCountTainted();
156 }
157 }
158 else
159 {
160 part.SendPropertiesToClient(remoteClient);
161 }
162 */
152 SceneObjectPart part = GetSceneObjectPart(primLocalID); 163 SceneObjectPart part = GetSceneObjectPart(primLocalID);
153 164
154 if (null == part) 165 if (null == part)
155 return; 166 return;
156 167
157 if (part.IsRoot) 168 SceneObjectGroup sog = part.ParentGroup;
158 { 169 if (sog == null)
159 SceneObjectGroup sog = part.ParentGroup; 170 return;
160 sog.SendPropertiesToClient(remoteClient);
161 sog.IsSelected = true;
162 171
163 // A prim is only tainted if it's allowed to be edited by the person clicking it. 172 part.SendPropertiesToClient(remoteClient);
164 if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId) 173
165 || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId)) 174 // A prim is only tainted if it's allowed to be edited by the person clicking it.
166 { 175 if (Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)
167 EventManager.TriggerParcelPrimCountTainted(); 176 || Permissions.CanMoveObject(sog.UUID, remoteClient.AgentId))
168 }
169 }
170 else
171 { 177 {
172 part.SendPropertiesToClient(remoteClient); 178 part.IsSelected = true;
179 EventManager.TriggerParcelPrimCountTainted();
173 } 180 }
174 } 181 }
175 182
@@ -222,7 +229,7 @@ namespace OpenSim.Region.Framework.Scenes
222 SceneObjectPart part = GetSceneObjectPart(primLocalID); 229 SceneObjectPart part = GetSceneObjectPart(primLocalID);
223 if (part == null) 230 if (part == null)
224 return; 231 return;
225 232 /*
226 // A deselect packet contains all the local prims being deselected. However, since selection is still 233 // A deselect packet contains all the local prims being deselected. However, since selection is still
227 // group based we only want the root prim to trigger a full update - otherwise on objects with many prims 234 // group based we only want the root prim to trigger a full update - otherwise on objects with many prims
228 // we end up sending many duplicate ObjectUpdates 235 // we end up sending many duplicate ObjectUpdates
@@ -235,7 +242,9 @@ namespace OpenSim.Region.Framework.Scenes
235 // handled by group, but by prim. Legacy cruft. 242 // handled by group, but by prim. Legacy cruft.
236 // TODO: Make selection flagging per prim! 243 // TODO: Make selection flagging per prim!
237 // 244 //
238 part.ParentGroup.IsSelected = false; 245 if (Permissions.CanEditObject(part.ParentGroup.UUID, remoteClient.AgentId)
246 || Permissions.CanMoveObject(part.ParentGroup.UUID, remoteClient.AgentId))
247 part.ParentGroup.IsSelected = false;
239 248
240 if (part.ParentGroup.IsAttachment) 249 if (part.ParentGroup.IsAttachment)
241 isAttachment = true; 250 isAttachment = true;
@@ -255,6 +264,22 @@ namespace OpenSim.Region.Framework.Scenes
255 part.UUID, remoteClient.AgentId)) 264 part.UUID, remoteClient.AgentId))
256 EventManager.TriggerParcelPrimCountTainted(); 265 EventManager.TriggerParcelPrimCountTainted();
257 } 266 }
267 */
268
269 bool oldgprSelect = part.ParentGroup.IsSelected;
270
271 // This is wrong, wrong, wrong. Selection should not be
272 // handled by group, but by prim. Legacy cruft.
273 // TODO: Make selection flagging per prim!
274 //
275 if (Permissions.CanEditObject(part.ParentGroup.UUID, remoteClient.AgentId)
276 || Permissions.CanMoveObject(part.ParentGroup.UUID, remoteClient.AgentId))
277 {
278 part.IsSelected = false;
279 if (!part.ParentGroup.IsAttachment && oldgprSelect != part.ParentGroup.IsSelected)
280 EventManager.TriggerParcelPrimCountTainted();
281 }
282
258 } 283 }
259 284
260 public virtual void ProcessMoneyTransferRequest(UUID source, UUID destination, int amount, 285 public virtual void ProcessMoneyTransferRequest(UUID source, UUID destination, int amount,
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2b4dea4..fcc2953 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -146,6 +146,7 @@ namespace OpenSim.Region.Framework.Scenes
146 // TODO: need to figure out how allow client agents but deny 146 // TODO: need to figure out how allow client agents but deny
147 // root agents when ACL denies access to root agent 147 // root agents when ACL denies access to root agent
148 public bool m_strictAccessControl = true; 148 public bool m_strictAccessControl = true;
149 public bool m_seeIntoBannedRegion = false;
149 public int MaxUndoCount = 5; 150 public int MaxUndoCount = 5;
150 151
151 // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet; 152 // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet;
@@ -162,12 +163,14 @@ namespace OpenSim.Region.Framework.Scenes
162 163
163 protected int m_splitRegionID; 164 protected int m_splitRegionID;
164 protected Timer m_restartWaitTimer = new Timer(); 165 protected Timer m_restartWaitTimer = new Timer();
166 protected Timer m_timerWatchdog = new Timer();
165 protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>(); 167 protected List<RegionInfo> m_regionRestartNotifyList = new List<RegionInfo>();
166 protected List<RegionInfo> m_neighbours = new List<RegionInfo>(); 168 protected List<RegionInfo> m_neighbours = new List<RegionInfo>();
167 protected string m_simulatorVersion = "OpenSimulator Server"; 169 protected string m_simulatorVersion = "OpenSimulator Server";
168 protected ModuleLoader m_moduleLoader; 170 protected ModuleLoader m_moduleLoader;
169 protected AgentCircuitManager m_authenticateHandler; 171 protected AgentCircuitManager m_authenticateHandler;
170 protected SceneCommunicationService m_sceneGridService; 172 protected SceneCommunicationService m_sceneGridService;
173 protected ISnmpModule m_snmpService = null;
171 174
172 protected ISimulationDataService m_SimulationDataService; 175 protected ISimulationDataService m_SimulationDataService;
173 protected IEstateDataService m_EstateDataService; 176 protected IEstateDataService m_EstateDataService;
@@ -230,8 +233,8 @@ namespace OpenSim.Region.Framework.Scenes
230 private int m_update_presences = 1; // Update scene presence movements 233 private int m_update_presences = 1; // Update scene presence movements
231 private int m_update_events = 1; 234 private int m_update_events = 1;
232 private int m_update_backup = 200; 235 private int m_update_backup = 200;
233 private int m_update_terrain = 50; 236 private int m_update_terrain = 1000;
234// private int m_update_land = 1; 237 private int m_update_land = 10;
235 private int m_update_coarse_locations = 50; 238 private int m_update_coarse_locations = 50;
236 239
237 private int agentMS; 240 private int agentMS;
@@ -244,13 +247,13 @@ namespace OpenSim.Region.Framework.Scenes
244 private int backupMS; 247 private int backupMS;
245 private int terrainMS; 248 private int terrainMS;
246 private int landMS; 249 private int landMS;
247 private int spareMS;
248 250
249 /// <summary> 251 /// <summary>
250 /// Tick at which the last frame was processed. 252 /// Tick at which the last frame was processed.
251 /// </summary> 253 /// </summary>
252 private int m_lastFrameTick; 254 private int m_lastFrameTick;
253 255
256 public bool CombineRegions = false;
254 /// <summary> 257 /// <summary>
255 /// Tick at which the last maintenance run occurred. 258 /// Tick at which the last maintenance run occurred.
256 /// </summary> 259 /// </summary>
@@ -281,6 +284,11 @@ namespace OpenSim.Region.Framework.Scenes
281 /// </summary> 284 /// </summary>
282 private int m_LastLogin; 285 private int m_LastLogin;
283 286
287 private int m_lastIncoming;
288 private int m_lastOutgoing;
289 private int m_hbRestarts = 0;
290
291
284 /// <summary> 292 /// <summary>
285 /// Thread that runs the scene loop. 293 /// Thread that runs the scene loop.
286 /// </summary> 294 /// </summary>
@@ -296,7 +304,7 @@ namespace OpenSim.Region.Framework.Scenes
296 private volatile bool m_shuttingDown; 304 private volatile bool m_shuttingDown;
297 305
298// private int m_lastUpdate; 306// private int m_lastUpdate;
299// private bool m_firstHeartbeat = true; 307 private bool m_firstHeartbeat = true;
300 308
301 private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time; 309 private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time;
302 private bool m_reprioritizationEnabled = true; 310 private bool m_reprioritizationEnabled = true;
@@ -341,6 +349,19 @@ namespace OpenSim.Region.Framework.Scenes
341 get { return m_sceneGridService; } 349 get { return m_sceneGridService; }
342 } 350 }
343 351
352 public ISnmpModule SnmpService
353 {
354 get
355 {
356 if (m_snmpService == null)
357 {
358 m_snmpService = RequestModuleInterface<ISnmpModule>();
359 }
360
361 return m_snmpService;
362 }
363 }
364
344 public ISimulationDataService SimulationDataService 365 public ISimulationDataService SimulationDataService
345 { 366 {
346 get 367 get
@@ -640,6 +661,8 @@ namespace OpenSim.Region.Framework.Scenes
640 m_SimulationDataService = simDataService; 661 m_SimulationDataService = simDataService;
641 m_EstateDataService = estateDataService; 662 m_EstateDataService = estateDataService;
642 m_regionHandle = RegionInfo.RegionHandle; 663 m_regionHandle = RegionInfo.RegionHandle;
664 m_lastIncoming = 0;
665 m_lastOutgoing = 0;
643 666
644 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); 667 m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
645 m_asyncSceneObjectDeleter.Enabled = true; 668 m_asyncSceneObjectDeleter.Enabled = true;
@@ -722,131 +745,142 @@ namespace OpenSim.Region.Framework.Scenes
722 745
723 // Region config overrides global config 746 // Region config overrides global config
724 // 747 //
725 if (m_config.Configs["Startup"] != null) 748 try
726 { 749 {
727 IConfig startupConfig = m_config.Configs["Startup"]; 750 if (m_config.Configs["Startup"] != null)
728 751 {
729 StartDisabled = startupConfig.GetBoolean("StartDisabled", false); 752 IConfig startupConfig = m_config.Configs["Startup"];
730 753
731 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance", m_defaultDrawDistance); 754 StartDisabled = startupConfig.GetBoolean("StartDisabled", false);
732 m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup);
733 if (!m_useBackup)
734 m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName);
735
736 //Animation states
737 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
738 755
739 PhysicalPrims = startupConfig.GetBoolean("physical_prim", PhysicalPrims); 756 m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance",m_defaultDrawDistance);
740 CollidablePrims = startupConfig.GetBoolean("collidable_prim", CollidablePrims); 757 m_useBackup = startupConfig.GetBoolean("UseSceneBackup", m_useBackup);
758 if (!m_useBackup)
759 m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName);
760
761 //Animation states
762 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
741 763
742 m_minNonphys = startupConfig.GetFloat("NonphysicalPrimMin", m_minNonphys); 764 PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
743 if (RegionInfo.NonphysPrimMin > 0) 765 CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
744 {
745 m_minNonphys = RegionInfo.NonphysPrimMin;
746 }
747 766
748 m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys); 767 m_minNonphys = startupConfig.GetFloat("NonphysicalPrimMin", m_minNonphys);
749 if (RegionInfo.NonphysPrimMax > 0) 768 if (RegionInfo.NonphysPrimMin > 0)
750 { 769 {
751 m_maxNonphys = RegionInfo.NonphysPrimMax; 770 m_minNonphys = RegionInfo.NonphysPrimMin;
752 } 771 }
753 772
754 m_minPhys = startupConfig.GetFloat("PhysicalPrimMin", m_minPhys); 773 m_maxNonphys = startupConfig.GetFloat("NonphysicalPrimMax", m_maxNonphys);
755 if (RegionInfo.PhysPrimMin > 0) 774 if (RegionInfo.NonphysPrimMax > 0)
756 { 775 {
757 m_minPhys = RegionInfo.PhysPrimMin; 776 m_maxNonphys = RegionInfo.NonphysPrimMax;
758 } 777 }
759 778
760 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys); 779 m_minPhys = startupConfig.GetFloat("PhysicalPrimMin", m_minPhys);
761 if (RegionInfo.PhysPrimMax > 0) 780 if (RegionInfo.PhysPrimMin > 0)
762 { 781 {
763 m_maxPhys = RegionInfo.PhysPrimMax; 782 m_minPhys = RegionInfo.PhysPrimMin;
764 } 783 }
765 784
766 // Here, if clamping is requested in either global or 785 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys);
767 // local config, it will be used
768 //
769 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize);
770 if (RegionInfo.ClampPrimSize)
771 {
772 m_clampPrimSize = true;
773 }
774 786
775 m_useTrashOnDelete = startupConfig.GetBoolean("UseTrashOnDelete", m_useTrashOnDelete); 787 if (RegionInfo.PhysPrimMax > 0)
776 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); 788 {
777 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); 789 m_maxPhys = RegionInfo.PhysPrimMax;
778 m_dontPersistBefore = 790 }
779 startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
780 m_dontPersistBefore *= 10000000;
781 m_persistAfter =
782 startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE);
783 m_persistAfter *= 10000000;
784 791
785 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); 792 SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest");
793 TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false);
786 794
787 SpawnPointRouting = startupConfig.GetString("SpawnPointRouting", "closest"); 795 // Here, if clamping is requested in either global or
788 TelehubAllowLandmarks = startupConfig.GetBoolean("TelehubAllowLandmark", false); 796 // local config, it will be used
797 //
798 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize);
799 if (RegionInfo.ClampPrimSize)
800 {
801 m_clampPrimSize = true;
802 }
789 803
790 IConfig packetConfig = m_config.Configs["PacketPool"]; 804 m_useTrashOnDelete = startupConfig.GetBoolean("UseTrashOnDelete",m_useTrashOnDelete);
791 if (packetConfig != null) 805 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
792 { 806 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
793 PacketPool.Instance.RecyclePackets = packetConfig.GetBoolean("RecyclePackets", true); 807 m_dontPersistBefore =
794 PacketPool.Instance.RecycleDataBlocks = packetConfig.GetBoolean("RecycleDataBlocks", true); 808 startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
795 } 809 m_dontPersistBefore *= 10000000;
810 m_persistAfter =
811 startupConfig.GetLong("MaximumTimeBeforePersistenceConsidered", DEFAULT_MAX_TIME_FOR_PERSISTENCE);
812 m_persistAfter *= 10000000;
813
814 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
815 m_log.InfoFormat("[SCENE]: Default script engine {0}", m_defaultScriptEngine);
816
817 IConfig packetConfig = m_config.Configs["PacketPool"];
818 if (packetConfig != null)
819 {
820 PacketPool.Instance.RecyclePackets = packetConfig.GetBoolean("RecyclePackets", true);
821 PacketPool.Instance.RecycleDataBlocks = packetConfig.GetBoolean("RecycleDataBlocks", true);
822 }
796 823
797 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); 824 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
825 m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion);
826 CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
798 827
799 m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true); 828 m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true);
800 if (m_generateMaptiles) 829 if (m_generateMaptiles)
801 {
802 int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0);
803 if (maptileRefresh != 0)
804 { 830 {
805 m_mapGenerationTimer.Interval = maptileRefresh * 1000; 831 int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0);
806 m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister; 832 if (maptileRefresh != 0)
807 m_mapGenerationTimer.AutoReset = true; 833 {
808 m_mapGenerationTimer.Start(); 834 m_mapGenerationTimer.Interval = maptileRefresh * 1000;
835 m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister;
836 m_mapGenerationTimer.AutoReset = true;
837 m_mapGenerationTimer.Start();
838 }
809 } 839 }
810 } 840 else
811 else
812 {
813 string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
814 UUID tileID;
815
816 if (UUID.TryParse(tile, out tileID))
817 { 841 {
818 RegionInfo.RegionSettings.TerrainImageID = tileID; 842 string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
843 UUID tileID;
844
845 if (UUID.TryParse(tile, out tileID))
846 {
847 RegionInfo.RegionSettings.TerrainImageID = tileID;
848 }
819 } 849 }
820 }
821 850
822 string grant = startupConfig.GetString("AllowedClients", String.Empty); 851 string grant = startupConfig.GetString("AllowedClients", String.Empty);
823 if (grant.Length > 0) 852 if (grant.Length > 0)
824 {
825 foreach (string viewer in grant.Split('|'))
826 { 853 {
827 m_AllowedViewers.Add(viewer.Trim().ToLower()); 854 foreach (string viewer in grant.Split(','))
855 {
856 m_AllowedViewers.Add(viewer.Trim().ToLower());
857 }
828 } 858 }
829 }
830 859
831 grant = startupConfig.GetString("BannedClients", String.Empty); 860 grant = startupConfig.GetString("BannedClients", String.Empty);
832 if (grant.Length > 0) 861 if (grant.Length > 0)
833 {
834 foreach (string viewer in grant.Split('|'))
835 { 862 {
836 m_BannedViewers.Add(viewer.Trim().ToLower()); 863 foreach (string viewer in grant.Split(','))
864 {
865 m_BannedViewers.Add(viewer.Trim().ToLower());
866 }
837 } 867 }
838 }
839 868
840 MinFrameTime = startupConfig.GetFloat( "MinFrameTime", MinFrameTime); 869 MinFrameTime = startupConfig.GetFloat( "MinFrameTime", MinFrameTime);
841 m_update_backup = startupConfig.GetInt( "UpdateStorageEveryNFrames", m_update_backup); 870 m_update_backup = startupConfig.GetInt( "UpdateStorageEveryNFrames", m_update_backup);
842 m_update_coarse_locations = startupConfig.GetInt( "UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations); 871 m_update_coarse_locations = startupConfig.GetInt( "UpdateCoarseLocationsEveryNFrames", m_update_coarse_locations);
843 m_update_entitymovement = startupConfig.GetInt( "UpdateEntityMovementEveryNFrames", m_update_entitymovement); 872 m_update_entitymovement = startupConfig.GetInt( "UpdateEntityMovementEveryNFrames", m_update_entitymovement);
844 m_update_events = startupConfig.GetInt( "UpdateEventsEveryNFrames", m_update_events); 873 m_update_events = startupConfig.GetInt( "UpdateEventsEveryNFrames", m_update_events);
845 m_update_objects = startupConfig.GetInt( "UpdateObjectsEveryNFrames", m_update_objects); 874 m_update_objects = startupConfig.GetInt( "UpdateObjectsEveryNFrames", m_update_objects);
846 m_update_physics = startupConfig.GetInt( "UpdatePhysicsEveryNFrames", m_update_physics); 875 m_update_physics = startupConfig.GetInt( "UpdatePhysicsEveryNFrames", m_update_physics);
847 m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences); 876 m_update_presences = startupConfig.GetInt( "UpdateAgentsEveryNFrames", m_update_presences);
848 m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain); 877 m_update_terrain = startupConfig.GetInt( "UpdateTerrainEveryNFrames", m_update_terrain);
849 m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning); 878 m_update_temp_cleaning = startupConfig.GetInt( "UpdateTempCleaningEveryNFrames", m_update_temp_cleaning);
879 }
880 }
881 catch (Exception e)
882 {
883 m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString());
850 } 884 }
851 885
852 // FIXME: Ultimately this should be in a module. 886 // FIXME: Ultimately this should be in a module.
@@ -889,6 +923,8 @@ namespace OpenSim.Region.Framework.Scenes
889 StatsReporter = new SimStatsReporter(this); 923 StatsReporter = new SimStatsReporter(this);
890 StatsReporter.OnSendStatsResult += SendSimStatsPackets; 924 StatsReporter.OnSendStatsResult += SendSimStatsPackets;
891 StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats; 925 StatsReporter.OnStatsIncorrect += m_sceneGraph.RecalculateStats;
926
927 MainConsole.Instance.Commands.AddCommand("scene", false, "gc collect", "gc collect", "gc collect", "Cause the garbage collector to make a single pass", HandleGcCollect);
892 } 928 }
893 929
894 public Scene(RegionInfo regInfo) : base(regInfo) 930 public Scene(RegionInfo regInfo) : base(regInfo)
@@ -1291,7 +1327,22 @@ namespace OpenSim.Region.Framework.Scenes
1291 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); 1327 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
1292 if (m_heartbeatThread != null) 1328 if (m_heartbeatThread != null)
1293 { 1329 {
1330 m_hbRestarts++;
1331 if(m_hbRestarts > 10)
1332 Environment.Exit(1);
1333 m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName);
1334
1335//int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
1336//System.Diagnostics.Process proc = new System.Diagnostics.Process();
1337//proc.EnableRaisingEvents=false;
1338//proc.StartInfo.FileName = "/bin/kill";
1339//proc.StartInfo.Arguments = "-QUIT " + pid.ToString();
1340//proc.Start();
1341//proc.WaitForExit();
1342//Thread.Sleep(1000);
1343//Environment.Exit(1);
1294 m_heartbeatThread.Abort(); 1344 m_heartbeatThread.Abort();
1345 Watchdog.AbortThread(m_heartbeatThread.ManagedThreadId);
1295 m_heartbeatThread = null; 1346 m_heartbeatThread = null;
1296 } 1347 }
1297// m_lastUpdate = Util.EnvironmentTickCount(); 1348// m_lastUpdate = Util.EnvironmentTickCount();
@@ -1438,16 +1489,20 @@ namespace OpenSim.Region.Framework.Scenes
1438 endFrame = Frame + frames; 1489 endFrame = Frame + frames;
1439 1490
1440 float physicsFPS = 0f; 1491 float physicsFPS = 0f;
1441 int previousFrameTick, tmpMS; 1492 int tmpMS;
1442 int maintc = Util.EnvironmentTickCount(); 1493 int previousFrameTick;
1494 int maintc;
1495 int sleepMS;
1496 int framestart;
1443 1497
1444 while (!m_shuttingDown && (endFrame == null || Frame < endFrame)) 1498 while (!m_shuttingDown && (endFrame == null || Frame < endFrame))
1445 { 1499 {
1500 framestart = Util.EnvironmentTickCount();
1446 ++Frame; 1501 ++Frame;
1447 1502
1448// m_log.DebugFormat("[SCENE]: Processing frame {0} in {1}", Frame, RegionInfo.RegionName); 1503// m_log.DebugFormat("[SCENE]: Processing frame {0} in {1}", Frame, RegionInfo.RegionName);
1449 1504
1450 agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = spareMS = 0; 1505 agentMS = tempOnRezMS = eventMS = backupMS = terrainMS = landMS = 0;
1451 1506
1452 try 1507 try
1453 { 1508 {
@@ -1499,6 +1554,7 @@ namespace OpenSim.Region.Framework.Scenes
1499 m_sceneGraph.UpdatePresences(); 1554 m_sceneGraph.UpdatePresences();
1500 1555
1501 agentMS += Util.EnvironmentTickCountSubtract(tmpMS); 1556 agentMS += Util.EnvironmentTickCountSubtract(tmpMS);
1557
1502 1558
1503 // Delete temp-on-rez stuff 1559 // Delete temp-on-rez stuff
1504 if (Frame % m_update_temp_cleaning == 0 && !m_cleaningTemps) 1560 if (Frame % m_update_temp_cleaning == 0 && !m_cleaningTemps)
@@ -1580,34 +1636,37 @@ namespace OpenSim.Region.Framework.Scenes
1580 1636
1581 Watchdog.UpdateThread(); 1637 Watchdog.UpdateThread();
1582 1638
1639 otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS;
1640
1641 StatsReporter.AddPhysicsFPS(physicsFPS);
1642 StatsReporter.AddTimeDilation(TimeDilation);
1643 StatsReporter.AddFPS(1);
1644
1645 StatsReporter.addAgentMS(agentMS);
1646 StatsReporter.addPhysicsMS(physicsMS + physicsMS2);
1647 StatsReporter.addOtherMS(otherMS);
1648 StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
1649
1583 previousFrameTick = m_lastFrameTick; 1650 previousFrameTick = m_lastFrameTick;
1584 m_lastFrameTick = Util.EnvironmentTickCount(); 1651 m_lastFrameTick = Util.EnvironmentTickCount();
1585 tmpMS = Util.EnvironmentTickCountSubtract(m_lastFrameTick, maintc); 1652 tmpMS = Util.EnvironmentTickCountSubtract(m_lastFrameTick, framestart);
1586 tmpMS = (int)(MinFrameTime * 1000) - tmpMS; 1653 tmpMS = (int)(MinFrameTime * 1000) - tmpMS;
1587 1654
1655 m_firstHeartbeat = false;
1656
1657 sleepMS = Util.EnvironmentTickCount();
1658
1588 if (tmpMS > 0) 1659 if (tmpMS > 0)
1589 {
1590 Thread.Sleep(tmpMS); 1660 Thread.Sleep(tmpMS);
1591 spareMS += tmpMS;
1592 }
1593
1594 frameMS = Util.EnvironmentTickCountSubtract(maintc);
1595 maintc = Util.EnvironmentTickCount();
1596 1661
1597 otherMS = tempOnRezMS + eventMS + backupMS + terrainMS + landMS; 1662 sleepMS = Util.EnvironmentTickCountSubtract(sleepMS);
1663 frameMS = Util.EnvironmentTickCountSubtract(framestart);
1664 StatsReporter.addSleepMS(sleepMS);
1665 StatsReporter.addFrameMS(frameMS);
1598 1666
1599 // if (Frame%m_update_avatars == 0) 1667 // if (Frame%m_update_avatars == 0)
1600 // UpdateInWorldTime(); 1668 // UpdateInWorldTime();
1601 StatsReporter.AddPhysicsFPS(physicsFPS);
1602 StatsReporter.AddTimeDilation(TimeDilation);
1603 StatsReporter.AddFPS(1);
1604 1669
1605 StatsReporter.addFrameMS(frameMS);
1606 StatsReporter.addAgentMS(agentMS);
1607 StatsReporter.addPhysicsMS(physicsMS + physicsMS2);
1608 StatsReporter.addOtherMS(otherMS);
1609 StatsReporter.AddSpareMS(spareMS);
1610 StatsReporter.addScriptLines(m_sceneGraph.GetScriptLPS());
1611 1670
1612 // Optionally warn if a frame takes double the amount of time that it should. 1671 // Optionally warn if a frame takes double the amount of time that it should.
1613 if (DebugUpdates 1672 if (DebugUpdates
@@ -1635,9 +1694,9 @@ namespace OpenSim.Region.Framework.Scenes
1635 1694
1636 private void CheckAtTargets() 1695 private void CheckAtTargets()
1637 { 1696 {
1638 Dictionary<UUID, SceneObjectGroup>.ValueCollection objs; 1697 List<SceneObjectGroup> objs = new List<SceneObjectGroup>();
1639 lock (m_groupsWithTargets) 1698 lock (m_groupsWithTargets)
1640 objs = m_groupsWithTargets.Values; 1699 objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values);
1641 1700
1642 foreach (SceneObjectGroup entry in objs) 1701 foreach (SceneObjectGroup entry in objs)
1643 entry.checkAtTargets(); 1702 entry.checkAtTargets();
@@ -1718,7 +1777,7 @@ namespace OpenSim.Region.Framework.Scenes
1718 msg.fromAgentName = "Server"; 1777 msg.fromAgentName = "Server";
1719 msg.dialog = (byte)19; // Object msg 1778 msg.dialog = (byte)19; // Object msg
1720 msg.fromGroup = false; 1779 msg.fromGroup = false;
1721 msg.offline = (byte)0; 1780 msg.offline = (byte)1;
1722 msg.ParentEstateID = RegionInfo.EstateSettings.ParentEstateID; 1781 msg.ParentEstateID = RegionInfo.EstateSettings.ParentEstateID;
1723 msg.Position = Vector3.Zero; 1782 msg.Position = Vector3.Zero;
1724 msg.RegionID = RegionInfo.RegionID.Guid; 1783 msg.RegionID = RegionInfo.RegionID.Guid;
@@ -1940,6 +1999,19 @@ namespace OpenSim.Region.Framework.Scenes
1940 EventManager.TriggerPrimsLoaded(this); 1999 EventManager.TriggerPrimsLoaded(this);
1941 } 2000 }
1942 2001
2002 public bool SuportsRayCastFiltered()
2003 {
2004 if (PhysicsScene == null)
2005 return false;
2006 return PhysicsScene.SuportsRaycastWorldFiltered();
2007 }
2008
2009 public object RayCastFiltered(Vector3 position, Vector3 direction, float length, int Count, RayFilterFlags filter)
2010 {
2011 if (PhysicsScene == null)
2012 return null;
2013 return PhysicsScene.RaycastWorld(position, direction, length, Count,filter);
2014 }
1943 2015
1944 /// <summary> 2016 /// <summary>
1945 /// Gets a new rez location based on the raycast and the size of the object that is being rezzed. 2017 /// Gets a new rez location based on the raycast and the size of the object that is being rezzed.
@@ -1956,14 +2028,24 @@ namespace OpenSim.Region.Framework.Scenes
1956 /// <returns></returns> 2028 /// <returns></returns>
1957 public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter) 2029 public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter)
1958 { 2030 {
2031
2032 float wheight = (float)RegionInfo.RegionSettings.WaterHeight;
2033 Vector3 wpos = Vector3.Zero;
2034 // Check for water surface intersection from above
2035 if ( (RayStart.Z > wheight) && (RayEnd.Z < wheight) )
2036 {
2037 float ratio = (RayStart.Z - wheight) / (RayStart.Z - RayEnd.Z);
2038 wpos.X = RayStart.X - (ratio * (RayStart.X - RayEnd.X));
2039 wpos.Y = RayStart.Y - (ratio * (RayStart.Y - RayEnd.Y));
2040 wpos.Z = wheight;
2041 }
2042
1959 Vector3 pos = Vector3.Zero; 2043 Vector3 pos = Vector3.Zero;
1960 if (RayEndIsIntersection == (byte)1) 2044 if (RayEndIsIntersection == (byte)1)
1961 { 2045 {
1962 pos = RayEnd; 2046 pos = RayEnd;
1963 return pos;
1964 } 2047 }
1965 2048 else if (RayTargetID != UUID.Zero)
1966 if (RayTargetID != UUID.Zero)
1967 { 2049 {
1968 SceneObjectPart target = GetSceneObjectPart(RayTargetID); 2050 SceneObjectPart target = GetSceneObjectPart(RayTargetID);
1969 2051
@@ -1985,7 +2067,7 @@ namespace OpenSim.Region.Framework.Scenes
1985 EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter); 2067 EntityIntersection ei = target.TestIntersectionOBB(NewRay, Quaternion.Identity, frontFacesOnly, FaceCenter);
1986 2068
1987 // Un-comment out the following line to Get Raytrace results printed to the console. 2069 // Un-comment out the following line to Get Raytrace results printed to the console.
1988 // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString()); 2070 // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
1989 float ScaleOffset = 0.5f; 2071 float ScaleOffset = 0.5f;
1990 2072
1991 // If we hit something 2073 // If we hit something
@@ -2008,13 +2090,10 @@ namespace OpenSim.Region.Framework.Scenes
2008 //pos.Z -= 0.25F; 2090 //pos.Z -= 0.25F;
2009 2091
2010 } 2092 }
2011
2012 return pos;
2013 } 2093 }
2014 else 2094 else
2015 { 2095 {
2016 // We don't have a target here, so we're going to raytrace all the objects in the scene. 2096 // We don't have a target here, so we're going to raytrace all the objects in the scene.
2017
2018 EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false); 2097 EntityIntersection ei = m_sceneGraph.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection), true, false);
2019 2098
2020 // Un-comment the following line to print the raytrace results to the console. 2099 // Un-comment the following line to print the raytrace results to the console.
@@ -2023,13 +2102,12 @@ namespace OpenSim.Region.Framework.Scenes
2023 if (ei.HitTF) 2102 if (ei.HitTF)
2024 { 2103 {
2025 pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z); 2104 pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
2026 } else 2105 }
2106 else
2027 { 2107 {
2028 // fall back to our stupid functionality 2108 // fall back to our stupid functionality
2029 pos = RayEnd; 2109 pos = RayEnd;
2030 } 2110 }
2031
2032 return pos;
2033 } 2111 }
2034 } 2112 }
2035 else 2113 else
@@ -2040,8 +2118,12 @@ namespace OpenSim.Region.Framework.Scenes
2040 //increase height so its above the ground. 2118 //increase height so its above the ground.
2041 //should be getting the normal of the ground at the rez point and using that? 2119 //should be getting the normal of the ground at the rez point and using that?
2042 pos.Z += scale.Z / 2f; 2120 pos.Z += scale.Z / 2f;
2043 return pos; 2121// return pos;
2044 } 2122 }
2123
2124 // check against posible water intercept
2125 if (wpos.Z > pos.Z) pos = wpos;
2126 return pos;
2045 } 2127 }
2046 2128
2047 2129
@@ -2130,7 +2212,10 @@ namespace OpenSim.Region.Framework.Scenes
2130 public bool AddRestoredSceneObject( 2212 public bool AddRestoredSceneObject(
2131 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) 2213 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
2132 { 2214 {
2133 return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates); 2215 bool result = m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates);
2216 if (result)
2217 sceneObject.IsDeleted = false;
2218 return result;
2134 } 2219 }
2135 2220
2136 /// <summary> 2221 /// <summary>
@@ -2222,6 +2307,15 @@ namespace OpenSim.Region.Framework.Scenes
2222 /// </summary> 2307 /// </summary>
2223 public void DeleteAllSceneObjects() 2308 public void DeleteAllSceneObjects()
2224 { 2309 {
2310 DeleteAllSceneObjects(false);
2311 }
2312
2313 /// <summary>
2314 /// Delete every object from the scene. This does not include attachments worn by avatars.
2315 /// </summary>
2316 public void DeleteAllSceneObjects(bool exceptNoCopy)
2317 {
2318 List<SceneObjectGroup> toReturn = new List<SceneObjectGroup>();
2225 lock (Entities) 2319 lock (Entities)
2226 { 2320 {
2227 EntityBase[] entities = Entities.GetEntities(); 2321 EntityBase[] entities = Entities.GetEntities();
@@ -2230,11 +2324,24 @@ namespace OpenSim.Region.Framework.Scenes
2230 if (e is SceneObjectGroup) 2324 if (e is SceneObjectGroup)
2231 { 2325 {
2232 SceneObjectGroup sog = (SceneObjectGroup)e; 2326 SceneObjectGroup sog = (SceneObjectGroup)e;
2233 if (!sog.IsAttachment) 2327 if (sog != null && !sog.IsAttachment)
2234 DeleteSceneObject((SceneObjectGroup)e, false); 2328 {
2329 if (!exceptNoCopy || ((sog.GetEffectivePermissions() & (uint)PermissionMask.Copy) != 0))
2330 {
2331 DeleteSceneObject((SceneObjectGroup)e, false);
2332 }
2333 else
2334 {
2335 toReturn.Add((SceneObjectGroup)e);
2336 }
2337 }
2235 } 2338 }
2236 } 2339 }
2237 } 2340 }
2341 if (toReturn.Count > 0)
2342 {
2343 returnObjects(toReturn.ToArray(), UUID.Zero);
2344 }
2238 } 2345 }
2239 2346
2240 /// <summary> 2347 /// <summary>
@@ -2286,6 +2393,8 @@ namespace OpenSim.Region.Framework.Scenes
2286 } 2393 }
2287 2394
2288 group.DeleteGroupFromScene(silent); 2395 group.DeleteGroupFromScene(silent);
2396 if (!silent)
2397 SendKillObject(new List<uint>() { group.LocalId });
2289 2398
2290// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID); 2399// m_log.DebugFormat("[SCENE]: Exit DeleteSceneObject() for {0} {1}", group.Name, group.UUID);
2291 } 2400 }
@@ -2576,7 +2685,7 @@ namespace OpenSim.Region.Framework.Scenes
2576 // If the user is banned, we won't let any of their objects 2685 // If the user is banned, we won't let any of their objects
2577 // enter. Period. 2686 // enter. Period.
2578 // 2687 //
2579 if (RegionInfo.EstateSettings.IsBanned(newObject.OwnerID)) 2688 if (RegionInfo.EstateSettings.IsBanned(newObject.OwnerID, 36))
2580 { 2689 {
2581 m_log.InfoFormat("[INTERREGION]: Denied prim crossing for banned avatar {0}", newObject.OwnerID); 2690 m_log.InfoFormat("[INTERREGION]: Denied prim crossing for banned avatar {0}", newObject.OwnerID);
2582 return false; 2691 return false;
@@ -2584,6 +2693,8 @@ namespace OpenSim.Region.Framework.Scenes
2584 2693
2585 if (newPosition != Vector3.Zero) 2694 if (newPosition != Vector3.Zero)
2586 newObject.RootPart.GroupPosition = newPosition; 2695 newObject.RootPart.GroupPosition = newPosition;
2696 if (newObject.RootPart.KeyframeMotion != null)
2697 newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject);
2587 2698
2588 if (!AddSceneObject(newObject)) 2699 if (!AddSceneObject(newObject))
2589 { 2700 {
@@ -2628,6 +2739,23 @@ namespace OpenSim.Region.Framework.Scenes
2628 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns> 2739 /// <returns>True if the SceneObjectGroup was added, False if it was not</returns>
2629 public bool AddSceneObject(SceneObjectGroup sceneObject) 2740 public bool AddSceneObject(SceneObjectGroup sceneObject)
2630 { 2741 {
2742 if (sceneObject.OwnerID == UUID.Zero)
2743 {
2744 m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero", sceneObject.UUID);
2745 return false;
2746 }
2747
2748 // If the user is banned, we won't let any of their objects
2749 // enter. Period.
2750 //
2751 int flags = GetUserFlags(sceneObject.OwnerID);
2752 if (RegionInfo.EstateSettings.IsBanned(sceneObject.OwnerID, flags))
2753 {
2754 m_log.InfoFormat("[INTERREGION]: Denied prim crossing for banned avatar {0}", sceneObject.OwnerID);
2755
2756 return false;
2757 }
2758
2631 // Force allocation of new LocalId 2759 // Force allocation of new LocalId
2632 // 2760 //
2633 SceneObjectPart[] parts = sceneObject.Parts; 2761 SceneObjectPart[] parts = sceneObject.Parts;
@@ -2661,16 +2789,27 @@ namespace OpenSim.Region.Framework.Scenes
2661 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2789 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2662 2790
2663 if (AttachmentsModule != null) 2791 if (AttachmentsModule != null)
2664 AttachmentsModule.AttachObject(sp, grp, 0, false, false); 2792 AttachmentsModule.AttachObject(sp, grp, 0, false, false, false);
2665 } 2793 }
2666 else 2794 else
2667 { 2795 {
2796 m_log.DebugFormat("[SCENE]: Attachment {0} arrived and scene presence was not found, setting to temp", sceneObject.UUID);
2668 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2797 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2669 RootPrim.AddFlag(PrimFlags.TemporaryOnRez); 2798 RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
2670 } 2799 }
2800 if (sceneObject.OwnerID == UUID.Zero)
2801 {
2802 m_log.ErrorFormat("[SCENE]: Owner ID for {0} was zero after attachment processing. BUG!", sceneObject.UUID);
2803 return false;
2804 }
2671 } 2805 }
2672 else 2806 else
2673 { 2807 {
2808 if (sceneObject.OwnerID == UUID.Zero)
2809 {
2810 m_log.ErrorFormat("[SCENE]: Owner ID for non-attachment {0} was zero", sceneObject.UUID);
2811 return false;
2812 }
2674 AddRestoredSceneObject(sceneObject, true, false); 2813 AddRestoredSceneObject(sceneObject, true, false);
2675 } 2814 }
2676 2815
@@ -2687,6 +2826,24 @@ namespace OpenSim.Region.Framework.Scenes
2687 return 2; // StateSource.PrimCrossing 2826 return 2; // StateSource.PrimCrossing
2688 } 2827 }
2689 2828
2829 public int GetUserFlags(UUID user)
2830 {
2831 //Unfortunately the SP approach means that the value is cached until region is restarted
2832 /*
2833 ScenePresence sp;
2834 if (TryGetScenePresence(user, out sp))
2835 {
2836 return sp.UserFlags;
2837 }
2838 else
2839 {
2840 */
2841 UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user);
2842 if (uac == null)
2843 return 0;
2844 return uac.UserFlags;
2845 //}
2846 }
2690 #endregion 2847 #endregion
2691 2848
2692 #region Add/Remove Avatar Methods 2849 #region Add/Remove Avatar Methods
@@ -2700,7 +2857,7 @@ namespace OpenSim.Region.Framework.Scenes
2700 = (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0 2857 = (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0
2701 || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0; 2858 || (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0;
2702 2859
2703// CheckHeartbeat(); 2860 CheckHeartbeat();
2704 2861
2705 ScenePresence sp = GetScenePresence(client.AgentId); 2862 ScenePresence sp = GetScenePresence(client.AgentId);
2706 2863
@@ -2754,7 +2911,13 @@ namespace OpenSim.Region.Framework.Scenes
2754 2911
2755 EventManager.TriggerOnNewClient(client); 2912 EventManager.TriggerOnNewClient(client);
2756 if (vialogin) 2913 if (vialogin)
2914 {
2757 EventManager.TriggerOnClientLogin(client); 2915 EventManager.TriggerOnClientLogin(client);
2916 // Send initial parcel data
2917 Vector3 pos = sp.AbsolutePosition;
2918 ILandObject land = LandChannel.GetLandObject(pos.X, pos.Y);
2919 land.SendLandUpdateToClient(client);
2920 }
2758 2921
2759 return sp; 2922 return sp;
2760 } 2923 }
@@ -2843,19 +3006,14 @@ namespace OpenSim.Region.Framework.Scenes
2843 // and the scene presence and the client, if they exist 3006 // and the scene presence and the client, if they exist
2844 try 3007 try
2845 { 3008 {
2846 // We need to wait for the client to make UDP contact first. 3009 ScenePresence sp = GetScenePresence(agentID);
2847 // It's the UDP contact that creates the scene presence 3010
2848 ScenePresence sp = WaitGetScenePresence(agentID);
2849 if (sp != null) 3011 if (sp != null)
2850 { 3012 {
2851 PresenceService.LogoutAgent(sp.ControllingClient.SessionId); 3013 PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
2852
2853 sp.ControllingClient.Close(); 3014 sp.ControllingClient.Close();
2854 } 3015 }
2855 else 3016
2856 {
2857 m_log.WarnFormat("[SCENE]: Could not find scene presence for {0}", agentID);
2858 }
2859 // BANG! SLASH! 3017 // BANG! SLASH!
2860 m_authenticateHandler.RemoveCircuit(agentID); 3018 m_authenticateHandler.RemoveCircuit(agentID);
2861 3019
@@ -2900,6 +3058,8 @@ namespace OpenSim.Region.Framework.Scenes
2900 client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimGroupPosition; 3058 client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimGroupPosition;
2901 client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; 3059 client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition;
2902 3060
3061 client.onClientChangeObject += m_sceneGraph.ClientChangeObject;
3062
2903 client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimGroupRotation; 3063 client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimGroupRotation;
2904 client.OnUpdatePrimGroupMouseRotation += m_sceneGraph.UpdatePrimGroupRotation; 3064 client.OnUpdatePrimGroupMouseRotation += m_sceneGraph.UpdatePrimGroupRotation;
2905 client.OnUpdatePrimSingleRotation += m_sceneGraph.UpdatePrimSingleRotation; 3065 client.OnUpdatePrimSingleRotation += m_sceneGraph.UpdatePrimSingleRotation;
@@ -2956,6 +3116,7 @@ namespace OpenSim.Region.Framework.Scenes
2956 client.OnFetchInventory += m_asyncInventorySender.HandleFetchInventory; 3116 client.OnFetchInventory += m_asyncInventorySender.HandleFetchInventory;
2957 client.OnUpdateInventoryItem += UpdateInventoryItemAsset; 3117 client.OnUpdateInventoryItem += UpdateInventoryItemAsset;
2958 client.OnCopyInventoryItem += CopyInventoryItem; 3118 client.OnCopyInventoryItem += CopyInventoryItem;
3119 client.OnMoveItemsAndLeaveCopy += MoveInventoryItemsLeaveCopy;
2959 client.OnMoveInventoryItem += MoveInventoryItem; 3120 client.OnMoveInventoryItem += MoveInventoryItem;
2960 client.OnRemoveInventoryItem += RemoveInventoryItem; 3121 client.OnRemoveInventoryItem += RemoveInventoryItem;
2961 client.OnRemoveInventoryFolder += RemoveInventoryFolder; 3122 client.OnRemoveInventoryFolder += RemoveInventoryFolder;
@@ -3027,6 +3188,8 @@ namespace OpenSim.Region.Framework.Scenes
3027 client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimGroupPosition; 3188 client.OnUpdatePrimGroupPosition -= m_sceneGraph.UpdatePrimGroupPosition;
3028 client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition; 3189 client.OnUpdatePrimSinglePosition -= m_sceneGraph.UpdatePrimSinglePosition;
3029 3190
3191 client.onClientChangeObject -= m_sceneGraph.ClientChangeObject;
3192
3030 client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimGroupRotation; 3193 client.OnUpdatePrimGroupRotation -= m_sceneGraph.UpdatePrimGroupRotation;
3031 client.OnUpdatePrimGroupMouseRotation -= m_sceneGraph.UpdatePrimGroupRotation; 3194 client.OnUpdatePrimGroupMouseRotation -= m_sceneGraph.UpdatePrimGroupRotation;
3032 client.OnUpdatePrimSingleRotation -= m_sceneGraph.UpdatePrimSingleRotation; 3195 client.OnUpdatePrimSingleRotation -= m_sceneGraph.UpdatePrimSingleRotation;
@@ -3129,7 +3292,7 @@ namespace OpenSim.Region.Framework.Scenes
3129 /// </summary> 3292 /// </summary>
3130 /// <param name="agentId">The avatar's Unique ID</param> 3293 /// <param name="agentId">The avatar's Unique ID</param>
3131 /// <param name="client">The IClientAPI for the client</param> 3294 /// <param name="client">The IClientAPI for the client</param>
3132 public virtual void TeleportClientHome(UUID agentId, IClientAPI client) 3295 public virtual bool TeleportClientHome(UUID agentId, IClientAPI client)
3133 { 3296 {
3134 if (EntityTransferModule != null) 3297 if (EntityTransferModule != null)
3135 { 3298 {
@@ -3140,6 +3303,7 @@ namespace OpenSim.Region.Framework.Scenes
3140 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active"); 3303 m_log.DebugFormat("[SCENE]: Unable to teleport user home: no AgentTransferModule is active");
3141 client.SendTeleportFailed("Unable to perform teleports on this simulator."); 3304 client.SendTeleportFailed("Unable to perform teleports on this simulator.");
3142 } 3305 }
3306 return false;
3143 } 3307 }
3144 3308
3145 /// <summary> 3309 /// <summary>
@@ -3249,6 +3413,16 @@ namespace OpenSim.Region.Framework.Scenes
3249 /// <param name="flags"></param> 3413 /// <param name="flags"></param>
3250 public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags) 3414 public virtual void SetHomeRezPoint(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags)
3251 { 3415 {
3416 //Add half the avatar's height so that the user doesn't fall through prims
3417 ScenePresence presence;
3418 if (TryGetScenePresence(remoteClient.AgentId, out presence))
3419 {
3420 if (presence.Appearance != null)
3421 {
3422 position.Z = position.Z + (presence.Appearance.AvatarHeight / 2);
3423 }
3424 }
3425
3252 if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt)) 3426 if (GridUserService != null && GridUserService.SetHome(remoteClient.AgentId.ToString(), RegionInfo.RegionID, position, lookAt))
3253 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot. 3427 // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.
3254 m_dialogModule.SendAlertToUser(remoteClient, "Home position set."); 3428 m_dialogModule.SendAlertToUser(remoteClient, "Home position set.");
@@ -3365,6 +3539,7 @@ namespace OpenSim.Region.Framework.Scenes
3365 AgentTransactionsModule.RemoveAgentAssetTransactions(agentID); 3539 AgentTransactionsModule.RemoveAgentAssetTransactions(agentID);
3366 3540
3367 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); 3541 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode);
3542 m_log.Debug("[Scene] The avatar has left the building");
3368 } 3543 }
3369 catch (Exception e) 3544 catch (Exception e)
3370 { 3545 {
@@ -3566,13 +3741,16 @@ namespace OpenSim.Region.Framework.Scenes
3566 sp = null; 3741 sp = null;
3567 } 3742 }
3568 3743
3569 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
3570 3744
3571 //On login test land permisions 3745 //On login test land permisions
3572 if (vialogin) 3746 if (vialogin)
3573 { 3747 {
3574 if (land != null && !TestLandRestrictions(agent, land, out reason)) 3748 IUserAccountCacheModule cache = RequestModuleInterface<IUserAccountCacheModule>();
3749 if (cache != null)
3750 cache.Remove(agent.firstname + " " + agent.lastname);
3751 if (!TestLandRestrictions(agent.AgentID, out reason, ref agent.startpos.X, ref agent.startpos.Y))
3575 { 3752 {
3753 m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString());
3576 return false; 3754 return false;
3577 } 3755 }
3578 } 3756 }
@@ -3595,9 +3773,15 @@ namespace OpenSim.Region.Framework.Scenes
3595 3773
3596 try 3774 try
3597 { 3775 {
3598 if (!AuthorizeUser(agent, out reason)) 3776 // Always check estate if this is a login. Always
3599 return false; 3777 // check if banned regions are to be blacked out.
3600 } catch (Exception e) 3778 if (vialogin || (!m_seeIntoBannedRegion))
3779 {
3780 if (!AuthorizeUser(agent, out reason))
3781 return false;
3782 }
3783 }
3784 catch (Exception e)
3601 { 3785 {
3602 m_log.ErrorFormat( 3786 m_log.ErrorFormat(
3603 "[SCENE]: Exception authorizing user {0}{1}", e.Message, e.StackTrace); 3787 "[SCENE]: Exception authorizing user {0}{1}", e.Message, e.StackTrace);
@@ -3728,6 +3912,8 @@ namespace OpenSim.Region.Framework.Scenes
3728 } 3912 }
3729 3913
3730 // Honor parcel landing type and position. 3914 // Honor parcel landing type and position.
3915 /*
3916 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
3731 if (land != null) 3917 if (land != null)
3732 { 3918 {
3733 if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero) 3919 if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero)
@@ -3735,25 +3921,43 @@ namespace OpenSim.Region.Framework.Scenes
3735 agent.startpos = land.LandData.UserLocation; 3921 agent.startpos = land.LandData.UserLocation;
3736 } 3922 }
3737 } 3923 }
3924 */// This is now handled properly in ScenePresence.MakeRootAgent
3738 } 3925 }
3739 3926
3740 return true; 3927 return true;
3741 } 3928 }
3742 3929
3743 private bool TestLandRestrictions(AgentCircuitData agent, ILandObject land, out string reason) 3930 public bool TestLandRestrictions(UUID agentID, out string reason, ref float posX, ref float posY)
3744 { 3931 {
3745 bool banned = land.IsBannedFromLand(agent.AgentID); 3932 if (posX < 0)
3746 bool restricted = land.IsRestrictedFromLand(agent.AgentID); 3933 posX = 0;
3934 else if (posX >= 256)
3935 posX = 255.999f;
3936 if (posY < 0)
3937 posY = 0;
3938 else if (posY >= 256)
3939 posY = 255.999f;
3940
3941 reason = String.Empty;
3942 if (Permissions.IsGod(agentID))
3943 return true;
3944
3945 ILandObject land = LandChannel.GetLandObject(posX, posY);
3946 if (land == null)
3947 return false;
3948
3949 bool banned = land.IsBannedFromLand(agentID);
3950 bool restricted = land.IsRestrictedFromLand(agentID);
3747 3951
3748 if (banned || restricted) 3952 if (banned || restricted)
3749 { 3953 {
3750 ILandObject nearestParcel = GetNearestAllowedParcel(agent.AgentID, agent.startpos.X, agent.startpos.Y); 3954 ILandObject nearestParcel = GetNearestAllowedParcel(agentID, posX, posY);
3751 if (nearestParcel != null) 3955 if (nearestParcel != null)
3752 { 3956 {
3753 //Move agent to nearest allowed 3957 //Move agent to nearest allowed
3754 Vector3 newPosition = GetParcelCenterAtGround(nearestParcel); 3958 Vector3 newPosition = GetParcelCenterAtGround(nearestParcel);
3755 agent.startpos.X = newPosition.X; 3959 posX = newPosition.X;
3756 agent.startpos.Y = newPosition.Y; 3960 posY = newPosition.Y;
3757 } 3961 }
3758 else 3962 else
3759 { 3963 {
@@ -3815,7 +4019,7 @@ namespace OpenSim.Region.Framework.Scenes
3815 4019
3816 if (!m_strictAccessControl) return true; 4020 if (!m_strictAccessControl) return true;
3817 if (Permissions.IsGod(agent.AgentID)) return true; 4021 if (Permissions.IsGod(agent.AgentID)) return true;
3818 4022
3819 if (AuthorizationService != null) 4023 if (AuthorizationService != null)
3820 { 4024 {
3821 if (!AuthorizationService.IsAuthorizedForRegion( 4025 if (!AuthorizationService.IsAuthorizedForRegion(
@@ -3830,7 +4034,7 @@ namespace OpenSim.Region.Framework.Scenes
3830 4034
3831 if (RegionInfo.EstateSettings != null) 4035 if (RegionInfo.EstateSettings != null)
3832 { 4036 {
3833 if (RegionInfo.EstateSettings.IsBanned(agent.AgentID)) 4037 if (RegionInfo.EstateSettings.IsBanned(agent.AgentID, 0))
3834 { 4038 {
3835 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist", 4039 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user is on the banlist",
3836 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); 4040 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
@@ -4020,6 +4224,15 @@ namespace OpenSim.Region.Framework.Scenes
4020 4224
4021 // XPTO: if this agent is not allowed here as root, always return false 4225 // XPTO: if this agent is not allowed here as root, always return false
4022 4226
4227 // We have to wait until the viewer contacts this region after receiving EAC.
4228 // That calls AddNewClient, which finally creates the ScenePresence
4229 int flags = GetUserFlags(cAgentData.AgentID);
4230 if (RegionInfo.EstateSettings.IsBanned(cAgentData.AgentID, flags))
4231 {
4232 m_log.DebugFormat("[SCENE]: Denying root agent entry to {0}: banned", cAgentData.AgentID);
4233 return false;
4234 }
4235
4023 // TODO: This check should probably be in QueryAccess(). 4236 // TODO: This check should probably be in QueryAccess().
4024 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2); 4237 ILandObject nearestParcel = GetNearestAllowedParcel(cAgentData.AgentID, Constants.RegionSize / 2, Constants.RegionSize / 2);
4025 if (nearestParcel == null) 4238 if (nearestParcel == null)
@@ -4083,7 +4296,7 @@ namespace OpenSim.Region.Framework.Scenes
4083 /// <param name='agentID'></param> 4296 /// <param name='agentID'></param>
4084 protected virtual ScenePresence WaitGetScenePresence(UUID agentID) 4297 protected virtual ScenePresence WaitGetScenePresence(UUID agentID)
4085 { 4298 {
4086 int ntimes = 10; 4299 int ntimes = 20;
4087 ScenePresence sp = null; 4300 ScenePresence sp = null;
4088 while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0)) 4301 while ((sp = GetScenePresence(agentID)) == null && (ntimes-- > 0))
4089 Thread.Sleep(1000); 4302 Thread.Sleep(1000);
@@ -4113,6 +4326,16 @@ namespace OpenSim.Region.Framework.Scenes
4113 return false; 4326 return false;
4114 } 4327 }
4115 4328
4329 public bool IncomingCloseAgent(UUID agentID)
4330 {
4331 return IncomingCloseAgent(agentID, false);
4332 }
4333
4334 public bool IncomingCloseChildAgent(UUID agentID)
4335 {
4336 return IncomingCloseAgent(agentID, true);
4337 }
4338
4116 /// <summary> 4339 /// <summary>
4117 /// Tell a single agent to disconnect from the region. 4340 /// Tell a single agent to disconnect from the region.
4118 /// </summary> 4341 /// </summary>
@@ -4128,7 +4351,7 @@ namespace OpenSim.Region.Framework.Scenes
4128 ScenePresence presence = m_sceneGraph.GetScenePresence(agentID); 4351 ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
4129 if (presence != null) 4352 if (presence != null)
4130 { 4353 {
4131 presence.ControllingClient.Close(force); 4354 presence.ControllingClient.Close(true, force);
4132 return true; 4355 return true;
4133 } 4356 }
4134 4357
@@ -4742,35 +4965,81 @@ namespace OpenSim.Region.Framework.Scenes
4742 SimulationDataService.RemoveObject(uuid, RegionInfo.RegionID); 4965 SimulationDataService.RemoveObject(uuid, RegionInfo.RegionID);
4743 } 4966 }
4744 4967
4745 public int GetHealth() 4968 public int GetHealth(out int flags, out string message)
4746 { 4969 {
4747 // Returns: 4970 // Returns:
4748 // 1 = sim is up and accepting http requests. The heartbeat has 4971 // 1 = sim is up and accepting http requests. The heartbeat has
4749 // stopped and the sim is probably locked up, but a remote 4972 // stopped and the sim is probably locked up, but a remote
4750 // admin restart may succeed 4973 // admin restart may succeed
4751 // 4974 //
4752 // 2 = Sim is up and the heartbeat is running. The sim is likely 4975 // 2 = Sim is up and the heartbeat is running. The sim is likely
4753 // usable for people within and logins _may_ work 4976 // usable for people within
4977 //
4978 // 3 = Sim is up and one packet thread is running. Sim is
4979 // unstable and will not accept new logins
4754 // 4980 //
4755 // 3 = We have seen a new user enter within the past 4 minutes 4981 // 4 = Sim is up and both packet threads are running. Sim is
4982 // likely usable
4983 //
4984 // 5 = We have seen a new user enter within the past 4 minutes
4756 // which can be seen as positive confirmation of sim health 4985 // which can be seen as positive confirmation of sim health
4757 // 4986 //
4987
4988 flags = 0;
4989 message = String.Empty;
4990
4991 CheckHeartbeat();
4992
4993 if (m_firstHeartbeat || (m_lastIncoming == 0 && m_lastOutgoing == 0))
4994 {
4995 // We're still starting
4996 // 0 means "in startup", it can't happen another way, since
4997 // to get here, we must be able to accept http connections
4998 return 0;
4999 }
5000
4758 int health=1; // Start at 1, means we're up 5001 int health=1; // Start at 1, means we're up
4759 5002
4760 if ((Util.EnvironmentTickCountSubtract(m_lastFrameTick)) < 1000) 5003 if ((Util.EnvironmentTickCountSubtract(m_lastFrameTick)) < 1000)
4761 health += 1; 5004 {
5005 health+=1;
5006 flags |= 1;
5007 }
5008
5009 if (Util.EnvironmentTickCountSubtract(m_lastIncoming) < 1000)
5010 {
5011 health+=1;
5012 flags |= 2;
5013 }
5014
5015 if (Util.EnvironmentTickCountSubtract(m_lastOutgoing) < 1000)
5016 {
5017 health+=1;
5018 flags |= 4;
5019 }
4762 else 5020 else
5021 {
5022int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
5023System.Diagnostics.Process proc = new System.Diagnostics.Process();
5024proc.EnableRaisingEvents=false;
5025proc.StartInfo.FileName = "/bin/kill";
5026proc.StartInfo.Arguments = "-QUIT " + pid.ToString();
5027proc.Start();
5028proc.WaitForExit();
5029Thread.Sleep(1000);
5030Environment.Exit(1);
5031 }
5032
5033 if (flags != 7)
4763 return health; 5034 return health;
4764 5035
4765 // A login in the last 4 mins? We can't be doing too badly 5036 // A login in the last 4 mins? We can't be doing too badly
4766 // 5037 //
4767 if ((Util.EnvironmentTickCountSubtract(m_LastLogin)) < 240000) 5038 if (Util.EnvironmentTickCountSubtract(m_LastLogin) < 240000)
4768 health++; 5039 health++;
4769 else 5040 else
4770 return health; 5041 return health;
4771 5042
4772// CheckHeartbeat();
4773
4774 return health; 5043 return health;
4775 } 5044 }
4776 5045
@@ -4858,7 +5127,7 @@ namespace OpenSim.Region.Framework.Scenes
4858 bool wasUsingPhysics = ((jointProxyObject.Flags & PrimFlags.Physics) != 0); 5127 bool wasUsingPhysics = ((jointProxyObject.Flags & PrimFlags.Physics) != 0);
4859 if (wasUsingPhysics) 5128 if (wasUsingPhysics)
4860 { 5129 {
4861 jointProxyObject.UpdatePrimFlags(false, false, true, false); // FIXME: possible deadlock here; check to make sure all the scene alterations set into motion here won't deadlock 5130 jointProxyObject.UpdatePrimFlags(false, false, true, false,false); // FIXME: possible deadlock here; check to make sure all the scene alterations set into motion here won't deadlock
4862 } 5131 }
4863 } 5132 }
4864 5133
@@ -4957,14 +5226,14 @@ namespace OpenSim.Region.Framework.Scenes
4957 return (((vsn.X * xdiff) + (vsn.Y * ydiff)) / (-1 * vsn.Z)) + p0.Z; 5226 return (((vsn.X * xdiff) + (vsn.Y * ydiff)) / (-1 * vsn.Z)) + p0.Z;
4958 } 5227 }
4959 5228
4960// private void CheckHeartbeat() 5229 private void CheckHeartbeat()
4961// { 5230 {
4962// if (m_firstHeartbeat) 5231 if (m_firstHeartbeat)
4963// return; 5232 return;
4964// 5233
4965// if (Util.EnvironmentTickCountSubtract(m_lastFrameTick) > 2000) 5234 if ((Util.EnvironmentTickCountSubtract(m_lastFrameTick)) > 5000)
4966// StartTimer(); 5235 Start();
4967// } 5236 }
4968 5237
4969 public override ISceneObject DeserializeObject(string representation) 5238 public override ISceneObject DeserializeObject(string representation)
4970 { 5239 {
@@ -4976,9 +5245,14 @@ namespace OpenSim.Region.Framework.Scenes
4976 get { return m_allowScriptCrossings; } 5245 get { return m_allowScriptCrossings; }
4977 } 5246 }
4978 5247
4979 public Vector3? GetNearestAllowedPosition(ScenePresence avatar) 5248 public Vector3 GetNearestAllowedPosition(ScenePresence avatar)
5249 {
5250 return GetNearestAllowedPosition(avatar, null);
5251 }
5252
5253 public Vector3 GetNearestAllowedPosition(ScenePresence avatar, ILandObject excludeParcel)
4980 { 5254 {
4981 ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); 5255 ILandObject nearestParcel = GetNearestAllowedParcel(avatar.UUID, avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y, excludeParcel);
4982 5256
4983 if (nearestParcel != null) 5257 if (nearestParcel != null)
4984 { 5258 {
@@ -4987,10 +5261,7 @@ namespace OpenSim.Region.Framework.Scenes
4987 Vector3? nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel); 5261 Vector3? nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
4988 if (nearestPoint != null) 5262 if (nearestPoint != null)
4989 { 5263 {
4990// m_log.DebugFormat( 5264 Debug.WriteLine("Found a sane previous position based on velocity, sending them to: " + nearestPoint.ToString());
4991// "[SCENE]: Found a sane previous position based on velocity for {0}, sending them to {1} in {2}",
4992// avatar.Name, nearestPoint, nearestParcel.LandData.Name);
4993
4994 return nearestPoint.Value; 5265 return nearestPoint.Value;
4995 } 5266 }
4996 5267
@@ -5000,17 +5271,20 @@ namespace OpenSim.Region.Framework.Scenes
5000 nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel); 5271 nearestPoint = GetNearestPointInParcelAlongDirectionFromPoint(avatar.AbsolutePosition, dir, nearestParcel);
5001 if (nearestPoint != null) 5272 if (nearestPoint != null)
5002 { 5273 {
5003// m_log.DebugFormat( 5274 Debug.WriteLine("They had a zero velocity, sending them to: " + nearestPoint.ToString());
5004// "[SCENE]: {0} had a zero velocity, sending them to {1}", avatar.Name, nearestPoint);
5005
5006 return nearestPoint.Value; 5275 return nearestPoint.Value;
5007 } 5276 }
5008 5277
5009 //Ultimate backup if we have no idea where they are 5278 ILandObject dest = LandChannel.GetLandObject(avatar.lastKnownAllowedPosition.X, avatar.lastKnownAllowedPosition.Y);
5010// m_log.DebugFormat( 5279 if (dest != excludeParcel)
5011// "[SCENE]: No idea where {0} is, sending them to {1}", avatar.Name, avatar.lastKnownAllowedPosition); 5280 {
5281 // Ultimate backup if we have no idea where they are and
5282 // the last allowed position was in another parcel
5283 Debug.WriteLine("Have no idea where they are, sending them to: " + avatar.lastKnownAllowedPosition.ToString());
5284 return avatar.lastKnownAllowedPosition;
5285 }
5012 5286
5013 return avatar.lastKnownAllowedPosition; 5287 // else fall through to region edge
5014 } 5288 }
5015 5289
5016 //Go to the edge, this happens in teleporting to a region with no available parcels 5290 //Go to the edge, this happens in teleporting to a region with no available parcels
@@ -5044,13 +5318,18 @@ namespace OpenSim.Region.Framework.Scenes
5044 5318
5045 public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y) 5319 public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y)
5046 { 5320 {
5321 return GetNearestAllowedParcel(avatarId, x, y, null);
5322 }
5323
5324 public ILandObject GetNearestAllowedParcel(UUID avatarId, float x, float y, ILandObject excludeParcel)
5325 {
5047 List<ILandObject> all = AllParcels(); 5326 List<ILandObject> all = AllParcels();
5048 float minParcelDistance = float.MaxValue; 5327 float minParcelDistance = float.MaxValue;
5049 ILandObject nearestParcel = null; 5328 ILandObject nearestParcel = null;
5050 5329
5051 foreach (var parcel in all) 5330 foreach (var parcel in all)
5052 { 5331 {
5053 if (!parcel.IsEitherBannedOrRestricted(avatarId)) 5332 if (!parcel.IsEitherBannedOrRestricted(avatarId) && parcel != excludeParcel)
5054 { 5333 {
5055 float parcelDistance = GetParcelDistancefromPoint(parcel, x, y); 5334 float parcelDistance = GetParcelDistancefromPoint(parcel, x, y);
5056 if (parcelDistance < minParcelDistance) 5335 if (parcelDistance < minParcelDistance)
@@ -5292,7 +5571,55 @@ namespace OpenSim.Region.Framework.Scenes
5292 mapModule.GenerateMaptile(); 5571 mapModule.GenerateMaptile();
5293 } 5572 }
5294 5573
5295 private void RegenerateMaptileAndReregister(object sender, ElapsedEventArgs e) 5574// public void CleanDroppedAttachments()
5575// {
5576// List<SceneObjectGroup> objectsToDelete =
5577// new List<SceneObjectGroup>();
5578//
5579// lock (m_cleaningAttachments)
5580// {
5581// ForEachSOG(delegate (SceneObjectGroup grp)
5582// {
5583// if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp)))
5584// {
5585// UUID agentID = grp.OwnerID;
5586// if (agentID == UUID.Zero)
5587// {
5588// objectsToDelete.Add(grp);
5589// return;
5590// }
5591//
5592// ScenePresence sp = GetScenePresence(agentID);
5593// if (sp == null)
5594// {
5595// objectsToDelete.Add(grp);
5596// return;
5597// }
5598// }
5599// });
5600// }
5601//
5602// foreach (SceneObjectGroup grp in objectsToDelete)
5603// {
5604// m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
5605// DeleteSceneObject(grp, true);
5606// }
5607// }
5608
5609 public void ThreadAlive(int threadCode)
5610 {
5611 switch(threadCode)
5612 {
5613 case 1: // Incoming
5614 m_lastIncoming = Util.EnvironmentTickCount();
5615 break;
5616 case 2: // Incoming
5617 m_lastOutgoing = Util.EnvironmentTickCount();
5618 break;
5619 }
5620 }
5621
5622 public void RegenerateMaptileAndReregister(object sender, ElapsedEventArgs e)
5296 { 5623 {
5297 RegenerateMaptile(); 5624 RegenerateMaptile();
5298 5625
@@ -5320,6 +5647,8 @@ namespace OpenSim.Region.Framework.Scenes
5320 /// <returns></returns> 5647 /// <returns></returns>
5321 public bool QueryAccess(UUID agentID, Vector3 position, out string reason) 5648 public bool QueryAccess(UUID agentID, Vector3 position, out string reason)
5322 { 5649 {
5650 reason = "You are banned from the region";
5651
5323 if (EntityTransferModule.IsInTransit(agentID)) 5652 if (EntityTransferModule.IsInTransit(agentID))
5324 { 5653 {
5325 reason = "Agent is still in transit from this region"; 5654 reason = "Agent is still in transit from this region";
@@ -5331,6 +5660,12 @@ namespace OpenSim.Region.Framework.Scenes
5331 return false; 5660 return false;
5332 } 5661 }
5333 5662
5663 if (Permissions.IsGod(agentID))
5664 {
5665 reason = String.Empty;
5666 return true;
5667 }
5668
5334 // FIXME: Root agent count is currently known to be inaccurate. This forces a recount before we check. 5669 // FIXME: Root agent count is currently known to be inaccurate. This forces a recount before we check.
5335 // However, the long term fix is to make sure root agent count is always accurate. 5670 // However, the long term fix is to make sure root agent count is always accurate.
5336 m_sceneGraph.RecalculateStats(); 5671 m_sceneGraph.RecalculateStats();
@@ -5351,6 +5686,41 @@ namespace OpenSim.Region.Framework.Scenes
5351 } 5686 }
5352 } 5687 }
5353 5688
5689 ScenePresence presence = GetScenePresence(agentID);
5690 IClientAPI client = null;
5691 AgentCircuitData aCircuit = null;
5692
5693 if (presence != null)
5694 {
5695 client = presence.ControllingClient;
5696 if (client != null)
5697 aCircuit = client.RequestClientInfo();
5698 }
5699
5700 // We may be called before there is a presence or a client.
5701 // Fake AgentCircuitData to keep IAuthorizationModule smiling
5702 if (client == null)
5703 {
5704 aCircuit = new AgentCircuitData();
5705 aCircuit.AgentID = agentID;
5706 aCircuit.firstname = String.Empty;
5707 aCircuit.lastname = String.Empty;
5708 }
5709
5710 try
5711 {
5712 if (!AuthorizeUser(aCircuit, out reason))
5713 {
5714 // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
5715 return false;
5716 }
5717 }
5718 catch (Exception e)
5719 {
5720 m_log.DebugFormat("[SCENE]: Exception authorizing agent: {0} "+ e.StackTrace, e.Message);
5721 return false;
5722 }
5723
5354 if (position == Vector3.Zero) // Teleport 5724 if (position == Vector3.Zero) // Teleport
5355 { 5725 {
5356 if (!RegionInfo.EstateSettings.AllowDirectTeleport) 5726 if (!RegionInfo.EstateSettings.AllowDirectTeleport)
@@ -5379,13 +5749,46 @@ namespace OpenSim.Region.Framework.Scenes
5379 } 5749 }
5380 } 5750 }
5381 } 5751 }
5752
5753 float posX = 128.0f;
5754 float posY = 128.0f;
5755
5756 if (!TestLandRestrictions(agentID, out reason, ref posX, ref posY))
5757 {
5758 // m_log.DebugFormat("[SCENE]: Denying {0} because they are banned on all parcels", agentID);
5759 return false;
5760 }
5761 }
5762 else // Walking
5763 {
5764 ILandObject land = LandChannel.GetLandObject(position.X, position.Y);
5765 if (land == null)
5766 return false;
5767
5768 bool banned = land.IsBannedFromLand(agentID);
5769 bool restricted = land.IsRestrictedFromLand(agentID);
5770
5771 if (banned || restricted)
5772 return false;
5382 } 5773 }
5383 5774
5384 reason = String.Empty; 5775 reason = String.Empty;
5385 return true; 5776 return true;
5386 } 5777 }
5387 5778
5388 /// <summary> 5779 public void StartTimerWatchdog()
5780 {
5781 m_timerWatchdog.Interval = 1000;
5782 m_timerWatchdog.Elapsed += TimerWatchdog;
5783 m_timerWatchdog.AutoReset = true;
5784 m_timerWatchdog.Start();
5785 }
5786
5787 public void TimerWatchdog(object sender, ElapsedEventArgs e)
5788 {
5789 CheckHeartbeat();
5790 }
5791
5389 /// This method deals with movement when an avatar is automatically moving (but this is distinct from the 5792 /// This method deals with movement when an avatar is automatically moving (but this is distinct from the
5390 /// autopilot that moves an avatar to a sit target!. 5793 /// autopilot that moves an avatar to a sit target!.
5391 /// </summary> 5794 /// </summary>
@@ -5464,6 +5867,11 @@ namespace OpenSim.Region.Framework.Scenes
5464 return m_SpawnPoint - 1; 5867 return m_SpawnPoint - 1;
5465 } 5868 }
5466 5869
5870 private void HandleGcCollect(string module, string[] args)
5871 {
5872 GC.Collect();
5873 }
5874
5467 // Wrappers to get physics modules retrieve assets. Has to be done this way 5875 // Wrappers to get physics modules retrieve assets. Has to be done this way
5468 // because we can't assign the asset service to physics directly - at the 5876 // because we can't assign the asset service to physics directly - at the
5469 // time physics are instantiated it's not registered but it will be by 5877 // time physics are instantiated it's not registered but it will be by
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index b87a38a..7c8bd88 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -149,7 +149,6 @@ namespace OpenSim.Region.Framework.Scenes
149 149
150 protected ulong m_regionHandle; 150 protected ulong m_regionHandle;
151 protected string m_regionName; 151 protected string m_regionName;
152 protected RegionInfo m_regInfo;
153 152
154 public ITerrainChannel Heightmap; 153 public ITerrainChannel Heightmap;
155 154
@@ -174,6 +173,8 @@ namespace OpenSim.Region.Framework.Scenes
174 get { return m_permissions; } 173 get { return m_permissions; }
175 } 174 }
176 175
176 protected string m_datastore;
177
177 /* Used by the loadbalancer plugin on GForge */ 178 /* Used by the loadbalancer plugin on GForge */
178 protected RegionStatus m_regStatus; 179 protected RegionStatus m_regStatus;
179 public RegionStatus RegionStatus 180 public RegionStatus RegionStatus
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 305f8a4..775a4c2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -194,10 +194,13 @@ namespace OpenSim.Region.Framework.Scenes
194 } 194 }
195 } 195 }
196 196
197 public delegate void SendCloseChildAgentDelegate(UUID agentID, ulong regionHandle);
198
197 /// <summary> 199 /// <summary>
198 /// Closes a child agent on a given region 200 /// This Closes child agents on neighboring regions
201 /// Calls an asynchronous method to do so.. so it doesn't lag the sim.
199 /// </summary> 202 /// </summary>
200 protected void SendCloseChildAgent(UUID agentID, ulong regionHandle) 203 protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle)
201 { 204 {
202 // let's do our best, but there's not much we can do if the neighbour doesn't accept. 205 // let's do our best, but there's not much we can do if the neighbour doesn't accept.
203 206
@@ -206,30 +209,29 @@ namespace OpenSim.Region.Framework.Scenes
206 Utils.LongToUInts(regionHandle, out x, out y); 209 Utils.LongToUInts(regionHandle, out x, out y);
207 210
208 GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y); 211 GridRegion destination = m_scene.GridService.GetRegionByPosition(m_regionInfo.ScopeID, (int)x, (int)y);
212 m_scene.SimulationService.CloseChildAgent(destination, agentID);
213 }
209 214
210 m_log.DebugFormat( 215 private void SendCloseChildAgentCompleted(IAsyncResult iar)
211 "[SCENE COMMUNICATION SERVICE]: Sending close agent ID {0} to {1}", agentID, destination.RegionName); 216 {
212 217 SendCloseChildAgentDelegate icon = (SendCloseChildAgentDelegate)iar.AsyncState;
213 m_scene.SimulationService.CloseAgent(destination, agentID); 218 icon.EndInvoke(iar);
214 } 219 }
215 220
216 /// <summary>
217 /// Closes a child agents in a collection of regions. Does so asynchronously
218 /// so that the caller doesn't wait.
219 /// </summary>
220 /// <param name="agentID"></param>
221 /// <param name="regionslst"></param>
222 public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst) 221 public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst)
223 { 222 {
224 foreach (ulong handle in regionslst) 223 foreach (ulong handle in regionslst)
225 { 224 {
226 SendCloseChildAgent(agentID, handle); 225 SendCloseChildAgentDelegate d = SendCloseChildAgentAsync;
226 d.BeginInvoke(agentID, handle,
227 SendCloseChildAgentCompleted,
228 d);
227 } 229 }
228 } 230 }
229 231
230 public List<GridRegion> RequestNamedRegions(string name, int maxNumber) 232 public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
231 { 233 {
232 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); 234 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
233 } 235 }
234 } 236 }
235} \ No newline at end of file 237}
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 209a770..c4b7b27 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -41,6 +41,12 @@ namespace OpenSim.Region.Framework.Scenes
41{ 41{
42 public delegate void PhysicsCrash(); 42 public delegate void PhysicsCrash();
43 43
44 public delegate void AttachToBackupDelegate(SceneObjectGroup sog);
45
46 public delegate void DetachFromBackupDelegate(SceneObjectGroup sog);
47
48 public delegate void ChangedBackupDelegate(SceneObjectGroup sog);
49
44 /// <summary> 50 /// <summary>
45 /// This class used to be called InnerScene and may not yet truly be a SceneGraph. The non scene graph components 51 /// This class used to be called InnerScene and may not yet truly be a SceneGraph. The non scene graph components
46 /// should be migrated out over time. 52 /// should be migrated out over time.
@@ -54,11 +60,15 @@ namespace OpenSim.Region.Framework.Scenes
54 protected internal event PhysicsCrash UnRecoverableError; 60 protected internal event PhysicsCrash UnRecoverableError;
55 private PhysicsCrash handlerPhysicsCrash = null; 61 private PhysicsCrash handlerPhysicsCrash = null;
56 62
63 public event AttachToBackupDelegate OnAttachToBackup;
64 public event DetachFromBackupDelegate OnDetachFromBackup;
65 public event ChangedBackupDelegate OnChangeBackup;
66
57 #endregion 67 #endregion
58 68
59 #region Fields 69 #region Fields
60 70
61 protected object m_presenceLock = new object(); 71 protected OpenMetaverse.ReaderWriterLockSlim m_scenePresencesLock = new OpenMetaverse.ReaderWriterLockSlim();
62 protected Dictionary<UUID, ScenePresence> m_scenePresenceMap = new Dictionary<UUID, ScenePresence>(); 72 protected Dictionary<UUID, ScenePresence> m_scenePresenceMap = new Dictionary<UUID, ScenePresence>();
63 protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>(); 73 protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>();
64 74
@@ -127,13 +137,18 @@ namespace OpenSim.Region.Framework.Scenes
127 137
128 protected internal void Close() 138 protected internal void Close()
129 { 139 {
130 lock (m_presenceLock) 140 m_scenePresencesLock.EnterWriteLock();
141 try
131 { 142 {
132 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(); 143 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>();
133 List<ScenePresence> newlist = new List<ScenePresence>(); 144 List<ScenePresence> newlist = new List<ScenePresence>();
134 m_scenePresenceMap = newmap; 145 m_scenePresenceMap = newmap;
135 m_scenePresenceArray = newlist; 146 m_scenePresenceArray = newlist;
136 } 147 }
148 finally
149 {
150 m_scenePresencesLock.ExitWriteLock();
151 }
137 152
138 lock (SceneObjectGroupsByFullID) 153 lock (SceneObjectGroupsByFullID)
139 SceneObjectGroupsByFullID.Clear(); 154 SceneObjectGroupsByFullID.Clear();
@@ -254,6 +269,33 @@ namespace OpenSim.Region.Framework.Scenes
254 protected internal bool AddRestoredSceneObject( 269 protected internal bool AddRestoredSceneObject(
255 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates) 270 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
256 { 271 {
272 if (!m_parentScene.CombineRegions)
273 {
274 // KF: Check for out-of-region, move inside and make static.
275 Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X,
276 sceneObject.RootPart.GroupPosition.Y,
277 sceneObject.RootPart.GroupPosition.Z);
278 if (!(((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0))) && (npos.X < 0.0 || npos.Y < 0.0 || npos.Z < 0.0 ||
279 npos.X > Constants.RegionSize ||
280 npos.Y > Constants.RegionSize))
281 {
282 if (npos.X < 0.0) npos.X = 1.0f;
283 if (npos.Y < 0.0) npos.Y = 1.0f;
284 if (npos.Z < 0.0) npos.Z = 0.0f;
285 if (npos.X > Constants.RegionSize) npos.X = Constants.RegionSize - 1.0f;
286 if (npos.Y > Constants.RegionSize) npos.Y = Constants.RegionSize - 1.0f;
287
288 foreach (SceneObjectPart part in sceneObject.Parts)
289 {
290 part.GroupPosition = npos;
291 }
292 sceneObject.RootPart.Velocity = Vector3.Zero;
293 sceneObject.RootPart.AngularVelocity = Vector3.Zero;
294 sceneObject.RootPart.Acceleration = Vector3.Zero;
295 sceneObject.RootPart.Velocity = Vector3.Zero;
296 }
297 }
298
257 if (attachToBackup && (!alreadyPersisted)) 299 if (attachToBackup && (!alreadyPersisted))
258 { 300 {
259 sceneObject.ForceInventoryPersistence(); 301 sceneObject.ForceInventoryPersistence();
@@ -317,9 +359,8 @@ namespace OpenSim.Region.Framework.Scenes
317 if (pa != null && pa.IsPhysical && vel != Vector3.Zero) 359 if (pa != null && pa.IsPhysical && vel != Vector3.Zero)
318 { 360 {
319 sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false); 361 sceneObject.RootPart.ApplyImpulse((vel * sceneObject.GetMass()), false);
320 sceneObject.Velocity = vel;
321 } 362 }
322 363
323 return true; 364 return true;
324 } 365 }
325 366
@@ -344,6 +385,11 @@ namespace OpenSim.Region.Framework.Scenes
344 /// </returns> 385 /// </returns>
345 protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) 386 protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
346 { 387 {
388 if (sceneObject == null)
389 {
390 m_log.ErrorFormat("[SCENEGRAPH]: Tried to add null scene object");
391 return false;
392 }
347 if (sceneObject.UUID == UUID.Zero) 393 if (sceneObject.UUID == UUID.Zero)
348 { 394 {
349 m_log.ErrorFormat( 395 m_log.ErrorFormat(
@@ -475,6 +521,30 @@ namespace OpenSim.Region.Framework.Scenes
475 m_updateList[obj.UUID] = obj; 521 m_updateList[obj.UUID] = obj;
476 } 522 }
477 523
524 public void FireAttachToBackup(SceneObjectGroup obj)
525 {
526 if (OnAttachToBackup != null)
527 {
528 OnAttachToBackup(obj);
529 }
530 }
531
532 public void FireDetachFromBackup(SceneObjectGroup obj)
533 {
534 if (OnDetachFromBackup != null)
535 {
536 OnDetachFromBackup(obj);
537 }
538 }
539
540 public void FireChangeBackup(SceneObjectGroup obj)
541 {
542 if (OnChangeBackup != null)
543 {
544 OnChangeBackup(obj);
545 }
546 }
547
478 /// <summary> 548 /// <summary>
479 /// Process all pending updates 549 /// Process all pending updates
480 /// </summary> 550 /// </summary>
@@ -519,12 +589,12 @@ namespace OpenSim.Region.Framework.Scenes
519 589
520 protected internal void AddPhysicalPrim(int number) 590 protected internal void AddPhysicalPrim(int number)
521 { 591 {
522 m_physicalPrim++; 592 m_physicalPrim += number;
523 } 593 }
524 594
525 protected internal void RemovePhysicalPrim(int number) 595 protected internal void RemovePhysicalPrim(int number)
526 { 596 {
527 m_physicalPrim--; 597 m_physicalPrim -= number;
528 } 598 }
529 599
530 protected internal void AddToScriptLPS(int number) 600 protected internal void AddToScriptLPS(int number)
@@ -592,7 +662,8 @@ namespace OpenSim.Region.Framework.Scenes
592 662
593 Entities[presence.UUID] = presence; 663 Entities[presence.UUID] = presence;
594 664
595 lock (m_presenceLock) 665 m_scenePresencesLock.EnterWriteLock();
666 try
596 { 667 {
597 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap); 668 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
598 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray); 669 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
@@ -616,6 +687,10 @@ namespace OpenSim.Region.Framework.Scenes
616 m_scenePresenceMap = newmap; 687 m_scenePresenceMap = newmap;
617 m_scenePresenceArray = newlist; 688 m_scenePresenceArray = newlist;
618 } 689 }
690 finally
691 {
692 m_scenePresencesLock.ExitWriteLock();
693 }
619 } 694 }
620 695
621 /// <summary> 696 /// <summary>
@@ -630,7 +705,8 @@ namespace OpenSim.Region.Framework.Scenes
630 agentID); 705 agentID);
631 } 706 }
632 707
633 lock (m_presenceLock) 708 m_scenePresencesLock.EnterWriteLock();
709 try
634 { 710 {
635 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap); 711 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
636 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray); 712 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
@@ -652,6 +728,10 @@ namespace OpenSim.Region.Framework.Scenes
652 m_log.WarnFormat("[SCENE GRAPH]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID); 728 m_log.WarnFormat("[SCENE GRAPH]: Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID);
653 } 729 }
654 } 730 }
731 finally
732 {
733 m_scenePresencesLock.ExitWriteLock();
734 }
655 } 735 }
656 736
657 protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F) 737 protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F)
@@ -1181,6 +1261,52 @@ namespace OpenSim.Region.Framework.Scenes
1181 1261
1182 #region Client Event handlers 1262 #region Client Event handlers
1183 1263
1264 protected internal void ClientChangeObject(uint localID, object odata, IClientAPI remoteClient)
1265 {
1266 SceneObjectPart part = GetSceneObjectPart(localID);
1267 ObjectChangeData data = (ObjectChangeData)odata;
1268
1269 if (part != null)
1270 {
1271 SceneObjectGroup grp = part.ParentGroup;
1272 if (grp != null)
1273 {
1274 if (m_parentScene.Permissions.CanEditObject(grp.UUID, remoteClient.AgentId))
1275 {
1276 // These two are exceptions SL makes in the interpretation
1277 // of the change flags. Must check them here because otherwise
1278 // the group flag (see below) would be lost
1279 if (data.change == ObjectChangeType.groupS)
1280 data.change = ObjectChangeType.primS;
1281 if (data.change == ObjectChangeType.groupPS)
1282 data.change = ObjectChangeType.primPS;
1283 part.StoreUndoState(data.change); // lets test only saving what we changed
1284 grp.doChangeObject(part, (ObjectChangeData)data);
1285 }
1286 else
1287 {
1288 // Is this any kind of group operation?
1289 if ((data.change & ObjectChangeType.Group) != 0)
1290 {
1291 // Is a move and/or rotation requested?
1292 if ((data.change & (ObjectChangeType.Position | ObjectChangeType.Rotation)) != 0)
1293 {
1294 // Are we allowed to move it?
1295 if (m_parentScene.Permissions.CanMoveObject(grp.UUID, remoteClient.AgentId))
1296 {
1297 // Strip all but move and rotation from request
1298 data.change &= (ObjectChangeType.Group | ObjectChangeType.Position | ObjectChangeType.Rotation);
1299
1300 part.StoreUndoState(data.change);
1301 grp.doChangeObject(part, (ObjectChangeData)data);
1302 }
1303 }
1304 }
1305 }
1306 }
1307 }
1308 }
1309
1184 /// <summary> 1310 /// <summary>
1185 /// Update the scale of an individual prim. 1311 /// Update the scale of an individual prim.
1186 /// </summary> 1312 /// </summary>
@@ -1195,7 +1321,17 @@ namespace OpenSim.Region.Framework.Scenes
1195 { 1321 {
1196 if (m_parentScene.Permissions.CanEditObject(part.ParentGroup.UUID, remoteClient.AgentId)) 1322 if (m_parentScene.Permissions.CanEditObject(part.ParentGroup.UUID, remoteClient.AgentId))
1197 { 1323 {
1324 bool physbuild = false;
1325 if (part.ParentGroup.RootPart.PhysActor != null)
1326 {
1327 part.ParentGroup.RootPart.PhysActor.Building = true;
1328 physbuild = true;
1329 }
1330
1198 part.Resize(scale); 1331 part.Resize(scale);
1332
1333 if (physbuild)
1334 part.ParentGroup.RootPart.PhysActor.Building = false;
1199 } 1335 }
1200 } 1336 }
1201 } 1337 }
@@ -1207,7 +1343,17 @@ namespace OpenSim.Region.Framework.Scenes
1207 { 1343 {
1208 if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) 1344 if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
1209 { 1345 {
1346 bool physbuild = false;
1347 if (group.RootPart.PhysActor != null)
1348 {
1349 group.RootPart.PhysActor.Building = true;
1350 physbuild = true;
1351 }
1352
1210 group.GroupResize(scale); 1353 group.GroupResize(scale);
1354
1355 if (physbuild)
1356 group.RootPart.PhysActor.Building = false;
1211 } 1357 }
1212 } 1358 }
1213 } 1359 }
@@ -1335,8 +1481,13 @@ namespace OpenSim.Region.Framework.Scenes
1335 { 1481 {
1336 if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0)) 1482 if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0))
1337 { 1483 {
1338 if (m_parentScene.AttachmentsModule != null) 1484 // Set the new attachment point data in the object
1339 m_parentScene.AttachmentsModule.UpdateAttachmentPosition(group, pos); 1485 byte attachmentPoint = group.GetAttachmentPoint();
1486 group.UpdateGroupPosition(pos);
1487 group.IsAttachment = false;
1488 group.AbsolutePosition = group.RootPart.AttachedPos;
1489 group.AttachmentPoint = attachmentPoint;
1490 group.HasGroupChanged = true;
1340 } 1491 }
1341 else 1492 else
1342 { 1493 {
@@ -1384,7 +1535,7 @@ namespace OpenSim.Region.Framework.Scenes
1384 /// <param name="SetPhantom"></param> 1535 /// <param name="SetPhantom"></param>
1385 /// <param name="remoteClient"></param> 1536 /// <param name="remoteClient"></param>
1386 protected internal void UpdatePrimFlags( 1537 protected internal void UpdatePrimFlags(
1387 uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, IClientAPI remoteClient) 1538 uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, ExtraPhysicsData PhysData, IClientAPI remoteClient)
1388 { 1539 {
1389 SceneObjectGroup group = GetGroupByPrim(localID); 1540 SceneObjectGroup group = GetGroupByPrim(localID);
1390 if (group != null) 1541 if (group != null)
@@ -1392,7 +1543,28 @@ namespace OpenSim.Region.Framework.Scenes
1392 if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId)) 1543 if (m_parentScene.Permissions.CanEditObject(group.UUID, remoteClient.AgentId))
1393 { 1544 {
1394 // VolumeDetect can't be set via UI and will always be off when a change is made there 1545 // VolumeDetect can't be set via UI and will always be off when a change is made there
1395 group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, false); 1546 // now only change volume dtc if phantom off
1547
1548 if (PhysData.PhysShapeType == PhysShapeType.invalid) // check for extraPhysics data
1549 {
1550 bool vdtc;
1551 if (SetPhantom) // if phantom keep volumedtc
1552 vdtc = group.RootPart.VolumeDetectActive;
1553 else // else turn it off
1554 vdtc = false;
1555
1556 group.UpdatePrimFlags(localID, UsePhysics, SetTemporary, SetPhantom, vdtc);
1557 }
1558 else
1559 {
1560 SceneObjectPart part = GetSceneObjectPart(localID);
1561 if (part != null)
1562 {
1563 part.UpdateExtraPhysics(PhysData);
1564 if (part.UpdatePhysRequired)
1565 remoteClient.SendPartPhysicsProprieties(part);
1566 }
1567 }
1396 } 1568 }
1397 } 1569 }
1398 } 1570 }
@@ -1536,6 +1708,7 @@ namespace OpenSim.Region.Framework.Scenes
1536 { 1708 {
1537 part.Material = Convert.ToByte(material); 1709 part.Material = Convert.ToByte(material);
1538 group.HasGroupChanged = true; 1710 group.HasGroupChanged = true;
1711 remoteClient.SendPartPhysicsProprieties(part);
1539 } 1712 }
1540 } 1713 }
1541 } 1714 }
@@ -1600,6 +1773,12 @@ namespace OpenSim.Region.Framework.Scenes
1600 /// <param name="childPrims"></param> 1773 /// <param name="childPrims"></param>
1601 protected internal void LinkObjects(SceneObjectPart root, List<SceneObjectPart> children) 1774 protected internal void LinkObjects(SceneObjectPart root, List<SceneObjectPart> children)
1602 { 1775 {
1776 if (root.KeyframeMotion != null)
1777 {
1778 root.KeyframeMotion.Stop();
1779 root.KeyframeMotion = null;
1780 }
1781
1603 SceneObjectGroup parentGroup = root.ParentGroup; 1782 SceneObjectGroup parentGroup = root.ParentGroup;
1604 if (parentGroup == null) return; 1783 if (parentGroup == null) return;
1605 1784
@@ -1608,8 +1787,10 @@ namespace OpenSim.Region.Framework.Scenes
1608 return; 1787 return;
1609 1788
1610 Monitor.Enter(m_updateLock); 1789 Monitor.Enter(m_updateLock);
1790
1611 try 1791 try
1612 { 1792 {
1793
1613 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>(); 1794 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>();
1614 1795
1615 // We do this in reverse to get the link order of the prims correct 1796 // We do this in reverse to get the link order of the prims correct
@@ -1624,9 +1805,13 @@ namespace OpenSim.Region.Framework.Scenes
1624 // Make sure no child prim is set for sale 1805 // Make sure no child prim is set for sale
1625 // So that, on delink, no prims are unwittingly 1806 // So that, on delink, no prims are unwittingly
1626 // left for sale and sold off 1807 // left for sale and sold off
1627 child.RootPart.ObjectSaleType = 0; 1808
1628 child.RootPart.SalePrice = 10; 1809 if (child != null)
1629 childGroups.Add(child); 1810 {
1811 child.RootPart.ObjectSaleType = 0;
1812 child.RootPart.SalePrice = 10;
1813 childGroups.Add(child);
1814 }
1630 } 1815 }
1631 1816
1632 foreach (SceneObjectGroup child in childGroups) 1817 foreach (SceneObjectGroup child in childGroups)
@@ -1655,6 +1840,15 @@ namespace OpenSim.Region.Framework.Scenes
1655 } 1840 }
1656 finally 1841 finally
1657 { 1842 {
1843 lock (SceneObjectGroupsByLocalPartID)
1844 {
1845 foreach (SceneObjectPart part in parentGroup.Parts)
1846 SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup;
1847 }
1848
1849 parentGroup.HasGroupChanged = true;
1850 parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true);
1851 parentGroup.ScheduleGroupForFullUpdate();
1658 Monitor.Exit(m_updateLock); 1852 Monitor.Exit(m_updateLock);
1659 } 1853 }
1660 } 1854 }
@@ -1677,6 +1871,11 @@ namespace OpenSim.Region.Framework.Scenes
1677 { 1871 {
1678 if (part != null) 1872 if (part != null)
1679 { 1873 {
1874 if (part.KeyframeMotion != null)
1875 {
1876 part.KeyframeMotion.Stop();
1877 part.KeyframeMotion = null;
1878 }
1680 if (part.ParentGroup.PrimCount != 1) // Skip single 1879 if (part.ParentGroup.PrimCount != 1) // Skip single
1681 { 1880 {
1682 if (part.LinkNum < 2) // Root 1881 if (part.LinkNum < 2) // Root
@@ -1691,21 +1890,23 @@ namespace OpenSim.Region.Framework.Scenes
1691 1890
1692 SceneObjectGroup group = part.ParentGroup; 1891 SceneObjectGroup group = part.ParentGroup;
1693 if (!affectedGroups.Contains(group)) 1892 if (!affectedGroups.Contains(group))
1893 {
1694 affectedGroups.Add(group); 1894 affectedGroups.Add(group);
1895 }
1695 } 1896 }
1696 } 1897 }
1697 } 1898 }
1698 1899
1699 foreach (SceneObjectPart child in childParts) 1900 if (childParts.Count > 0)
1700 { 1901 {
1701 // Unlink all child parts from their groups 1902 foreach (SceneObjectPart child in childParts)
1702 // 1903 {
1703 child.ParentGroup.DelinkFromGroup(child, true); 1904 // Unlink all child parts from their groups
1704 1905 //
1705 // These are not in affected groups and will not be 1906 child.ParentGroup.DelinkFromGroup(child, true);
1706 // handled further. Do the honors here. 1907 child.ParentGroup.HasGroupChanged = true;
1707 child.ParentGroup.HasGroupChanged = true; 1908 child.ParentGroup.ScheduleGroupForFullUpdate();
1708 child.ParentGroup.ScheduleGroupForFullUpdate(); 1909 }
1709 } 1910 }
1710 1911
1711 foreach (SceneObjectPart root in rootParts) 1912 foreach (SceneObjectPart root in rootParts)
@@ -1719,52 +1920,61 @@ namespace OpenSim.Region.Framework.Scenes
1719 List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts); 1920 List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts);
1720 int numChildren = newSet.Count; 1921 int numChildren = newSet.Count;
1721 1922
1923 if (numChildren == 1)
1924 break;
1925
1722 // If there are prims left in a link set, but the root is 1926 // If there are prims left in a link set, but the root is
1723 // slated for unlink, we need to do this 1927 // slated for unlink, we need to do this
1928 // Unlink the remaining set
1724 // 1929 //
1725 if (numChildren != 1) 1930 bool sendEventsToRemainder = true;
1726 { 1931 if (numChildren > 1)
1727 // Unlink the remaining set 1932 sendEventsToRemainder = false;
1728 //
1729 bool sendEventsToRemainder = true;
1730 if (numChildren > 1)
1731 sendEventsToRemainder = false;
1732 1933
1733 foreach (SceneObjectPart p in newSet) 1934 foreach (SceneObjectPart p in newSet)
1935 {
1936 if (p != group.RootPart)
1734 { 1937 {
1735 if (p != group.RootPart) 1938 group.DelinkFromGroup(p, sendEventsToRemainder);
1736 group.DelinkFromGroup(p, sendEventsToRemainder); 1939 if (numChildren > 2)
1940 {
1941 }
1942 else
1943 {
1944 p.ParentGroup.HasGroupChanged = true;
1945 p.ParentGroup.ScheduleGroupForFullUpdate();
1946 }
1737 } 1947 }
1948 }
1949
1950 // If there is more than one prim remaining, we
1951 // need to re-link
1952 //
1953 if (numChildren > 2)
1954 {
1955 // Remove old root
1956 //
1957 if (newSet.Contains(root))
1958 newSet.Remove(root);
1738 1959
1739 // If there is more than one prim remaining, we 1960 // Preserve link ordering
1740 // need to re-link
1741 // 1961 //
1742 if (numChildren > 2) 1962 newSet.Sort(delegate (SceneObjectPart a, SceneObjectPart b)
1743 { 1963 {
1744 // Remove old root 1964 return a.LinkNum.CompareTo(b.LinkNum);
1745 // 1965 });
1746 if (newSet.Contains(root))
1747 newSet.Remove(root);
1748
1749 // Preserve link ordering
1750 //
1751 newSet.Sort(delegate (SceneObjectPart a, SceneObjectPart b)
1752 {
1753 return a.LinkNum.CompareTo(b.LinkNum);
1754 });
1755 1966
1756 // Determine new root 1967 // Determine new root
1757 // 1968 //
1758 SceneObjectPart newRoot = newSet[0]; 1969 SceneObjectPart newRoot = newSet[0];
1759 newSet.RemoveAt(0); 1970 newSet.RemoveAt(0);
1760 1971
1761 foreach (SceneObjectPart newChild in newSet) 1972 foreach (SceneObjectPart newChild in newSet)
1762 newChild.ClearUpdateSchedule(); 1973 newChild.ClearUpdateSchedule();
1763 1974
1764 LinkObjects(newRoot, newSet); 1975 LinkObjects(newRoot, newSet);
1765 if (!affectedGroups.Contains(newRoot.ParentGroup)) 1976 if (!affectedGroups.Contains(newRoot.ParentGroup))
1766 affectedGroups.Add(newRoot.ParentGroup); 1977 affectedGroups.Add(newRoot.ParentGroup);
1767 }
1768 } 1978 }
1769 } 1979 }
1770 1980
@@ -1772,6 +1982,11 @@ namespace OpenSim.Region.Framework.Scenes
1772 // 1982 //
1773 foreach (SceneObjectGroup g in affectedGroups) 1983 foreach (SceneObjectGroup g in affectedGroups)
1774 { 1984 {
1985 // Child prims that have been unlinked and deleted will
1986 // return unless the root is deleted. This will remove them
1987 // from the database. They will be rewritten immediately,
1988 // minus the rows for the unlinked child prims.
1989 m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID);
1775 g.TriggerScriptChangedEvent(Changed.LINK); 1990 g.TriggerScriptChangedEvent(Changed.LINK);
1776 g.HasGroupChanged = true; // Persist 1991 g.HasGroupChanged = true; // Persist
1777 g.ScheduleGroupForFullUpdate(); 1992 g.ScheduleGroupForFullUpdate();
@@ -1845,108 +2060,96 @@ namespace OpenSim.Region.Framework.Scenes
1845 /// <param name="GroupID"></param> 2060 /// <param name="GroupID"></param>
1846 /// <param name="rot"></param> 2061 /// <param name="rot"></param>
1847 /// <returns>null if duplication fails, otherwise the duplicated object</returns> 2062 /// <returns>null if duplication fails, otherwise the duplicated object</returns>
1848 public SceneObjectGroup DuplicateObject( 2063 /// <summary>
1849 uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot) 2064 public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot)
1850 { 2065 {
1851 Monitor.Enter(m_updateLock); 2066// m_log.DebugFormat(
2067// "[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}",
2068// originalPrimID, offset, AgentID);
1852 2069
1853 try 2070 SceneObjectGroup original = GetGroupByPrim(originalPrimID);
2071 if (original != null)
1854 { 2072 {
1855 // m_log.DebugFormat( 2073 if (m_parentScene.Permissions.CanDuplicateObject(
1856 // "[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", 2074 original.PrimCount, original.UUID, AgentID, original.AbsolutePosition))
1857 // originalPrimID, offset, AgentID);
1858
1859 SceneObjectGroup original = GetGroupByPrim(originalPrimID);
1860 if (original == null)
1861 { 2075 {
1862 m_log.WarnFormat( 2076 SceneObjectGroup copy = original.Copy(true);
1863 "[SCENEGRAPH]: Attempt to duplicate nonexistant prim id {0} by {1}", originalPrimID, AgentID); 2077 copy.AbsolutePosition = copy.AbsolutePosition + offset;
1864 2078
1865 return null; 2079 if (original.OwnerID != AgentID)
1866 } 2080 {
2081 copy.SetOwnerId(AgentID);
2082 copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID);
1867 2083
1868 if (!m_parentScene.Permissions.CanDuplicateObject( 2084 SceneObjectPart[] partList = copy.Parts;
1869 original.PrimCount, original.UUID, AgentID, original.AbsolutePosition))
1870 return null;
1871 2085
1872 SceneObjectGroup copy = original.Copy(true); 2086 if (m_parentScene.Permissions.PropagatePermissions())
1873 copy.AbsolutePosition = copy.AbsolutePosition + offset; 2087 {
2088 foreach (SceneObjectPart child in partList)
2089 {
2090 child.Inventory.ChangeInventoryOwner(AgentID);
2091 child.TriggerScriptChangedEvent(Changed.OWNER);
2092 child.ApplyNextOwnerPermissions();
2093 }
2094 }
2095 }
1874 2096
1875 if (original.OwnerID != AgentID) 2097 // FIXME: This section needs to be refactored so that it just calls AddSceneObject()
1876 { 2098 Entities.Add(copy);
1877 copy.SetOwnerId(AgentID);
1878 copy.SetRootPartOwner(copy.RootPart, AgentID, GroupID);
1879 2099
1880 SceneObjectPart[] partList = copy.Parts; 2100 lock (SceneObjectGroupsByFullID)
2101 SceneObjectGroupsByFullID[copy.UUID] = copy;
1881 2102
1882 if (m_parentScene.Permissions.PropagatePermissions()) 2103 SceneObjectPart[] children = copy.Parts;
2104
2105 lock (SceneObjectGroupsByFullPartID)
1883 { 2106 {
1884 foreach (SceneObjectPart child in partList) 2107 SceneObjectGroupsByFullPartID[copy.UUID] = copy;
1885 { 2108 foreach (SceneObjectPart part in children)
1886 child.Inventory.ChangeInventoryOwner(AgentID); 2109 SceneObjectGroupsByFullPartID[part.UUID] = copy;
1887 child.TriggerScriptChangedEvent(Changed.OWNER);
1888 child.ApplyNextOwnerPermissions();
1889 }
1890 } 2110 }
1891 2111
1892 copy.RootPart.ObjectSaleType = 0; 2112 lock (SceneObjectGroupsByLocalPartID)
1893 copy.RootPart.SalePrice = 10; 2113 {
1894 } 2114 SceneObjectGroupsByLocalPartID[copy.LocalId] = copy;
2115 foreach (SceneObjectPart part in children)
2116 SceneObjectGroupsByLocalPartID[part.LocalId] = copy;
2117 }
2118 // PROBABLE END OF FIXME
1895 2119
1896 // FIXME: This section needs to be refactored so that it just calls AddSceneObject() 2120 // Since we copy from a source group that is in selected
1897 Entities.Add(copy); 2121 // state, but the copy is shown deselected in the viewer,
1898 2122 // We need to clear the selection flag here, else that
1899 lock (SceneObjectGroupsByFullID) 2123 // prim never gets persisted at all. The client doesn't
1900 SceneObjectGroupsByFullID[copy.UUID] = copy; 2124 // think it's selected, so it will never send a deselect...
1901 2125 copy.IsSelected = false;
1902 SceneObjectPart[] children = copy.Parts; 2126
1903 2127 m_numPrim += copy.Parts.Length;
1904 lock (SceneObjectGroupsByFullPartID) 2128
1905 { 2129 if (rot != Quaternion.Identity)
1906 SceneObjectGroupsByFullPartID[copy.UUID] = copy; 2130 {
1907 foreach (SceneObjectPart part in children) 2131 copy.UpdateGroupRotationR(rot);
1908 SceneObjectGroupsByFullPartID[part.UUID] = copy; 2132 }
1909 }
1910
1911 lock (SceneObjectGroupsByLocalPartID)
1912 {
1913 SceneObjectGroupsByLocalPartID[copy.LocalId] = copy;
1914 foreach (SceneObjectPart part in children)
1915 SceneObjectGroupsByLocalPartID[part.LocalId] = copy;
1916 }
1917 // PROBABLE END OF FIXME
1918
1919 // Since we copy from a source group that is in selected
1920 // state, but the copy is shown deselected in the viewer,
1921 // We need to clear the selection flag here, else that
1922 // prim never gets persisted at all. The client doesn't
1923 // think it's selected, so it will never send a deselect...
1924 copy.IsSelected = false;
1925
1926 m_numPrim += copy.Parts.Length;
1927
1928 if (rot != Quaternion.Identity)
1929 {
1930 copy.UpdateGroupRotationR(rot);
1931 }
1932 2133
1933 copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 1); 2134 copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 1);
1934 copy.HasGroupChanged = true; 2135 copy.HasGroupChanged = true;
1935 copy.ScheduleGroupForFullUpdate(); 2136 copy.ScheduleGroupForFullUpdate();
1936 copy.ResumeScripts(); 2137 copy.ResumeScripts();
1937 2138
1938 // required for physics to update it's position 2139 // required for physics to update it's position
1939 copy.AbsolutePosition = copy.AbsolutePosition; 2140 copy.AbsolutePosition = copy.AbsolutePosition;
1940 2141
1941 return copy; 2142 return copy;
2143 }
1942 } 2144 }
1943 finally 2145 else
1944 { 2146 {
1945 Monitor.Exit(m_updateLock); 2147 m_log.WarnFormat("[SCENE]: Attempted to duplicate nonexistant prim id {0}", GroupID);
1946 } 2148 }
2149
2150 return null;
1947 } 2151 }
1948 2152
1949 /// <summary>
1950 /// Calculates the distance between two Vector3s 2153 /// Calculates the distance between two Vector3s
1951 /// </summary> 2154 /// </summary>
1952 /// <param name="v1"></param> 2155 /// <param name="v1"></param>
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index c81b55d..f1b09ca 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -95,12 +95,12 @@ namespace OpenSim.Region.Framework.Scenes
95 get { return m_instance; } 95 get { return m_instance; }
96 } 96 }
97 97
98 private readonly List<Scene> m_localScenes = new List<Scene>(); 98 private readonly DoubleDictionary<UUID, string, Scene> m_localScenes = new DoubleDictionary<UUID, string, Scene>();
99 private Scene m_currentScene = null; 99 private Scene m_currentScene = null;
100 100
101 public List<Scene> Scenes 101 public List<Scene> Scenes
102 { 102 {
103 get { return new List<Scene>(m_localScenes); } 103 get { return new List<Scene>(m_localScenes.FindAll(delegate(Scene s) { return true; })); }
104 } 104 }
105 105
106 public Scene CurrentScene 106 public Scene CurrentScene
@@ -114,13 +114,10 @@ namespace OpenSim.Region.Framework.Scenes
114 { 114 {
115 if (m_currentScene == null) 115 if (m_currentScene == null)
116 { 116 {
117 lock (m_localScenes) 117 List<Scene> sceneList = Scenes;
118 { 118 if (sceneList.Count == 0)
119 if (m_localScenes.Count > 0) 119 return null;
120 return m_localScenes[0]; 120 return sceneList[0];
121 else
122 return null;
123 }
124 } 121 }
125 else 122 else
126 { 123 {
@@ -132,7 +129,7 @@ namespace OpenSim.Region.Framework.Scenes
132 public SceneManager() 129 public SceneManager()
133 { 130 {
134 m_instance = this; 131 m_instance = this;
135 m_localScenes = new List<Scene>(); 132 m_localScenes = new DoubleDictionary<UUID, string, Scene>();
136 } 133 }
137 134
138 public void Close() 135 public void Close()
@@ -140,20 +137,18 @@ namespace OpenSim.Region.Framework.Scenes
140 // collect known shared modules in sharedModules 137 // collect known shared modules in sharedModules
141 Dictionary<string, IRegionModule> sharedModules = new Dictionary<string, IRegionModule>(); 138 Dictionary<string, IRegionModule> sharedModules = new Dictionary<string, IRegionModule>();
142 139
143 lock (m_localScenes) 140 List<Scene> sceneList = Scenes;
141 for (int i = 0; i < sceneList.Count; i++)
144 { 142 {
145 for (int i = 0; i < m_localScenes.Count; i++) 143 // extract known shared modules from scene
144 foreach (string k in sceneList[i].Modules.Keys)
146 { 145 {
147 // extract known shared modules from scene 146 if (sceneList[i].Modules[k].IsSharedModule &&
148 foreach (string k in m_localScenes[i].Modules.Keys) 147 !sharedModules.ContainsKey(k))
149 { 148 sharedModules[k] = sceneList[i].Modules[k];
150 if (m_localScenes[i].Modules[k].IsSharedModule &&
151 !sharedModules.ContainsKey(k))
152 sharedModules[k] = m_localScenes[i].Modules[k];
153 }
154 // close scene/region
155 m_localScenes[i].Close();
156 } 149 }
150 // close scene/region
151 sceneList[i].Close();
157 } 152 }
158 153
159 // all regions/scenes are now closed, we can now safely 154 // all regions/scenes are now closed, we can now safely
@@ -162,29 +157,21 @@ namespace OpenSim.Region.Framework.Scenes
162 { 157 {
163 mod.Close(); 158 mod.Close();
164 } 159 }
160
161 m_localScenes.Clear();
165 } 162 }
166 163
167 public void Close(Scene cscene) 164 public void Close(Scene cscene)
168 { 165 {
169 lock (m_localScenes) 166 if (!m_localScenes.ContainsKey(cscene.RegionInfo.RegionID))
170 { 167 return;
171 if (m_localScenes.Contains(cscene)) 168 cscene.Close();
172 {
173 for (int i = 0; i < m_localScenes.Count; i++)
174 {
175 if (m_localScenes[i].Equals(cscene))
176 {
177 m_localScenes[i].Close();
178 }
179 }
180 }
181 }
182 } 169 }
183 170
184 public void Add(Scene scene) 171 public void Add(Scene scene)
185 { 172 {
186 lock (m_localScenes) 173 lock (m_localScenes)
187 m_localScenes.Add(scene); 174 m_localScenes.Add(scene.RegionInfo.RegionID, scene.RegionInfo.RegionName, scene);
188 175
189 scene.OnRestart += HandleRestart; 176 scene.OnRestart += HandleRestart;
190 scene.EventManager.OnRegionReadyStatusChange += HandleRegionReadyStatusChange; 177 scene.EventManager.OnRegionReadyStatusChange += HandleRegionReadyStatusChange;
@@ -196,23 +183,7 @@ namespace OpenSim.Region.Framework.Scenes
196 int RegionSceneElement = -1; 183 int RegionSceneElement = -1;
197 184
198 lock (m_localScenes) 185 lock (m_localScenes)
199 { 186 m_localScenes.Remove(rdata.RegionID);
200 for (int i = 0; i < m_localScenes.Count; i++)
201 {
202 if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName)
203 {
204 RegionSceneElement = i;
205 }
206 }
207
208 // Now we make sure the region is no longer known about by the SceneManager
209 // Prevents duplicates.
210
211 if (RegionSceneElement >= 0)
212 {
213 m_localScenes.RemoveAt(RegionSceneElement);
214 }
215 }
216 187
217 // Send signal to main that we're restarting this sim. 188 // Send signal to main that we're restarting this sim.
218 OnRestartSim(rdata); 189 OnRestartSim(rdata);
@@ -221,39 +192,36 @@ namespace OpenSim.Region.Framework.Scenes
221 private void HandleRegionReadyStatusChange(IScene scene) 192 private void HandleRegionReadyStatusChange(IScene scene)
222 { 193 {
223 lock (m_localScenes) 194 lock (m_localScenes)
224 AllRegionsReady = m_localScenes.TrueForAll(s => s.Ready); 195 AllRegionsReady = m_localScenes.FindAll(s => !s.Ready).Count == 0;
225 } 196 }
226 197
227 public void SendSimOnlineNotification(ulong regionHandle) 198 public void SendSimOnlineNotification(ulong regionHandle)
228 { 199 {
229 RegionInfo Result = null; 200 RegionInfo Result = null;
230 201
231 lock (m_localScenes) 202 Scene s = m_localScenes.FindValue(delegate(Scene x)
232 {
233 for (int i = 0; i < m_localScenes.Count; i++)
234 {
235 if (m_localScenes[i].RegionInfo.RegionHandle == regionHandle)
236 { 203 {
237 // Inform other regions to tell their avatar about me 204 if (x.RegionInfo.RegionHandle == regionHandle)
238 Result = m_localScenes[i].RegionInfo; 205 return true;
239 } 206 return false;
240 } 207 });
241 208
242 if (Result != null) 209 if (s != null)
210 {
211 List<Scene> sceneList = Scenes;
212
213 for (int i = 0; i < sceneList.Count; i++)
243 { 214 {
244 for (int i = 0; i < m_localScenes.Count; i++) 215 if (sceneList[i]!= s)
245 { 216 {
246 if (m_localScenes[i].RegionInfo.RegionHandle != regionHandle) 217 // Inform other regions to tell their avatar about me
247 { 218 //sceneList[i].OtherRegionUp(Result);
248 // Inform other regions to tell their avatar about me
249 //m_localScenes[i].OtherRegionUp(Result);
250 }
251 } 219 }
252 } 220 }
253 else 221 }
254 { 222 else
255 m_log.Error("[REGION]: Unable to notify Other regions of this Region coming up"); 223 {
256 } 224 m_log.Error("[REGION]: Unable to notify Other regions of this Region coming up");
257 } 225 }
258 } 226 }
259 227
@@ -357,8 +325,8 @@ namespace OpenSim.Region.Framework.Scenes
357 { 325 {
358 if (m_currentScene == null) 326 if (m_currentScene == null)
359 { 327 {
360 lock (m_localScenes) 328 List<Scene> sceneList = Scenes;
361 m_localScenes.ForEach(func); 329 sceneList.ForEach(func);
362 } 330 }
363 else 331 else
364 { 332 {
@@ -387,16 +355,12 @@ namespace OpenSim.Region.Framework.Scenes
387 } 355 }
388 else 356 else
389 { 357 {
390 lock (m_localScenes) 358 Scene s;
359
360 if (m_localScenes.TryGetValue(regionName, out s))
391 { 361 {
392 foreach (Scene scene in m_localScenes) 362 m_currentScene = s;
393 { 363 return true;
394 if (String.Compare(scene.RegionInfo.RegionName, regionName, true) == 0)
395 {
396 m_currentScene = scene;
397 return true;
398 }
399 }
400 } 364 }
401 365
402 return false; 366 return false;
@@ -405,18 +369,14 @@ namespace OpenSim.Region.Framework.Scenes
405 369
406 public bool TrySetCurrentScene(UUID regionID) 370 public bool TrySetCurrentScene(UUID regionID)
407 { 371 {
408 m_log.Debug("Searching for Region: '" + regionID + "'"); 372// m_log.Debug("Searching for Region: '" + regionID + "'");
409 373
410 lock (m_localScenes) 374 Scene s;
375
376 if (m_localScenes.TryGetValue(regionID, out s))
411 { 377 {
412 foreach (Scene scene in m_localScenes) 378 m_currentScene = s;
413 { 379 return true;
414 if (scene.RegionInfo.RegionID == regionID)
415 {
416 m_currentScene = scene;
417 return true;
418 }
419 }
420 } 380 }
421 381
422 return false; 382 return false;
@@ -424,52 +384,24 @@ namespace OpenSim.Region.Framework.Scenes
424 384
425 public bool TryGetScene(string regionName, out Scene scene) 385 public bool TryGetScene(string regionName, out Scene scene)
426 { 386 {
427 lock (m_localScenes) 387 return m_localScenes.TryGetValue(regionName, out scene);
428 {
429 foreach (Scene mscene in m_localScenes)
430 {
431 if (String.Compare(mscene.RegionInfo.RegionName, regionName, true) == 0)
432 {
433 scene = mscene;
434 return true;
435 }
436 }
437 }
438
439 scene = null;
440 return false;
441 } 388 }
442 389
443 public bool TryGetScene(UUID regionID, out Scene scene) 390 public bool TryGetScene(UUID regionID, out Scene scene)
444 { 391 {
445 lock (m_localScenes) 392 return m_localScenes.TryGetValue(regionID, out scene);
446 {
447 foreach (Scene mscene in m_localScenes)
448 {
449 if (mscene.RegionInfo.RegionID == regionID)
450 {
451 scene = mscene;
452 return true;
453 }
454 }
455 }
456
457 scene = null;
458 return false;
459 } 393 }
460 394
461 public bool TryGetScene(uint locX, uint locY, out Scene scene) 395 public bool TryGetScene(uint locX, uint locY, out Scene scene)
462 { 396 {
463 lock (m_localScenes) 397 List<Scene> sceneList = Scenes;
398 foreach (Scene mscene in sceneList)
464 { 399 {
465 foreach (Scene mscene in m_localScenes) 400 if (mscene.RegionInfo.RegionLocX == locX &&
401 mscene.RegionInfo.RegionLocY == locY)
466 { 402 {
467 if (mscene.RegionInfo.RegionLocX == locX && 403 scene = mscene;
468 mscene.RegionInfo.RegionLocY == locY) 404 return true;
469 {
470 scene = mscene;
471 return true;
472 }
473 } 405 }
474 } 406 }
475 407
@@ -479,16 +411,14 @@ namespace OpenSim.Region.Framework.Scenes
479 411
480 public bool TryGetScene(IPEndPoint ipEndPoint, out Scene scene) 412 public bool TryGetScene(IPEndPoint ipEndPoint, out Scene scene)
481 { 413 {
482 lock (m_localScenes) 414 List<Scene> sceneList = Scenes;
415 foreach (Scene mscene in sceneList)
483 { 416 {
484 foreach (Scene mscene in m_localScenes) 417 if ((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) &&
418 (mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port))
485 { 419 {
486 if ((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) && 420 scene = mscene;
487 (mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port)) 421 return true;
488 {
489 scene = mscene;
490 return true;
491 }
492 } 422 }
493 } 423 }
494 424
@@ -553,15 +483,10 @@ namespace OpenSim.Region.Framework.Scenes
553 483
554 public RegionInfo GetRegionInfo(UUID regionID) 484 public RegionInfo GetRegionInfo(UUID regionID)
555 { 485 {
556 lock (m_localScenes) 486 Scene s;
487 if (m_localScenes.TryGetValue(regionID, out s))
557 { 488 {
558 foreach (Scene scene in m_localScenes) 489 return s.RegionInfo;
559 {
560 if (scene.RegionInfo.RegionID == regionID)
561 {
562 return scene.RegionInfo;
563 }
564 }
565 } 490 }
566 491
567 return null; 492 return null;
@@ -579,14 +504,12 @@ namespace OpenSim.Region.Framework.Scenes
579 504
580 public bool TryGetScenePresence(UUID avatarId, out ScenePresence avatar) 505 public bool TryGetScenePresence(UUID avatarId, out ScenePresence avatar)
581 { 506 {
582 lock (m_localScenes) 507 List<Scene> sceneList = Scenes;
508 foreach (Scene scene in sceneList)
583 { 509 {
584 foreach (Scene scene in m_localScenes) 510 if (scene.TryGetScenePresence(avatarId, out avatar))
585 { 511 {
586 if (scene.TryGetScenePresence(avatarId, out avatar)) 512 return true;
587 {
588 return true;
589 }
590 } 513 }
591 } 514 }
592 515
@@ -596,15 +519,13 @@ namespace OpenSim.Region.Framework.Scenes
596 519
597 public bool TryGetRootScenePresence(UUID avatarId, out ScenePresence avatar) 520 public bool TryGetRootScenePresence(UUID avatarId, out ScenePresence avatar)
598 { 521 {
599 lock (m_localScenes) 522 List<Scene> sceneList = Scenes;
523 foreach (Scene scene in sceneList)
600 { 524 {
601 foreach (Scene scene in m_localScenes) 525 avatar = scene.GetScenePresence(avatarId);
602 {
603 avatar = scene.GetScenePresence(avatarId);
604 526
605 if (avatar != null && !avatar.IsChildAgent) 527 if (avatar != null && !avatar.IsChildAgent)
606 return true; 528 return true;
607 }
608 } 529 }
609 530
610 avatar = null; 531 avatar = null;
@@ -614,21 +535,19 @@ namespace OpenSim.Region.Framework.Scenes
614 public void CloseScene(Scene scene) 535 public void CloseScene(Scene scene)
615 { 536 {
616 lock (m_localScenes) 537 lock (m_localScenes)
617 m_localScenes.Remove(scene); 538 m_localScenes.Remove(scene.RegionInfo.RegionID);
618 539
619 scene.Close(); 540 scene.Close();
620 } 541 }
621 542
622 public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar) 543 public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
623 { 544 {
624 lock (m_localScenes) 545 List<Scene> sceneList = Scenes;
546 foreach (Scene scene in sceneList)
625 { 547 {
626 foreach (Scene scene in m_localScenes) 548 if (scene.TryGetAvatarByName(avatarName, out avatar))
627 { 549 {
628 if (scene.TryGetAvatarByName(avatarName, out avatar)) 550 return true;
629 {
630 return true;
631 }
632 } 551 }
633 } 552 }
634 553
@@ -638,14 +557,12 @@ namespace OpenSim.Region.Framework.Scenes
638 557
639 public bool TryGetRootScenePresenceByName(string firstName, string lastName, out ScenePresence sp) 558 public bool TryGetRootScenePresenceByName(string firstName, string lastName, out ScenePresence sp)
640 { 559 {
641 lock (m_localScenes) 560 List<Scene> sceneList = Scenes;
561 foreach (Scene scene in sceneList)
642 { 562 {
643 foreach (Scene scene in m_localScenes) 563 sp = scene.GetScenePresence(firstName, lastName);
644 { 564 if (sp != null && !sp.IsChildAgent)
645 sp = scene.GetScenePresence(firstName, lastName); 565 return true;
646 if (sp != null && !sp.IsChildAgent)
647 return true;
648 }
649 } 566 }
650 567
651 sp = null; 568 sp = null;
@@ -654,8 +571,8 @@ namespace OpenSim.Region.Framework.Scenes
654 571
655 public void ForEachScene(Action<Scene> action) 572 public void ForEachScene(Action<Scene> action)
656 { 573 {
657 lock (m_localScenes) 574 List<Scene> sceneList = Scenes;
658 m_localScenes.ForEach(action); 575 sceneList.ForEach(action);
659 } 576 }
660 } 577 }
661} 578}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index ddf5da0..26524fb 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -81,10 +81,6 @@ namespace OpenSim.Region.Framework.Scenes
81 /// <summary> 81 /// <summary>
82 /// Stop and remove the scripts contained in all the prims in this group 82 /// Stop and remove the scripts contained in all the prims in this group
83 /// </summary> 83 /// </summary>
84 /// <param name="sceneObjectBeingDeleted">
85 /// Should be true if these scripts are being removed because the scene
86 /// object is being deleted. This will prevent spurious updates to the client.
87 /// </param>
88 public void RemoveScriptInstances(bool sceneObjectBeingDeleted) 84 public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
89 { 85 {
90 SceneObjectPart[] parts = m_parts.GetArray(); 86 SceneObjectPart[] parts = m_parts.GetArray();
@@ -247,6 +243,11 @@ namespace OpenSim.Region.Framework.Scenes
247 243
248 public uint GetEffectivePermissions() 244 public uint GetEffectivePermissions()
249 { 245 {
246 return GetEffectivePermissions(false);
247 }
248
249 public uint GetEffectivePermissions(bool useBase)
250 {
250 uint perms=(uint)(PermissionMask.Modify | 251 uint perms=(uint)(PermissionMask.Modify |
251 PermissionMask.Copy | 252 PermissionMask.Copy |
252 PermissionMask.Move | 253 PermissionMask.Move |
@@ -258,7 +259,10 @@ namespace OpenSim.Region.Framework.Scenes
258 for (int i = 0; i < parts.Length; i++) 259 for (int i = 0; i < parts.Length; i++)
259 { 260 {
260 SceneObjectPart part = parts[i]; 261 SceneObjectPart part = parts[i];
261 ownerMask &= part.OwnerMask; 262 if (useBase)
263 ownerMask &= part.BaseMask;
264 else
265 ownerMask &= part.OwnerMask;
262 perms &= part.Inventory.MaskEffectivePermissions(); 266 perms &= part.Inventory.MaskEffectivePermissions();
263 } 267 }
264 268
@@ -400,6 +404,9 @@ namespace OpenSim.Region.Framework.Scenes
400 404
401 public void ResumeScripts() 405 public void ResumeScripts()
402 { 406 {
407 if (m_scene.RegionInfo.RegionSettings.DisableScripts)
408 return;
409
403 SceneObjectPart[] parts = m_parts.GetArray(); 410 SceneObjectPart[] parts = m_parts.GetArray();
404 for (int i = 0; i < parts.Length; i++) 411 for (int i = 0; i < parts.Length; i++)
405 parts[i].Inventory.ResumeScripts(); 412 parts[i].Inventory.ResumeScripts();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b4a155e..fcb1571 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -24,12 +24,13 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.ComponentModel; 29using System.ComponentModel;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Drawing; 31using System.Drawing;
32using System.IO; 32using System.IO;
33using System.Diagnostics;
33using System.Linq; 34using System.Linq;
34using System.Threading; 35using System.Threading;
35using System.Xml; 36using System.Xml;
@@ -43,6 +44,7 @@ using OpenSim.Region.Framework.Scenes.Serialization;
43 44
44namespace OpenSim.Region.Framework.Scenes 45namespace OpenSim.Region.Framework.Scenes
45{ 46{
47
46 [Flags] 48 [Flags]
47 public enum scriptEvents 49 public enum scriptEvents
48 { 50 {
@@ -106,8 +108,12 @@ namespace OpenSim.Region.Framework.Scenes
106 /// since the group's last persistent backup 108 /// since the group's last persistent backup
107 /// </summary> 109 /// </summary>
108 private bool m_hasGroupChanged = false; 110 private bool m_hasGroupChanged = false;
109 private long timeFirstChanged; 111 private long timeFirstChanged = 0;
110 private long timeLastChanged; 112 private long timeLastChanged = 0;
113 private long m_maxPersistTime = 0;
114 private long m_minPersistTime = 0;
115 private Random m_rand;
116 private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
111 117
112 /// <summary> 118 /// <summary>
113 /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage 119 /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage
@@ -124,9 +130,39 @@ namespace OpenSim.Region.Framework.Scenes
124 { 130 {
125 if (value) 131 if (value)
126 { 132 {
133 if (m_isBackedUp)
134 {
135 m_scene.SceneGraph.FireChangeBackup(this);
136 }
127 timeLastChanged = DateTime.Now.Ticks; 137 timeLastChanged = DateTime.Now.Ticks;
128 if (!m_hasGroupChanged) 138 if (!m_hasGroupChanged)
129 timeFirstChanged = DateTime.Now.Ticks; 139 timeFirstChanged = DateTime.Now.Ticks;
140 if (m_rootPart != null && m_rootPart.UUID != null && m_scene != null)
141 {
142 if (m_rand == null)
143 {
144 byte[] val = new byte[16];
145 m_rootPart.UUID.ToBytes(val, 0);
146 m_rand = new Random(BitConverter.ToInt32(val, 0));
147 }
148
149 if (m_scene.GetRootAgentCount() == 0)
150 {
151 //If the region is empty, this change has been made by an automated process
152 //and thus we delay the persist time by a random amount between 1.5 and 2.5.
153
154 float factor = 1.5f + (float)(m_rand.NextDouble());
155 m_maxPersistTime = (long)((float)m_scene.m_persistAfter * factor);
156 m_minPersistTime = (long)((float)m_scene.m_dontPersistBefore * factor);
157 }
158 else
159 {
160 //If the region is not empty, we want to obey the minimum and maximum persist times
161 //but add a random factor so we stagger the object persistance a little
162 m_maxPersistTime = (long)((float)m_scene.m_persistAfter * (1.0d - (m_rand.NextDouble() / 5.0d))); //Multiply by 1.0-1.5
163 m_minPersistTime = (long)((float)m_scene.m_dontPersistBefore * (1.0d + (m_rand.NextDouble() / 2.0d))); //Multiply by 0.8-1.0
164 }
165 }
130 } 166 }
131 m_hasGroupChanged = value; 167 m_hasGroupChanged = value;
132 168
@@ -141,7 +177,7 @@ namespace OpenSim.Region.Framework.Scenes
141 /// Has the group changed due to an unlink operation? We record this in order to optimize deletion, since 177 /// Has the group changed due to an unlink operation? We record this in order to optimize deletion, since
142 /// an unlinked group currently has to be persisted to the database before we can perform an unlink operation. 178 /// an unlinked group currently has to be persisted to the database before we can perform an unlink operation.
143 /// </summary> 179 /// </summary>
144 public bool HasGroupChangedDueToDelink { get; private set; } 180 public bool HasGroupChangedDueToDelink { get; set; }
145 181
146 private bool isTimeToPersist() 182 private bool isTimeToPersist()
147 { 183 {
@@ -151,8 +187,19 @@ namespace OpenSim.Region.Framework.Scenes
151 return false; 187 return false;
152 if (m_scene.ShuttingDown) 188 if (m_scene.ShuttingDown)
153 return true; 189 return true;
190
191 if (m_minPersistTime == 0 || m_maxPersistTime == 0)
192 {
193 m_maxPersistTime = m_scene.m_persistAfter;
194 m_minPersistTime = m_scene.m_dontPersistBefore;
195 }
196
154 long currentTime = DateTime.Now.Ticks; 197 long currentTime = DateTime.Now.Ticks;
155 if (currentTime - timeLastChanged > m_scene.m_dontPersistBefore || currentTime - timeFirstChanged > m_scene.m_persistAfter) 198
199 if (timeLastChanged == 0) timeLastChanged = currentTime;
200 if (timeFirstChanged == 0) timeFirstChanged = currentTime;
201
202 if (currentTime - timeLastChanged > m_minPersistTime || currentTime - timeFirstChanged > m_maxPersistTime)
156 return true; 203 return true;
157 return false; 204 return false;
158 } 205 }
@@ -271,10 +318,10 @@ namespace OpenSim.Region.Framework.Scenes
271 318
272 private bool m_scriptListens_atTarget; 319 private bool m_scriptListens_atTarget;
273 private bool m_scriptListens_notAtTarget; 320 private bool m_scriptListens_notAtTarget;
274
275 private bool m_scriptListens_atRotTarget; 321 private bool m_scriptListens_atRotTarget;
276 private bool m_scriptListens_notAtRotTarget; 322 private bool m_scriptListens_notAtRotTarget;
277 323
324 public bool m_dupeInProgress = false;
278 internal Dictionary<UUID, string> m_savedScriptState; 325 internal Dictionary<UUID, string> m_savedScriptState;
279 326
280 #region Properties 327 #region Properties
@@ -311,6 +358,16 @@ namespace OpenSim.Region.Framework.Scenes
311 get { return m_parts.Count; } 358 get { return m_parts.Count; }
312 } 359 }
313 360
361// protected Quaternion m_rotation = Quaternion.Identity;
362//
363// public virtual Quaternion Rotation
364// {
365// get { return m_rotation; }
366// set {
367// m_rotation = value;
368// }
369// }
370
314 public Quaternion GroupRotation 371 public Quaternion GroupRotation
315 { 372 {
316 get { return m_rootPart.RotationOffset; } 373 get { return m_rootPart.RotationOffset; }
@@ -417,7 +474,15 @@ namespace OpenSim.Region.Framework.Scenes
417 { 474 {
418 return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0)); 475 return (IsAttachment || (m_rootPart.Shape.PCode == 9 && m_rootPart.Shape.State != 0));
419 } 476 }
420 477
478
479
480 private struct avtocrossInfo
481 {
482 public ScenePresence av;
483 public uint ParentID;
484 }
485
421 /// <summary> 486 /// <summary>
422 /// The absolute position of this scene object in the scene 487 /// The absolute position of this scene object in the scene
423 /// </summary> 488 /// </summary>
@@ -430,14 +495,128 @@ namespace OpenSim.Region.Framework.Scenes
430 495
431 if (Scene != null) 496 if (Scene != null)
432 { 497 {
433 if ((Scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || Scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) 498 // if ((Scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || Scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W)
434 || Scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || Scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) 499 // || Scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || Scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S))
500 // && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
501 if ((Scene.TestBorderCross(val, Cardinals.E) || Scene.TestBorderCross(val, Cardinals.W)
502 || Scene.TestBorderCross(val, Cardinals.N) || Scene.TestBorderCross(val, Cardinals.S))
435 && !IsAttachmentCheckFull() && (!Scene.LoadingPrims)) 503 && !IsAttachmentCheckFull() && (!Scene.LoadingPrims))
436 { 504 {
437 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 505 IEntityTransferModule entityTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
506 uint x = 0;
507 uint y = 0;
508 string version = String.Empty;
509 Vector3 newpos = Vector3.Zero;
510 OpenSim.Services.Interfaces.GridRegion destination = null;
511
512 bool canCross = true;
513 foreach (ScenePresence av in m_linkedAvatars)
514 {
515 // We need to cross these agents. First, let's find
516 // out if any of them can't cross for some reason.
517 // We have to deny the crossing entirely if any
518 // of them are banned. Alternatively, we could
519 // unsit banned agents....
520
521
522 // We set the avatar position as being the object
523 // position to get the region to send to
524 if ((destination = entityTransfer.GetDestination(m_scene, av.UUID, val, out x, out y, out version, out newpos)) == null)
525 {
526 canCross = false;
527 break;
528 }
529
530 m_log.DebugFormat("[SCENE OBJECT]: Avatar {0} needs to be crossed to {1}", av.Name, destination.RegionName);
531 }
532
533 if (canCross)
534 {
535 // We unparent the SP quietly so that it won't
536 // be made to stand up
537
538 List<avtocrossInfo> avsToCross = new List<avtocrossInfo>();
539
540 foreach (ScenePresence av in m_linkedAvatars)
541 {
542 avtocrossInfo avinfo = new avtocrossInfo();
543 SceneObjectPart parentPart = m_scene.GetSceneObjectPart(av.ParentID);
544 if (parentPart != null)
545 av.ParentUUID = parentPart.UUID;
546
547 avinfo.av = av;
548 avinfo.ParentID = av.ParentID;
549 avsToCross.Add(avinfo);
550
551 av.ParentID = 0;
552 }
553
554// m_linkedAvatars.Clear();
555 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
556
557 // Normalize
558 if (val.X >= Constants.RegionSize)
559 val.X -= Constants.RegionSize;
560 if (val.Y >= Constants.RegionSize)
561 val.Y -= Constants.RegionSize;
562 if (val.X < 0)
563 val.X += Constants.RegionSize;
564 if (val.Y < 0)
565 val.Y += Constants.RegionSize;
566
567 // If it's deleted, crossing was successful
568 if (IsDeleted)
569 {
570 // foreach (ScenePresence av in m_linkedAvatars)
571 foreach (avtocrossInfo avinfo in avsToCross)
572 {
573 ScenePresence av = avinfo.av;
574 if (!av.IsInTransit) // just in case...
575 {
576 m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar {0} to {1}", av.Name, val);
577
578 av.IsInTransit = true;
579
580 CrossAgentToNewRegionDelegate d = entityTransfer.CrossAgentToNewRegionAsync;
581 d.BeginInvoke(av, val, x, y, destination, av.Flying, version, CrossAgentToNewRegionCompleted, d);
582 }
583 else
584 m_log.DebugFormat("[SCENE OBJECT]: Crossing avatar alreasy in transit {0} to {1}", av.Name, val);
585 }
586 avsToCross.Clear();
587 return;
588 }
589 else // cross failed, put avas back ??
590 {
591 foreach (avtocrossInfo avinfo in avsToCross)
592 {
593 ScenePresence av = avinfo.av;
594 av.ParentUUID = UUID.Zero;
595 av.ParentID = avinfo.ParentID;
596// m_linkedAvatars.Add(av);
597 }
598 }
599 avsToCross.Clear();
600
601 }
602 else if (RootPart.PhysActor != null)
603 {
604 RootPart.PhysActor.CrossingFailure();
605 }
606
607 Vector3 oldp = AbsolutePosition;
608 val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)Constants.RegionSize - 0.5f);
609 val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)Constants.RegionSize - 0.5f);
610 val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f);
438 } 611 }
439 } 612 }
440 613
614/* don't see the need but worse don't see where is restored to false if things stay in
615 foreach (SceneObjectPart part in m_parts.GetArray())
616 {
617 part.IgnoreUndoUpdate = true;
618 }
619 */
441 if (RootPart.GetStatusSandbox()) 620 if (RootPart.GetStatusSandbox())
442 { 621 {
443 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) 622 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
@@ -455,9 +634,38 @@ namespace OpenSim.Region.Framework.Scenes
455 // Restuff the new GroupPosition into each SOP of the linkset. 634 // Restuff the new GroupPosition into each SOP of the linkset.
456 // This has the affect of resetting and tainting the physics actors. 635 // This has the affect of resetting and tainting the physics actors.
457 SceneObjectPart[] parts = m_parts.GetArray(); 636 SceneObjectPart[] parts = m_parts.GetArray();
458 for (int i = 0; i < parts.Length; i++) 637 bool triggerScriptEvent = m_rootPart.GroupPosition != val;
459 parts[i].GroupPosition = val; 638 if (m_dupeInProgress)
639 triggerScriptEvent = false;
640 foreach (SceneObjectPart part in parts)
641 {
642 part.GroupPosition = val;
643 if (triggerScriptEvent)
644 part.TriggerScriptChangedEvent(Changed.POSITION);
645 }
460 646
647/*
648 This seems not needed and should not be needed:
649 sp absolute position depends on sit part absolute position fixed above.
650 sp ParentPosition is not used anywhere.
651 Since presence is sitting, viewer considers it 'linked' to root prim, so it will move/rotate it
652 Sending a extra packet with avatar position is not only bandwidth waste, but may cause jitter in viewers due to UPD nature.
653
654 if (!m_dupeInProgress)
655 {
656 foreach (ScenePresence av in m_linkedAvatars)
657 {
658 SceneObjectPart p = m_scene.GetSceneObjectPart(av.ParentID);
659 if (p != null && m_parts.TryGetValue(p.UUID, out p))
660 {
661 Vector3 offset = p.GetWorldPosition() - av.ParentPosition;
662 av.AbsolutePosition += offset;
663// av.ParentPosition = p.GetWorldPosition(); //ParentPosition gets cleared by AbsolutePosition
664 av.SendAvatarDataToAllAgents();
665 }
666 }
667 }
668*/
461 //if (m_rootPart.PhysActor != null) 669 //if (m_rootPart.PhysActor != null)
462 //{ 670 //{
463 //m_rootPart.PhysActor.Position = 671 //m_rootPart.PhysActor.Position =
@@ -471,6 +679,40 @@ namespace OpenSim.Region.Framework.Scenes
471 } 679 }
472 } 680 }
473 681
682 public override Vector3 Velocity
683 {
684 get { return RootPart.Velocity; }
685 set { RootPart.Velocity = value; }
686 }
687
688 private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
689 {
690 CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
691 ScenePresence agent = icon.EndInvoke(iar);
692
693 //// If the cross was successful, this agent is a child agent
694 if (agent.IsChildAgent)
695 {
696 if (agent.ParentUUID != UUID.Zero)
697 {
698 agent.ParentPart = null;
699// agent.ParentPosition = Vector3.Zero;
700// agent.ParentUUID = UUID.Zero;
701 }
702 }
703
704 agent.ParentUUID = UUID.Zero;
705
706// agent.Reset();
707// else // Not successful
708// agent.RestoreInCurrentScene();
709
710 // In any case
711 agent.IsInTransit = false;
712
713 m_log.DebugFormat("[SCENE OBJECT]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
714 }
715
474 public override uint LocalId 716 public override uint LocalId
475 { 717 {
476 get { return m_rootPart.LocalId; } 718 get { return m_rootPart.LocalId; }
@@ -541,6 +783,11 @@ namespace OpenSim.Region.Framework.Scenes
541 m_isSelected = value; 783 m_isSelected = value;
542 // Tell physics engine that group is selected 784 // Tell physics engine that group is selected
543 785
786 // this is not right
787 // but ode engines should only really need to know about root part
788 // so they can put entire object simulation on hold and not colliding
789 // keep as was for now
790
544 PhysicsActor pa = m_rootPart.PhysActor; 791 PhysicsActor pa = m_rootPart.PhysActor;
545 if (pa != null) 792 if (pa != null)
546 { 793 {
@@ -557,6 +804,42 @@ namespace OpenSim.Region.Framework.Scenes
557 childPa.Selected = value; 804 childPa.Selected = value;
558 } 805 }
559 } 806 }
807 if (RootPart.KeyframeMotion != null)
808 RootPart.KeyframeMotion.Selected = value;
809 }
810 }
811
812 public void PartSelectChanged(bool partSelect)
813 {
814 // any part selected makes group selected
815 if (m_isSelected == partSelect)
816 return;
817
818 if (partSelect)
819 {
820 IsSelected = partSelect;
821// if (!IsAttachment)
822// ScheduleGroupForFullUpdate();
823 }
824 else
825 {
826 // bad bad bad 2 heavy for large linksets
827 // since viewer does send lot of (un)selects
828 // this needs to be replaced by a specific list or count ?
829 // but that will require extra code in several places
830
831 SceneObjectPart[] parts = m_parts.GetArray();
832 for (int i = 0; i < parts.Length; i++)
833 {
834 SceneObjectPart part = parts[i];
835 if (part.IsSelected)
836 return;
837 }
838 IsSelected = partSelect;
839 if (!IsAttachment)
840 {
841 ScheduleGroupForFullUpdate();
842 }
560 } 843 }
561 } 844 }
562 845
@@ -642,6 +925,7 @@ namespace OpenSim.Region.Framework.Scenes
642 /// </summary> 925 /// </summary>
643 public SceneObjectGroup() 926 public SceneObjectGroup()
644 { 927 {
928
645 } 929 }
646 930
647 /// <summary> 931 /// <summary>
@@ -659,8 +943,8 @@ namespace OpenSim.Region.Framework.Scenes
659 /// Constructor. This object is added to the scene later via AttachToScene() 943 /// Constructor. This object is added to the scene later via AttachToScene()
660 /// </summary> 944 /// </summary>
661 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) 945 public SceneObjectGroup(UUID ownerID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape)
662 :this(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero)) 946 {
663 { 947 SetRootPart(new SceneObjectPart(ownerID, shape, pos, rot, Vector3.Zero));
664 } 948 }
665 949
666 /// <summary> 950 /// <summary>
@@ -695,6 +979,9 @@ namespace OpenSim.Region.Framework.Scenes
695 /// </summary> 979 /// </summary>
696 public virtual void AttachToBackup() 980 public virtual void AttachToBackup()
697 { 981 {
982 if (IsAttachment) return;
983 m_scene.SceneGraph.FireAttachToBackup(this);
984
698 if (InSceneBackup) 985 if (InSceneBackup)
699 { 986 {
700 //m_log.DebugFormat( 987 //m_log.DebugFormat(
@@ -737,6 +1024,13 @@ namespace OpenSim.Region.Framework.Scenes
737 1024
738 ApplyPhysics(); 1025 ApplyPhysics();
739 1026
1027 if (RootPart.PhysActor != null)
1028 RootPart.Force = RootPart.Force;
1029 if (RootPart.PhysActor != null)
1030 RootPart.Torque = RootPart.Torque;
1031 if (RootPart.PhysActor != null)
1032 RootPart.Buoyancy = RootPart.Buoyancy;
1033
740 // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled 1034 // Don't trigger the update here - otherwise some client issues occur when multiple updates are scheduled
741 // for the same object with very different properties. The caller must schedule the update. 1035 // for the same object with very different properties. The caller must schedule the update.
742 //ScheduleGroupForFullUpdate(); 1036 //ScheduleGroupForFullUpdate();
@@ -752,6 +1046,10 @@ namespace OpenSim.Region.Framework.Scenes
752 EntityIntersection result = new EntityIntersection(); 1046 EntityIntersection result = new EntityIntersection();
753 1047
754 SceneObjectPart[] parts = m_parts.GetArray(); 1048 SceneObjectPart[] parts = m_parts.GetArray();
1049
1050 // Find closest hit here
1051 float idist = float.MaxValue;
1052
755 for (int i = 0; i < parts.Length; i++) 1053 for (int i = 0; i < parts.Length; i++)
756 { 1054 {
757 SceneObjectPart part = parts[i]; 1055 SceneObjectPart part = parts[i];
@@ -766,11 +1064,6 @@ namespace OpenSim.Region.Framework.Scenes
766 1064
767 EntityIntersection inter = part.TestIntersectionOBB(hRay, parentrotation, frontFacesOnly, faceCenters); 1065 EntityIntersection inter = part.TestIntersectionOBB(hRay, parentrotation, frontFacesOnly, faceCenters);
768 1066
769 // This may need to be updated to the maximum draw distance possible..
770 // We might (and probably will) be checking for prim creation from other sims
771 // when the camera crosses the border.
772 float idist = Constants.RegionSize;
773
774 if (inter.HitTF) 1067 if (inter.HitTF)
775 { 1068 {
776 // We need to find the closest prim to return to the testcaller along the ray 1069 // We need to find the closest prim to return to the testcaller along the ray
@@ -781,10 +1074,11 @@ namespace OpenSim.Region.Framework.Scenes
781 result.obj = part; 1074 result.obj = part;
782 result.normal = inter.normal; 1075 result.normal = inter.normal;
783 result.distance = inter.distance; 1076 result.distance = inter.distance;
1077
1078 idist = inter.distance;
784 } 1079 }
785 } 1080 }
786 } 1081 }
787
788 return result; 1082 return result;
789 } 1083 }
790 1084
@@ -796,25 +1090,27 @@ namespace OpenSim.Region.Framework.Scenes
796 /// <returns></returns> 1090 /// <returns></returns>
797 public void GetAxisAlignedBoundingBoxRaw(out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ) 1091 public void GetAxisAlignedBoundingBoxRaw(out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
798 { 1092 {
799 maxX = -256f; 1093 maxX = float.MinValue;
800 maxY = -256f; 1094 maxY = float.MinValue;
801 maxZ = -256f; 1095 maxZ = float.MinValue;
802 minX = 256f; 1096 minX = float.MaxValue;
803 minY = 256f; 1097 minY = float.MaxValue;
804 minZ = 8192f; 1098 minZ = float.MaxValue;
805 1099
806 SceneObjectPart[] parts = m_parts.GetArray(); 1100 SceneObjectPart[] parts = m_parts.GetArray();
807 for (int i = 0; i < parts.Length; i++) 1101 foreach (SceneObjectPart part in parts)
808 { 1102 {
809 SceneObjectPart part = parts[i];
810
811 Vector3 worldPos = part.GetWorldPosition(); 1103 Vector3 worldPos = part.GetWorldPosition();
812 Vector3 offset = worldPos - AbsolutePosition; 1104 Vector3 offset = worldPos - AbsolutePosition;
813 Quaternion worldRot; 1105 Quaternion worldRot;
814 if (part.ParentID == 0) 1106 if (part.ParentID == 0)
1107 {
815 worldRot = part.RotationOffset; 1108 worldRot = part.RotationOffset;
1109 }
816 else 1110 else
1111 {
817 worldRot = part.GetWorldRotation(); 1112 worldRot = part.GetWorldRotation();
1113 }
818 1114
819 Vector3 frontTopLeft; 1115 Vector3 frontTopLeft;
820 Vector3 frontTopRight; 1116 Vector3 frontTopRight;
@@ -826,6 +1122,8 @@ namespace OpenSim.Region.Framework.Scenes
826 Vector3 backBottomLeft; 1122 Vector3 backBottomLeft;
827 Vector3 backBottomRight; 1123 Vector3 backBottomRight;
828 1124
1125 // Vector3[] corners = new Vector3[8];
1126
829 Vector3 orig = Vector3.Zero; 1127 Vector3 orig = Vector3.Zero;
830 1128
831 frontTopLeft.X = orig.X - (part.Scale.X / 2); 1129 frontTopLeft.X = orig.X - (part.Scale.X / 2);
@@ -860,6 +1158,38 @@ namespace OpenSim.Region.Framework.Scenes
860 backBottomRight.Y = orig.Y + (part.Scale.Y / 2); 1158 backBottomRight.Y = orig.Y + (part.Scale.Y / 2);
861 backBottomRight.Z = orig.Z - (part.Scale.Z / 2); 1159 backBottomRight.Z = orig.Z - (part.Scale.Z / 2);
862 1160
1161
1162
1163 //m_log.InfoFormat("pre corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
1164 //m_log.InfoFormat("pre corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
1165 //m_log.InfoFormat("pre corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
1166 //m_log.InfoFormat("pre corner 4 is {0} {1} {2}", frontBottomLeft.X, frontBottomLeft.Y, frontBottomLeft.Z);
1167 //m_log.InfoFormat("pre corner 5 is {0} {1} {2}", backTopLeft.X, backTopLeft.Y, backTopLeft.Z);
1168 //m_log.InfoFormat("pre corner 6 is {0} {1} {2}", backTopRight.X, backTopRight.Y, backTopRight.Z);
1169 //m_log.InfoFormat("pre corner 7 is {0} {1} {2}", backBottomRight.X, backBottomRight.Y, backBottomRight.Z);
1170 //m_log.InfoFormat("pre corner 8 is {0} {1} {2}", backBottomLeft.X, backBottomLeft.Y, backBottomLeft.Z);
1171
1172 //for (int i = 0; i < 8; i++)
1173 //{
1174 // corners[i] = corners[i] * worldRot;
1175 // corners[i] += offset;
1176
1177 // if (corners[i].X > maxX)
1178 // maxX = corners[i].X;
1179 // if (corners[i].X < minX)
1180 // minX = corners[i].X;
1181
1182 // if (corners[i].Y > maxY)
1183 // maxY = corners[i].Y;
1184 // if (corners[i].Y < minY)
1185 // minY = corners[i].Y;
1186
1187 // if (corners[i].Z > maxZ)
1188 // maxZ = corners[i].Y;
1189 // if (corners[i].Z < minZ)
1190 // minZ = corners[i].Z;
1191 //}
1192
863 frontTopLeft = frontTopLeft * worldRot; 1193 frontTopLeft = frontTopLeft * worldRot;
864 frontTopRight = frontTopRight * worldRot; 1194 frontTopRight = frontTopRight * worldRot;
865 frontBottomLeft = frontBottomLeft * worldRot; 1195 frontBottomLeft = frontBottomLeft * worldRot;
@@ -881,6 +1211,15 @@ namespace OpenSim.Region.Framework.Scenes
881 backTopLeft += offset; 1211 backTopLeft += offset;
882 backTopRight += offset; 1212 backTopRight += offset;
883 1213
1214 //m_log.InfoFormat("corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
1215 //m_log.InfoFormat("corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
1216 //m_log.InfoFormat("corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
1217 //m_log.InfoFormat("corner 4 is {0} {1} {2}", frontBottomLeft.X, frontBottomLeft.Y, frontBottomLeft.Z);
1218 //m_log.InfoFormat("corner 5 is {0} {1} {2}", backTopLeft.X, backTopLeft.Y, backTopLeft.Z);
1219 //m_log.InfoFormat("corner 6 is {0} {1} {2}", backTopRight.X, backTopRight.Y, backTopRight.Z);
1220 //m_log.InfoFormat("corner 7 is {0} {1} {2}", backBottomRight.X, backBottomRight.Y, backBottomRight.Z);
1221 //m_log.InfoFormat("corner 8 is {0} {1} {2}", backBottomLeft.X, backBottomLeft.Y, backBottomLeft.Z);
1222
884 if (frontTopRight.X > maxX) 1223 if (frontTopRight.X > maxX)
885 maxX = frontTopRight.X; 1224 maxX = frontTopRight.X;
886 if (frontTopLeft.X > maxX) 1225 if (frontTopLeft.X > maxX)
@@ -1024,17 +1363,118 @@ namespace OpenSim.Region.Framework.Scenes
1024 1363
1025 #endregion 1364 #endregion
1026 1365
1366 public void GetResourcesCosts(SceneObjectPart apart,
1367 out float linksetResCost, out float linksetPhysCost, out float partCost, out float partPhysCost)
1368 {
1369 // this information may need to be cached
1370
1371 float cost;
1372 float tmpcost;
1373
1374 bool ComplexCost = false;
1375
1376 SceneObjectPart p;
1377 SceneObjectPart[] parts;
1378
1379 lock (m_parts)
1380 {
1381 parts = m_parts.GetArray();
1382 }
1383
1384 int nparts = parts.Length;
1385
1386
1387 for (int i = 0; i < nparts; i++)
1388 {
1389 p = parts[i];
1390
1391 if (p.UsesComplexCost)
1392 {
1393 ComplexCost = true;
1394 break;
1395 }
1396 }
1397
1398 if (ComplexCost)
1399 {
1400 linksetResCost = 0;
1401 linksetPhysCost = 0;
1402 partCost = 0;
1403 partPhysCost = 0;
1404
1405 for (int i = 0; i < nparts; i++)
1406 {
1407 p = parts[i];
1408
1409 cost = p.StreamingCost;
1410 tmpcost = p.SimulationCost;
1411 if (tmpcost > cost)
1412 cost = tmpcost;
1413 tmpcost = p.PhysicsCost;
1414 if (tmpcost > cost)
1415 cost = tmpcost;
1416
1417 linksetPhysCost += tmpcost;
1418 linksetResCost += cost;
1419
1420 if (p == apart)
1421 {
1422 partCost = cost;
1423 partPhysCost = tmpcost;
1424 }
1425 }
1426 }
1427 else
1428 {
1429 partPhysCost = 1.0f;
1430 partCost = 1.0f;
1431 linksetResCost = (float)nparts;
1432 linksetPhysCost = linksetResCost;
1433 }
1434 }
1435
1436 public void GetSelectedCosts(out float PhysCost, out float StreamCost, out float SimulCost)
1437 {
1438 SceneObjectPart p;
1439 SceneObjectPart[] parts;
1440
1441 lock (m_parts)
1442 {
1443 parts = m_parts.GetArray();
1444 }
1445
1446 int nparts = parts.Length;
1447
1448 PhysCost = 0;
1449 StreamCost = 0;
1450 SimulCost = 0;
1451
1452 for (int i = 0; i < nparts; i++)
1453 {
1454 p = parts[i];
1455
1456 StreamCost += p.StreamingCost;
1457 SimulCost += p.SimulationCost;
1458 PhysCost += p.PhysicsCost;
1459 }
1460 }
1461
1027 public void SaveScriptedState(XmlTextWriter writer) 1462 public void SaveScriptedState(XmlTextWriter writer)
1028 { 1463 {
1464 SaveScriptedState(writer, false);
1465 }
1466
1467 public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
1468 {
1029 XmlDocument doc = new XmlDocument(); 1469 XmlDocument doc = new XmlDocument();
1030 Dictionary<UUID,string> states = new Dictionary<UUID,string>(); 1470 Dictionary<UUID,string> states = new Dictionary<UUID,string>();
1031 1471
1032 SceneObjectPart[] parts = m_parts.GetArray(); 1472 SceneObjectPart[] parts = m_parts.GetArray();
1033 for (int i = 0; i < parts.Length; i++) 1473 for (int i = 0; i < parts.Length; i++)
1034 { 1474 {
1035 Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(); 1475 Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(oldIDs);
1036 foreach (KeyValuePair<UUID, string> kvp in pstates) 1476 foreach (KeyValuePair<UUID, string> kvp in pstates)
1037 states.Add(kvp.Key, kvp.Value); 1477 states[kvp.Key] = kvp.Value;
1038 } 1478 }
1039 1479
1040 if (states.Count > 0) 1480 if (states.Count > 0)
@@ -1054,6 +1494,169 @@ namespace OpenSim.Region.Framework.Scenes
1054 } 1494 }
1055 1495
1056 /// <summary> 1496 /// <summary>
1497 /// Add the avatar to this linkset (avatar is sat).
1498 /// </summary>
1499 /// <param name="agentID"></param>
1500 public void AddAvatar(UUID agentID)
1501 {
1502 ScenePresence presence;
1503 if (m_scene.TryGetScenePresence(agentID, out presence))
1504 {
1505 if (!m_linkedAvatars.Contains(presence))
1506 {
1507 m_linkedAvatars.Add(presence);
1508 }
1509 }
1510 }
1511
1512 /// <summary>
1513 /// Delete the avatar from this linkset (avatar is unsat).
1514 /// </summary>
1515 /// <param name="agentID"></param>
1516 public void DeleteAvatar(UUID agentID)
1517 {
1518 ScenePresence presence;
1519 if (m_scene.TryGetScenePresence(agentID, out presence))
1520 {
1521 if (m_linkedAvatars.Contains(presence))
1522 {
1523 m_linkedAvatars.Remove(presence);
1524 }
1525 }
1526 }
1527
1528 /// <summary>
1529 /// Returns the list of linked presences (avatars sat on this group)
1530 /// </summary>
1531 /// <param name="agentID"></param>
1532 public List<ScenePresence> GetLinkedAvatars()
1533 {
1534 return m_linkedAvatars;
1535 }
1536
1537 /// <summary>
1538 /// Attach this scene object to the given avatar.
1539 /// </summary>
1540 /// <param name="agentID"></param>
1541 /// <param name="attachmentpoint"></param>
1542 /// <param name="AttachOffset"></param>
1543 private void AttachToAgent(
1544 ScenePresence avatar, SceneObjectGroup so, uint attachmentpoint, Vector3 attachOffset, bool silent)
1545 {
1546 if (avatar != null)
1547 {
1548 // don't attach attachments to child agents
1549 if (avatar.IsChildAgent) return;
1550
1551 // Remove from database and parcel prim count
1552 m_scene.DeleteFromStorage(so.UUID);
1553 m_scene.EventManager.TriggerParcelPrimCountTainted();
1554
1555 so.AttachedAvatar = avatar.UUID;
1556
1557 if (so.RootPart.PhysActor != null)
1558 {
1559 m_scene.PhysicsScene.RemovePrim(so.RootPart.PhysActor);
1560 so.RootPart.PhysActor = null;
1561 }
1562
1563 so.AbsolutePosition = attachOffset;
1564 so.RootPart.AttachedPos = attachOffset;
1565 so.IsAttachment = true;
1566 so.RootPart.SetParentLocalId(avatar.LocalId);
1567 so.AttachmentPoint = attachmentpoint;
1568
1569 avatar.AddAttachment(this);
1570
1571 if (!silent)
1572 {
1573 // Killing it here will cause the client to deselect it
1574 // It then reappears on the avatar, deselected
1575 // through the full update below
1576 //
1577 if (IsSelected)
1578 {
1579 m_scene.SendKillObject(new List<uint> { m_rootPart.LocalId });
1580 }
1581
1582 IsSelected = false; // fudge....
1583 ScheduleGroupForFullUpdate();
1584 }
1585 }
1586 else
1587 {
1588 m_log.WarnFormat(
1589 "[SOG]: Tried to add attachment {0} to avatar with UUID {1} in region {2} but the avatar is not present",
1590 UUID, avatar.ControllingClient.AgentId, Scene.RegionInfo.RegionName);
1591 }
1592 }
1593
1594 public byte GetAttachmentPoint()
1595 {
1596 return m_rootPart.Shape.State;
1597 }
1598
1599 public void DetachToGround()
1600 {
1601 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
1602 if (avatar == null)
1603 return;
1604
1605 avatar.RemoveAttachment(this);
1606
1607 Vector3 detachedpos = new Vector3(127f,127f,127f);
1608 if (avatar == null)
1609 return;
1610
1611 detachedpos = avatar.AbsolutePosition;
1612 FromItemID = UUID.Zero;
1613
1614 AbsolutePosition = detachedpos;
1615 AttachedAvatar = UUID.Zero;
1616
1617 //SceneObjectPart[] parts = m_parts.GetArray();
1618 //for (int i = 0; i < parts.Length; i++)
1619 // parts[i].AttachedAvatar = UUID.Zero;
1620
1621 m_rootPart.SetParentLocalId(0);
1622 AttachmentPoint = (byte)0;
1623 // must check if buildind should be true or false here
1624 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive,false);
1625 HasGroupChanged = true;
1626 RootPart.Rezzed = DateTime.Now;
1627 RootPart.RemFlag(PrimFlags.TemporaryOnRez);
1628 AttachToBackup();
1629 m_scene.EventManager.TriggerParcelPrimCountTainted();
1630 m_rootPart.ScheduleFullUpdate();
1631 m_rootPart.ClearUndoState();
1632 }
1633
1634 public void DetachToInventoryPrep()
1635 {
1636 ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
1637 //Vector3 detachedpos = new Vector3(127f, 127f, 127f);
1638 if (avatar != null)
1639 {
1640 //detachedpos = avatar.AbsolutePosition;
1641 avatar.RemoveAttachment(this);
1642 }
1643
1644 AttachedAvatar = UUID.Zero;
1645
1646 /*SceneObjectPart[] parts = m_parts.GetArray();
1647 for (int i = 0; i < parts.Length; i++)
1648 parts[i].AttachedAvatar = UUID.Zero;*/
1649
1650 m_rootPart.SetParentLocalId(0);
1651 //m_rootPart.SetAttachmentPoint((byte)0);
1652 IsAttachment = false;
1653 AbsolutePosition = m_rootPart.AttachedPos;
1654 //m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_scene.m_physicalPrim);
1655 //AttachToBackup();
1656 //m_rootPart.ScheduleFullUpdate();
1657 }
1658
1659 /// <summary>
1057 /// 1660 ///
1058 /// </summary> 1661 /// </summary>
1059 /// <param name="part"></param> 1662 /// <param name="part"></param>
@@ -1093,7 +1696,10 @@ namespace OpenSim.Region.Framework.Scenes
1093 public void AddPart(SceneObjectPart part) 1696 public void AddPart(SceneObjectPart part)
1094 { 1697 {
1095 part.SetParent(this); 1698 part.SetParent(this);
1096 part.LinkNum = m_parts.Add(part.UUID, part); 1699 m_parts.Add(part.UUID, part);
1700
1701 part.LinkNum = m_parts.Count;
1702
1097 if (part.LinkNum == 2) 1703 if (part.LinkNum == 2)
1098 RootPart.LinkNum = 1; 1704 RootPart.LinkNum = 1;
1099 } 1705 }
@@ -1184,7 +1790,7 @@ namespace OpenSim.Region.Framework.Scenes
1184// "[SCENE OBJECT GROUP]: Processing OnGrabPart for {0} on {1} {2}, offsetPos {3}", 1790// "[SCENE OBJECT GROUP]: Processing OnGrabPart for {0} on {1} {2}, offsetPos {3}",
1185// remoteClient.Name, part.Name, part.LocalId, offsetPos); 1791// remoteClient.Name, part.Name, part.LocalId, offsetPos);
1186 1792
1187 part.StoreUndoState(); 1793// part.StoreUndoState();
1188 part.OnGrab(offsetPos, remoteClient); 1794 part.OnGrab(offsetPos, remoteClient);
1189 } 1795 }
1190 1796
@@ -1204,6 +1810,11 @@ namespace OpenSim.Region.Framework.Scenes
1204 /// <param name="silent">If true then deletion is not broadcast to clients</param> 1810 /// <param name="silent">If true then deletion is not broadcast to clients</param>
1205 public void DeleteGroupFromScene(bool silent) 1811 public void DeleteGroupFromScene(bool silent)
1206 { 1812 {
1813 // We need to keep track of this state in case this group is still queued for backup.
1814 IsDeleted = true;
1815
1816 DetachFromBackup();
1817
1207 SceneObjectPart[] parts = m_parts.GetArray(); 1818 SceneObjectPart[] parts = m_parts.GetArray();
1208 for (int i = 0; i < parts.Length; i++) 1819 for (int i = 0; i < parts.Length; i++)
1209 { 1820 {
@@ -1227,6 +1838,7 @@ namespace OpenSim.Region.Framework.Scenes
1227 } 1838 }
1228 }); 1839 });
1229 } 1840 }
1841
1230 } 1842 }
1231 1843
1232 public void AddScriptLPS(int count) 1844 public void AddScriptLPS(int count)
@@ -1296,28 +1908,43 @@ namespace OpenSim.Region.Framework.Scenes
1296 /// </summary> 1908 /// </summary>
1297 public void ApplyPhysics() 1909 public void ApplyPhysics()
1298 { 1910 {
1299 // Apply physics to the root prim
1300 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive);
1301
1302 // Apply physics to child prims
1303 SceneObjectPart[] parts = m_parts.GetArray(); 1911 SceneObjectPart[] parts = m_parts.GetArray();
1304 if (parts.Length > 1) 1912 if (parts.Length > 1)
1305 { 1913 {
1914 ResetChildPrimPhysicsPositions();
1915
1916 // Apply physics to the root prim
1917 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, true);
1918
1919
1306 for (int i = 0; i < parts.Length; i++) 1920 for (int i = 0; i < parts.Length; i++)
1307 { 1921 {
1308 SceneObjectPart part = parts[i]; 1922 SceneObjectPart part = parts[i];
1309 if (part.LocalId != m_rootPart.LocalId) 1923 if (part.LocalId != m_rootPart.LocalId)
1310 part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive); 1924 part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, true);
1311 } 1925 }
1312
1313 // Hack to get the physics scene geometries in the right spot 1926 // Hack to get the physics scene geometries in the right spot
1314 ResetChildPrimPhysicsPositions(); 1927// ResetChildPrimPhysicsPositions();
1928 if (m_rootPart.PhysActor != null)
1929 {
1930 m_rootPart.PhysActor.Building = false;
1931 }
1932 }
1933 else
1934 {
1935 // Apply physics to the root prim
1936 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, false);
1315 } 1937 }
1316 } 1938 }
1317 1939
1318 public void SetOwnerId(UUID userId) 1940 public void SetOwnerId(UUID userId)
1319 { 1941 {
1320 ForEachPart(delegate(SceneObjectPart part) { part.OwnerID = userId; }); 1942 ForEachPart(delegate(SceneObjectPart part)
1943 {
1944
1945 part.OwnerID = userId;
1946
1947 });
1321 } 1948 }
1322 1949
1323 public void ForEachPart(Action<SceneObjectPart> whatToDo) 1950 public void ForEachPart(Action<SceneObjectPart> whatToDo)
@@ -1349,11 +1976,17 @@ namespace OpenSim.Region.Framework.Scenes
1349 return; 1976 return;
1350 } 1977 }
1351 1978
1979 if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
1980 return;
1981
1352 // Since this is the top of the section of call stack for backing up a particular scene object, don't let 1982 // Since this is the top of the section of call stack for backing up a particular scene object, don't let
1353 // any exception propogate upwards. 1983 // any exception propogate upwards.
1354 try 1984 try
1355 { 1985 {
1356 if (!m_scene.ShuttingDown) // if shutting down then there will be nothing to handle the return so leave till next restart 1986 if (!m_scene.ShuttingDown || // if shutting down then there will be nothing to handle the return so leave till next restart
1987 !m_scene.LoginsEnabled || // We're starting up or doing maintenance, don't mess with things
1988 m_scene.LoadingPrims) // Land may not be valid yet
1989
1357 { 1990 {
1358 ILandObject parcel = m_scene.LandChannel.GetLandObject( 1991 ILandObject parcel = m_scene.LandChannel.GetLandObject(
1359 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y); 1992 m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
@@ -1380,6 +2013,7 @@ namespace OpenSim.Region.Framework.Scenes
1380 } 2013 }
1381 } 2014 }
1382 } 2015 }
2016
1383 } 2017 }
1384 2018
1385 if (m_scene.UseBackup && HasGroupChanged) 2019 if (m_scene.UseBackup && HasGroupChanged)
@@ -1387,10 +2021,30 @@ namespace OpenSim.Region.Framework.Scenes
1387 // don't backup while it's selected or you're asking for changes mid stream. 2021 // don't backup while it's selected or you're asking for changes mid stream.
1388 if (isTimeToPersist() || forcedBackup) 2022 if (isTimeToPersist() || forcedBackup)
1389 { 2023 {
2024 if (m_rootPart.PhysActor != null &&
2025 (!m_rootPart.PhysActor.IsPhysical))
2026 {
2027 // Possible ghost prim
2028 if (m_rootPart.PhysActor.Position != m_rootPart.GroupPosition)
2029 {
2030 foreach (SceneObjectPart part in m_parts.GetArray())
2031 {
2032 // Re-set physics actor positions and
2033 // orientations
2034 part.GroupPosition = m_rootPart.GroupPosition;
2035 }
2036 }
2037 }
1390// m_log.DebugFormat( 2038// m_log.DebugFormat(
1391// "[SCENE]: Storing {0}, {1} in {2}", 2039// "[SCENE]: Storing {0}, {1} in {2}",
1392// Name, UUID, m_scene.RegionInfo.RegionName); 2040// Name, UUID, m_scene.RegionInfo.RegionName);
1393 2041
2042 if (RootPart.Shape.PCode == 9 && RootPart.Shape.State != 0)
2043 {
2044 RootPart.Shape.State = 0;
2045 ScheduleGroupForFullUpdate();
2046 }
2047
1394 SceneObjectGroup backup_group = Copy(false); 2048 SceneObjectGroup backup_group = Copy(false);
1395 backup_group.RootPart.Velocity = RootPart.Velocity; 2049 backup_group.RootPart.Velocity = RootPart.Velocity;
1396 backup_group.RootPart.Acceleration = RootPart.Acceleration; 2050 backup_group.RootPart.Acceleration = RootPart.Acceleration;
@@ -1400,6 +2054,15 @@ namespace OpenSim.Region.Framework.Scenes
1400 HasGroupChangedDueToDelink = false; 2054 HasGroupChangedDueToDelink = false;
1401 2055
1402 m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this); 2056 m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
2057 backup_group.ForEachPart(delegate(SceneObjectPart part)
2058 {
2059 if (part.KeyframeMotion != null)
2060 {
2061 part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize());
2062 part.KeyframeMotion.UpdateSceneObject(this);
2063 }
2064 });
2065
1403 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); 2066 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
1404 2067
1405 backup_group.ForEachPart(delegate(SceneObjectPart part) 2068 backup_group.ForEachPart(delegate(SceneObjectPart part)
@@ -1456,10 +2119,14 @@ namespace OpenSim.Region.Framework.Scenes
1456 /// <returns></returns> 2119 /// <returns></returns>
1457 public SceneObjectGroup Copy(bool userExposed) 2120 public SceneObjectGroup Copy(bool userExposed)
1458 { 2121 {
2122 m_dupeInProgress = true;
1459 SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone(); 2123 SceneObjectGroup dupe = (SceneObjectGroup)MemberwiseClone();
1460 dupe.m_isBackedUp = false; 2124 dupe.m_isBackedUp = false;
1461 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>(); 2125 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
1462 2126
2127 // new group as no sitting avatars
2128 dupe.m_linkedAvatars = new List<ScenePresence>();
2129
1463 // Warning, The following code related to previousAttachmentStatus is needed so that clones of 2130 // Warning, The following code related to previousAttachmentStatus is needed so that clones of
1464 // attachments do not bordercross while they're being duplicated. This is hacktastic! 2131 // attachments do not bordercross while they're being duplicated. This is hacktastic!
1465 // Normally, setting AbsolutePosition will bordercross a prim if it's outside the region! 2132 // Normally, setting AbsolutePosition will bordercross a prim if it's outside the region!
@@ -1470,7 +2137,7 @@ namespace OpenSim.Region.Framework.Scenes
1470 // This is only necessary when userExposed is false! 2137 // This is only necessary when userExposed is false!
1471 2138
1472 bool previousAttachmentStatus = dupe.IsAttachment; 2139 bool previousAttachmentStatus = dupe.IsAttachment;
1473 2140
1474 if (!userExposed) 2141 if (!userExposed)
1475 dupe.IsAttachment = true; 2142 dupe.IsAttachment = true;
1476 2143
@@ -1488,11 +2155,11 @@ namespace OpenSim.Region.Framework.Scenes
1488 dupe.m_rootPart.TrimPermissions(); 2155 dupe.m_rootPart.TrimPermissions();
1489 2156
1490 List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.GetArray()); 2157 List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.GetArray());
1491 2158
1492 partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2) 2159 partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2)
1493 { 2160 {
1494 return p1.LinkNum.CompareTo(p2.LinkNum); 2161 return p1.LinkNum.CompareTo(p2.LinkNum);
1495 } 2162 }
1496 ); 2163 );
1497 2164
1498 foreach (SceneObjectPart part in partList) 2165 foreach (SceneObjectPart part in partList)
@@ -1502,41 +2169,53 @@ namespace OpenSim.Region.Framework.Scenes
1502 { 2169 {
1503 newPart = dupe.CopyPart(part, OwnerID, GroupID, userExposed); 2170 newPart = dupe.CopyPart(part, OwnerID, GroupID, userExposed);
1504 newPart.LinkNum = part.LinkNum; 2171 newPart.LinkNum = part.LinkNum;
1505 } 2172 if (userExposed)
2173 newPart.ParentID = dupe.m_rootPart.LocalId;
2174 }
1506 else 2175 else
1507 { 2176 {
1508 newPart = dupe.m_rootPart; 2177 newPart = dupe.m_rootPart;
1509 } 2178 }
2179/*
2180 bool isphys = ((newPart.Flags & PrimFlags.Physics) != 0);
2181 bool isphan = ((newPart.Flags & PrimFlags.Phantom) != 0);
1510 2182
1511 // Need to duplicate the physics actor as well 2183 // Need to duplicate the physics actor as well
1512 PhysicsActor originalPartPa = part.PhysActor; 2184 if (userExposed && (isphys || !isphan || newPart.VolumeDetectActive))
1513 if (originalPartPa != null && userExposed)
1514 { 2185 {
1515 PrimitiveBaseShape pbs = newPart.Shape; 2186 PrimitiveBaseShape pbs = newPart.Shape;
1516
1517 newPart.PhysActor 2187 newPart.PhysActor
1518 = m_scene.PhysicsScene.AddPrimShape( 2188 = m_scene.PhysicsScene.AddPrimShape(
1519 string.Format("{0}/{1}", newPart.Name, newPart.UUID), 2189 string.Format("{0}/{1}", newPart.Name, newPart.UUID),
1520 pbs, 2190 pbs,
1521 newPart.AbsolutePosition, 2191 newPart.AbsolutePosition,
1522 newPart.Scale, 2192 newPart.Scale,
1523 newPart.RotationOffset, 2193 newPart.GetWorldRotation(),
1524 originalPartPa.IsPhysical, 2194 isphys,
2195 isphan,
1525 newPart.LocalId); 2196 newPart.LocalId);
1526 2197
1527 newPart.DoPhysicsPropertyUpdate(originalPartPa.IsPhysical, true); 2198 newPart.DoPhysicsPropertyUpdate(isphys, true);
1528 } 2199 */
2200 if (userExposed)
2201 newPart.ApplyPhysics((uint)newPart.Flags,newPart.VolumeDetectActive,true);
2202// }
1529 } 2203 }
1530 2204
1531 if (userExposed) 2205 if (userExposed)
1532 { 2206 {
1533 dupe.UpdateParentIDs(); 2207// done above dupe.UpdateParentIDs();
2208
2209 if (dupe.m_rootPart.PhysActor != null)
2210 dupe.m_rootPart.PhysActor.Building = false; // tell physics to finish building
2211
1534 dupe.HasGroupChanged = true; 2212 dupe.HasGroupChanged = true;
1535 dupe.AttachToBackup(); 2213 dupe.AttachToBackup();
1536 2214
1537 ScheduleGroupForFullUpdate(); 2215 ScheduleGroupForFullUpdate();
1538 } 2216 }
1539 2217
2218 m_dupeInProgress = false;
1540 return dupe; 2219 return dupe;
1541 } 2220 }
1542 2221
@@ -1548,11 +2227,24 @@ namespace OpenSim.Region.Framework.Scenes
1548 /// <param name="cGroupID"></param> 2227 /// <param name="cGroupID"></param>
1549 public void CopyRootPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed) 2228 public void CopyRootPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
1550 { 2229 {
1551 SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, 0, userExposed)); 2230 // SetRootPart(part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, 0, userExposed));
2231 // give newpart a new local ID lettng old part keep same
2232 SceneObjectPart newpart = part.Copy(part.LocalId, OwnerID, GroupID, 0, userExposed);
2233 newpart.LocalId = m_scene.AllocateLocalId();
2234
2235 SetRootPart(newpart);
2236 if (userExposed)
2237 RootPart.Velocity = Vector3.Zero; // In case source is moving
1552 } 2238 }
1553 2239
1554 public void ScriptSetPhysicsStatus(bool usePhysics) 2240 public void ScriptSetPhysicsStatus(bool usePhysics)
1555 { 2241 {
2242 if (usePhysics)
2243 {
2244 if (RootPart.KeyframeMotion != null)
2245 RootPart.KeyframeMotion.Stop();
2246 RootPart.KeyframeMotion = null;
2247 }
1556 UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect); 2248 UpdatePrimFlags(RootPart.LocalId, usePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
1557 } 2249 }
1558 2250
@@ -1600,27 +2292,14 @@ namespace OpenSim.Region.Framework.Scenes
1600 2292
1601 if (pa != null) 2293 if (pa != null)
1602 { 2294 {
1603 pa.AddForce(impulse, true); 2295 // false to be applied as a impulse
1604 m_scene.PhysicsScene.AddPhysicsActorTaint(pa); 2296 pa.AddForce(impulse, false);
1605 }
1606 }
1607 }
1608
1609 public void applyAngularImpulse(Vector3 impulse)
1610 {
1611 PhysicsActor pa = RootPart.PhysActor;
1612
1613 if (pa != null)
1614 {
1615 if (!IsAttachment)
1616 {
1617 pa.AddAngularForce(impulse, true);
1618 m_scene.PhysicsScene.AddPhysicsActorTaint(pa); 2297 m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
1619 } 2298 }
1620 } 2299 }
1621 } 2300 }
1622 2301
1623 public void setAngularImpulse(Vector3 impulse) 2302 public void ApplyAngularImpulse(Vector3 impulse)
1624 { 2303 {
1625 PhysicsActor pa = RootPart.PhysActor; 2304 PhysicsActor pa = RootPart.PhysActor;
1626 2305
@@ -1628,7 +2307,8 @@ namespace OpenSim.Region.Framework.Scenes
1628 { 2307 {
1629 if (!IsAttachment) 2308 if (!IsAttachment)
1630 { 2309 {
1631 pa.Torque = impulse; 2310 // false to be applied as a impulse
2311 pa.AddAngularForce(impulse, false);
1632 m_scene.PhysicsScene.AddPhysicsActorTaint(pa); 2312 m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
1633 } 2313 }
1634 } 2314 }
@@ -1636,20 +2316,10 @@ namespace OpenSim.Region.Framework.Scenes
1636 2316
1637 public Vector3 GetTorque() 2317 public Vector3 GetTorque()
1638 { 2318 {
1639 PhysicsActor pa = RootPart.PhysActor; 2319 return RootPart.Torque;
1640
1641 if (pa != null)
1642 {
1643 if (!IsAttachment)
1644 {
1645 Vector3 torque = pa.Torque;
1646 return torque;
1647 }
1648 }
1649
1650 return Vector3.Zero;
1651 } 2320 }
1652 2321
2322 // This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object
1653 public void moveToTarget(Vector3 target, float tau) 2323 public void moveToTarget(Vector3 target, float tau)
1654 { 2324 {
1655 if (IsAttachment) 2325 if (IsAttachment)
@@ -1681,6 +2351,46 @@ namespace OpenSim.Region.Framework.Scenes
1681 pa.PIDActive = false; 2351 pa.PIDActive = false;
1682 } 2352 }
1683 2353
2354 public void rotLookAt(Quaternion target, float strength, float damping)
2355 {
2356 SceneObjectPart rootpart = m_rootPart;
2357 if (rootpart != null)
2358 {
2359 if (IsAttachment)
2360 {
2361 /*
2362 ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar);
2363 if (avatar != null)
2364 {
2365 Rotate the Av?
2366 } */
2367 }
2368 else
2369 {
2370 if (rootpart.PhysActor != null)
2371 { // APID must be implemented in your physics system for this to function.
2372 rootpart.PhysActor.APIDTarget = new Quaternion(target.X, target.Y, target.Z, target.W);
2373 rootpart.PhysActor.APIDStrength = strength;
2374 rootpart.PhysActor.APIDDamping = damping;
2375 rootpart.PhysActor.APIDActive = true;
2376 }
2377 }
2378 }
2379 }
2380
2381 public void stopLookAt()
2382 {
2383 SceneObjectPart rootpart = m_rootPart;
2384 if (rootpart != null)
2385 {
2386 if (rootpart.PhysActor != null)
2387 { // APID must be implemented in your physics system for this to function.
2388 rootpart.PhysActor.APIDActive = false;
2389 }
2390 }
2391
2392 }
2393
1684 /// <summary> 2394 /// <summary>
1685 /// Uses a PID to attempt to clamp the object on the Z axis at the given height over tau seconds. 2395 /// Uses a PID to attempt to clamp the object on the Z axis at the given height over tau seconds.
1686 /// </summary> 2396 /// </summary>
@@ -1697,7 +2407,7 @@ namespace OpenSim.Region.Framework.Scenes
1697 { 2407 {
1698 pa.PIDHoverHeight = height; 2408 pa.PIDHoverHeight = height;
1699 pa.PIDHoverType = hoverType; 2409 pa.PIDHoverType = hoverType;
1700 pa.PIDTau = tau; 2410 pa.PIDHoverTau = tau;
1701 pa.PIDHoverActive = true; 2411 pa.PIDHoverActive = true;
1702 } 2412 }
1703 else 2413 else
@@ -1737,7 +2447,12 @@ namespace OpenSim.Region.Framework.Scenes
1737 /// <param name="cGroupID"></param> 2447 /// <param name="cGroupID"></param>
1738 public SceneObjectPart CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed) 2448 public SceneObjectPart CopyPart(SceneObjectPart part, UUID cAgentID, UUID cGroupID, bool userExposed)
1739 { 2449 {
1740 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed); 2450 // give new ID to the new part, letting old keep original
2451 // SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed);
2452 SceneObjectPart newPart = part.Copy(part.LocalId, OwnerID, GroupID, m_parts.Count, userExposed);
2453 newPart.LocalId = m_scene.AllocateLocalId();
2454 newPart.SetParent(this);
2455
1741 AddPart(newPart); 2456 AddPart(newPart);
1742 2457
1743 SetPartAsNonRoot(newPart); 2458 SetPartAsNonRoot(newPart);
@@ -1876,11 +2591,11 @@ namespace OpenSim.Region.Framework.Scenes
1876 /// Immediately send a full update for this scene object. 2591 /// Immediately send a full update for this scene object.
1877 /// </summary> 2592 /// </summary>
1878 public void SendGroupFullUpdate() 2593 public void SendGroupFullUpdate()
1879 { 2594 {
1880 if (IsDeleted) 2595 if (IsDeleted)
1881 return; 2596 return;
1882 2597
1883// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID); 2598// m_log.DebugFormat("[SOG]: Sending immediate full group update for {0} {1}", Name, UUID);
1884 2599
1885 RootPart.SendFullUpdateToAllClients(); 2600 RootPart.SendFullUpdateToAllClients();
1886 2601
@@ -2017,6 +2732,11 @@ namespace OpenSim.Region.Framework.Scenes
2017 // 'linkPart' == the root of the group being linked into this group 2732 // 'linkPart' == the root of the group being linked into this group
2018 SceneObjectPart linkPart = objectGroup.m_rootPart; 2733 SceneObjectPart linkPart = objectGroup.m_rootPart;
2019 2734
2735 if (m_rootPart.PhysActor != null)
2736 m_rootPart.PhysActor.Building = true;
2737 if (linkPart.PhysActor != null)
2738 linkPart.PhysActor.Building = true;
2739
2020 // physics flags from group to be applied to linked parts 2740 // physics flags from group to be applied to linked parts
2021 bool grpusephys = UsesPhysics; 2741 bool grpusephys = UsesPhysics;
2022 bool grptemporary = IsTemporary; 2742 bool grptemporary = IsTemporary;
@@ -2042,12 +2762,12 @@ namespace OpenSim.Region.Framework.Scenes
2042 Vector3 axPos = linkPart.OffsetPosition; 2762 Vector3 axPos = linkPart.OffsetPosition;
2043 // Rotate the linking root SOP's position to be relative to the new root prim 2763 // Rotate the linking root SOP's position to be relative to the new root prim
2044 Quaternion parentRot = m_rootPart.RotationOffset; 2764 Quaternion parentRot = m_rootPart.RotationOffset;
2045 axPos *= Quaternion.Inverse(parentRot); 2765 axPos *= Quaternion.Conjugate(parentRot);
2046 linkPart.OffsetPosition = axPos; 2766 linkPart.OffsetPosition = axPos;
2047 2767
2048 // Make the linking root SOP's rotation relative to the new root prim 2768 // Make the linking root SOP's rotation relative to the new root prim
2049 Quaternion oldRot = linkPart.RotationOffset; 2769 Quaternion oldRot = linkPart.RotationOffset;
2050 Quaternion newRot = Quaternion.Inverse(parentRot) * oldRot; 2770 Quaternion newRot = Quaternion.Conjugate(parentRot) * oldRot;
2051 linkPart.RotationOffset = newRot; 2771 linkPart.RotationOffset = newRot;
2052 2772
2053 // If there is only one SOP in a SOG, the LinkNum is zero. I.e., not a linkset. 2773 // If there is only one SOP in a SOG, the LinkNum is zero. I.e., not a linkset.
@@ -2081,7 +2801,7 @@ namespace OpenSim.Region.Framework.Scenes
2081 linkPart.CreateSelected = true; 2801 linkPart.CreateSelected = true;
2082 2802
2083 // let physics know preserve part volume dtc messy since UpdatePrimFlags doesn't look to parent changes for now 2803 // let physics know preserve part volume dtc messy since UpdatePrimFlags doesn't look to parent changes for now
2084 linkPart.UpdatePrimFlags(grpusephys, grptemporary, (IsPhantom || (linkPart.Flags & PrimFlags.Phantom) != 0), linkPart.VolumeDetectActive); 2804 linkPart.UpdatePrimFlags(grpusephys, grptemporary, (IsPhantom || (linkPart.Flags & PrimFlags.Phantom) != 0), linkPart.VolumeDetectActive, true);
2085 2805
2086 // If the added SOP is physical, also tell the physics engine about the link relationship. 2806 // If the added SOP is physical, also tell the physics engine about the link relationship.
2087 if (linkPart.PhysActor != null && m_rootPart.PhysActor != null && m_rootPart.PhysActor.IsPhysical) 2807 if (linkPart.PhysActor != null && m_rootPart.PhysActor != null && m_rootPart.PhysActor.IsPhysical)
@@ -2091,6 +2811,7 @@ namespace OpenSim.Region.Framework.Scenes
2091 } 2811 }
2092 2812
2093 linkPart.LinkNum = linkNum++; 2813 linkPart.LinkNum = linkNum++;
2814 linkPart.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect, false);
2094 2815
2095 // Get a list of the SOP's in the old group in order of their linknum's. 2816 // Get a list of the SOP's in the old group in order of their linknum's.
2096 SceneObjectPart[] ogParts = objectGroup.Parts; 2817 SceneObjectPart[] ogParts = objectGroup.Parts;
@@ -2109,7 +2830,7 @@ namespace OpenSim.Region.Framework.Scenes
2109 2830
2110 // Update the physics flags for the newly added SOP 2831 // Update the physics flags for the newly added SOP
2111 // (Is this necessary? LinkNonRootPart() has already called UpdatePrimFlags but with different flags!??) 2832 // (Is this necessary? LinkNonRootPart() has already called UpdatePrimFlags but with different flags!??)
2112 part.UpdatePrimFlags(grpusephys, grptemporary, (IsPhantom || (part.Flags & PrimFlags.Phantom) != 0), part.VolumeDetectActive); 2833 part.UpdatePrimFlags(grpusephys, grptemporary, (IsPhantom || (part.Flags & PrimFlags.Phantom) != 0), part.VolumeDetectActive, true);
2113 2834
2114 // If the added SOP is physical, also tell the physics engine about the link relationship. 2835 // If the added SOP is physical, also tell the physics engine about the link relationship.
2115 if (part.PhysActor != null && m_rootPart.PhysActor != null && m_rootPart.PhysActor.IsPhysical) 2836 if (part.PhysActor != null && m_rootPart.PhysActor != null && m_rootPart.PhysActor.IsPhysical)
@@ -2127,7 +2848,7 @@ namespace OpenSim.Region.Framework.Scenes
2127 objectGroup.IsDeleted = true; 2848 objectGroup.IsDeleted = true;
2128 2849
2129 objectGroup.m_parts.Clear(); 2850 objectGroup.m_parts.Clear();
2130 2851
2131 // Can't do this yet since backup still makes use of the root part without any synchronization 2852 // Can't do this yet since backup still makes use of the root part without any synchronization
2132// objectGroup.m_rootPart = null; 2853// objectGroup.m_rootPart = null;
2133 2854
@@ -2141,6 +2862,9 @@ namespace OpenSim.Region.Framework.Scenes
2141 // unmoved prims! 2862 // unmoved prims!
2142 ResetChildPrimPhysicsPositions(); 2863 ResetChildPrimPhysicsPositions();
2143 2864
2865 if (m_rootPart.PhysActor != null)
2866 m_rootPart.PhysActor.Building = false;
2867
2144 //HasGroupChanged = true; 2868 //HasGroupChanged = true;
2145 //ScheduleGroupForFullUpdate(); 2869 //ScheduleGroupForFullUpdate();
2146 } 2870 }
@@ -2208,7 +2932,10 @@ namespace OpenSim.Region.Framework.Scenes
2208// m_log.DebugFormat( 2932// m_log.DebugFormat(
2209// "[SCENE OBJECT GROUP]: Delinking part {0}, {1} from group with root part {2}, {3}", 2933// "[SCENE OBJECT GROUP]: Delinking part {0}, {1} from group with root part {2}, {3}",
2210// linkPart.Name, linkPart.UUID, RootPart.Name, RootPart.UUID); 2934// linkPart.Name, linkPart.UUID, RootPart.Name, RootPart.UUID);
2211 2935
2936 if (m_rootPart.PhysActor != null)
2937 m_rootPart.PhysActor.Building = true;
2938
2212 linkPart.ClearUndoState(); 2939 linkPart.ClearUndoState();
2213 2940
2214 Vector3 worldPos = linkPart.GetWorldPosition(); 2941 Vector3 worldPos = linkPart.GetWorldPosition();
@@ -2279,6 +3006,14 @@ namespace OpenSim.Region.Framework.Scenes
2279 3006
2280 // When we delete a group, we currently have to force persist to the database if the object id has changed 3007 // When we delete a group, we currently have to force persist to the database if the object id has changed
2281 // (since delete works by deleting all rows which have a given object id) 3008 // (since delete works by deleting all rows which have a given object id)
3009
3010 // this is as it seems to be in sl now
3011 if(linkPart.PhysicsShapeType == (byte)PhysShapeType.none)
3012 linkPart.PhysicsShapeType = linkPart.DefaultPhysicsShapeType(); // root prims can't have type none for now
3013
3014 if (m_rootPart.PhysActor != null)
3015 m_rootPart.PhysActor.Building = false;
3016
2282 objectGroup.HasGroupChangedDueToDelink = true; 3017 objectGroup.HasGroupChangedDueToDelink = true;
2283 3018
2284 return objectGroup; 3019 return objectGroup;
@@ -2290,6 +3025,7 @@ namespace OpenSim.Region.Framework.Scenes
2290 /// <param name="objectGroup"></param> 3025 /// <param name="objectGroup"></param>
2291 public virtual void DetachFromBackup() 3026 public virtual void DetachFromBackup()
2292 { 3027 {
3028 m_scene.SceneGraph.FireDetachFromBackup(this);
2293 if (m_isBackedUp && Scene != null) 3029 if (m_isBackedUp && Scene != null)
2294 m_scene.EventManager.OnBackup -= ProcessBackup; 3030 m_scene.EventManager.OnBackup -= ProcessBackup;
2295 3031
@@ -2310,7 +3046,8 @@ namespace OpenSim.Region.Framework.Scenes
2310 Vector3 axPos = part.OffsetPosition; 3046 Vector3 axPos = part.OffsetPosition;
2311 axPos *= parentRot; 3047 axPos *= parentRot;
2312 part.OffsetPosition = axPos; 3048 part.OffsetPosition = axPos;
2313 part.GroupPosition = oldGroupPosition + part.OffsetPosition; 3049 Vector3 newPos = oldGroupPosition + part.OffsetPosition;
3050 part.GroupPosition = newPos;
2314 part.OffsetPosition = Vector3.Zero; 3051 part.OffsetPosition = Vector3.Zero;
2315 3052
2316 // Compution our rotation to be not relative to the old parent 3053 // Compution our rotation to be not relative to the old parent
@@ -2325,7 +3062,7 @@ namespace OpenSim.Region.Framework.Scenes
2325 part.LinkNum = linkNum; 3062 part.LinkNum = linkNum;
2326 3063
2327 // Compute the new position of this SOP relative to the group position 3064 // Compute the new position of this SOP relative to the group position
2328 part.OffsetPosition = part.GroupPosition - AbsolutePosition; 3065 part.OffsetPosition = newPos - AbsolutePosition;
2329 3066
2330 // (radams1 20120711: I don't know why part.OffsetPosition is set multiple times. 3067 // (radams1 20120711: I don't know why part.OffsetPosition is set multiple times.
2331 // It would have the affect of setting the physics engine position multiple 3068 // It would have the affect of setting the physics engine position multiple
@@ -2335,18 +3072,19 @@ namespace OpenSim.Region.Framework.Scenes
2335 // Rotate the relative position by the rotation of the group 3072 // Rotate the relative position by the rotation of the group
2336 Quaternion rootRotation = m_rootPart.RotationOffset; 3073 Quaternion rootRotation = m_rootPart.RotationOffset;
2337 Vector3 pos = part.OffsetPosition; 3074 Vector3 pos = part.OffsetPosition;
2338 pos *= Quaternion.Inverse(rootRotation); 3075 pos *= Quaternion.Conjugate(rootRotation);
2339 part.OffsetPosition = pos; 3076 part.OffsetPosition = pos;
2340 3077
2341 // Compute the SOP's rotation relative to the rotation of the group. 3078 // Compute the SOP's rotation relative to the rotation of the group.
2342 parentRot = m_rootPart.RotationOffset; 3079 parentRot = m_rootPart.RotationOffset;
2343 oldRot = part.RotationOffset; 3080 oldRot = part.RotationOffset;
2344 Quaternion newRot = Quaternion.Inverse(parentRot) * oldRot; 3081 Quaternion newRot = Quaternion.Conjugate(parentRot) * worldRot;
2345 part.RotationOffset = newRot; 3082 part.RotationOffset = newRot;
2346 3083
2347 // Since this SOP's state has changed, push those changes into the physics engine 3084 // Since this SOP's state has changed, push those changes into the physics engine
2348 // and the simulator. 3085 // and the simulator.
2349 part.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect); 3086 // done on caller
3087// part.UpdatePrimFlags(UsesPhysics, IsTemporary, IsPhantom, IsVolumeDetect, false);
2350 } 3088 }
2351 3089
2352 /// <summary> 3090 /// <summary>
@@ -2368,10 +3106,14 @@ namespace OpenSim.Region.Framework.Scenes
2368 { 3106 {
2369 if (!m_rootPart.BlockGrab) 3107 if (!m_rootPart.BlockGrab)
2370 { 3108 {
2371 Vector3 llmoveforce = pos - AbsolutePosition; 3109/* Vector3 llmoveforce = pos - AbsolutePosition;
2372 Vector3 grabforce = llmoveforce; 3110 Vector3 grabforce = llmoveforce;
2373 grabforce = (grabforce / 10) * pa.Mass; 3111 grabforce = (grabforce / 10) * pa.Mass;
2374 pa.AddForce(grabforce, true); 3112 */
3113 // empirically convert distance diference to a impulse
3114 Vector3 grabforce = pos - AbsolutePosition;
3115 grabforce = grabforce * (pa.Mass/ 10.0f);
3116 pa.AddForce(grabforce, false);
2375 m_scene.PhysicsScene.AddPhysicsActorTaint(pa); 3117 m_scene.PhysicsScene.AddPhysicsActorTaint(pa);
2376 } 3118 }
2377 } 3119 }
@@ -2567,6 +3309,8 @@ namespace OpenSim.Region.Framework.Scenes
2567 /// <param name="SetVolumeDetect"></param> 3309 /// <param name="SetVolumeDetect"></param>
2568 public void UpdatePrimFlags(uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect) 3310 public void UpdatePrimFlags(uint localID, bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVolumeDetect)
2569 { 3311 {
3312 HasGroupChanged = true;
3313
2570 SceneObjectPart selectionPart = GetPart(localID); 3314 SceneObjectPart selectionPart = GetPart(localID);
2571 3315
2572 if (SetTemporary && Scene != null) 3316 if (SetTemporary && Scene != null)
@@ -2597,8 +3341,22 @@ namespace OpenSim.Region.Framework.Scenes
2597 } 3341 }
2598 } 3342 }
2599 3343
2600 for (int i = 0; i < parts.Length; i++) 3344 if (parts.Length > 1)
2601 parts[i].UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect); 3345 {
3346 m_rootPart.UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, true);
3347
3348 for (int i = 0; i < parts.Length; i++)
3349 {
3350
3351 if (parts[i].UUID != m_rootPart.UUID)
3352 parts[i].UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, true);
3353 }
3354
3355 if (m_rootPart.PhysActor != null)
3356 m_rootPart.PhysActor.Building = false;
3357 }
3358 else
3359 m_rootPart.UpdatePrimFlags(UsePhysics, SetTemporary, SetPhantom, SetVolumeDetect, false);
2602 } 3360 }
2603 } 3361 }
2604 3362
@@ -2611,6 +3369,17 @@ namespace OpenSim.Region.Framework.Scenes
2611 } 3369 }
2612 } 3370 }
2613 3371
3372
3373
3374 /// <summary>
3375 /// Gets the number of parts
3376 /// </summary>
3377 /// <returns></returns>
3378 public int GetPartCount()
3379 {
3380 return Parts.Count();
3381 }
3382
2614 /// <summary> 3383 /// <summary>
2615 /// Update the texture entry for this part 3384 /// Update the texture entry for this part
2616 /// </summary> 3385 /// </summary>
@@ -2681,11 +3450,6 @@ namespace OpenSim.Region.Framework.Scenes
2681 /// <param name="scale"></param> 3450 /// <param name="scale"></param>
2682 public void GroupResize(Vector3 scale) 3451 public void GroupResize(Vector3 scale)
2683 { 3452 {
2684// m_log.DebugFormat(
2685// "[SCENE OBJECT GROUP]: Group resizing {0} {1} from {2} to {3}", Name, LocalId, RootPart.Scale, scale);
2686
2687 RootPart.StoreUndoState(true);
2688
2689 scale.X = Math.Max(Scene.m_minNonphys, Math.Min(Scene.m_maxNonphys, scale.X)); 3453 scale.X = Math.Max(Scene.m_minNonphys, Math.Min(Scene.m_maxNonphys, scale.X));
2690 scale.Y = Math.Max(Scene.m_minNonphys, Math.Min(Scene.m_maxNonphys, scale.Y)); 3454 scale.Y = Math.Max(Scene.m_minNonphys, Math.Min(Scene.m_maxNonphys, scale.Y));
2691 scale.Z = Math.Max(Scene.m_minNonphys, Math.Min(Scene.m_maxNonphys, scale.Z)); 3455 scale.Z = Math.Max(Scene.m_minNonphys, Math.Min(Scene.m_maxNonphys, scale.Z));
@@ -2712,7 +3476,6 @@ namespace OpenSim.Region.Framework.Scenes
2712 SceneObjectPart obPart = parts[i]; 3476 SceneObjectPart obPart = parts[i];
2713 if (obPart.UUID != m_rootPart.UUID) 3477 if (obPart.UUID != m_rootPart.UUID)
2714 { 3478 {
2715// obPart.IgnoreUndoUpdate = true;
2716 Vector3 oldSize = new Vector3(obPart.Scale); 3479 Vector3 oldSize = new Vector3(obPart.Scale);
2717 3480
2718 float f = 1.0f; 3481 float f = 1.0f;
@@ -2824,8 +3587,6 @@ namespace OpenSim.Region.Framework.Scenes
2824 z *= a; 3587 z *= a;
2825 } 3588 }
2826 } 3589 }
2827
2828// obPart.IgnoreUndoUpdate = false;
2829 } 3590 }
2830 } 3591 }
2831 } 3592 }
@@ -2835,9 +3596,7 @@ namespace OpenSim.Region.Framework.Scenes
2835 prevScale.Y *= y; 3596 prevScale.Y *= y;
2836 prevScale.Z *= z; 3597 prevScale.Z *= z;
2837 3598
2838// RootPart.IgnoreUndoUpdate = true;
2839 RootPart.Resize(prevScale); 3599 RootPart.Resize(prevScale);
2840// RootPart.IgnoreUndoUpdate = false;
2841 3600
2842 parts = m_parts.GetArray(); 3601 parts = m_parts.GetArray();
2843 for (int i = 0; i < parts.Length; i++) 3602 for (int i = 0; i < parts.Length; i++)
@@ -2846,8 +3605,6 @@ namespace OpenSim.Region.Framework.Scenes
2846 3605
2847 if (obPart.UUID != m_rootPart.UUID) 3606 if (obPart.UUID != m_rootPart.UUID)
2848 { 3607 {
2849 obPart.IgnoreUndoUpdate = true;
2850
2851 Vector3 currentpos = new Vector3(obPart.OffsetPosition); 3608 Vector3 currentpos = new Vector3(obPart.OffsetPosition);
2852 currentpos.X *= x; 3609 currentpos.X *= x;
2853 currentpos.Y *= y; 3610 currentpos.Y *= y;
@@ -2860,16 +3617,12 @@ namespace OpenSim.Region.Framework.Scenes
2860 3617
2861 obPart.Resize(newSize); 3618 obPart.Resize(newSize);
2862 obPart.UpdateOffSet(currentpos); 3619 obPart.UpdateOffSet(currentpos);
2863
2864 obPart.IgnoreUndoUpdate = false;
2865 } 3620 }
2866 3621
2867// obPart.IgnoreUndoUpdate = false; 3622 HasGroupChanged = true;
2868// obPart.StoreUndoState(); 3623 m_rootPart.TriggerScriptChangedEvent(Changed.SCALE);
3624 ScheduleGroupForTerseUpdate();
2869 } 3625 }
2870
2871// m_log.DebugFormat(
2872// "[SCENE OBJECT GROUP]: Finished group resizing {0} {1} to {2}", Name, LocalId, RootPart.Scale);
2873 } 3626 }
2874 3627
2875 #endregion 3628 #endregion
@@ -2882,14 +3635,6 @@ namespace OpenSim.Region.Framework.Scenes
2882 /// <param name="pos"></param> 3635 /// <param name="pos"></param>
2883 public void UpdateGroupPosition(Vector3 pos) 3636 public void UpdateGroupPosition(Vector3 pos)
2884 { 3637 {
2885// m_log.DebugFormat("[SCENE OBJECT GROUP]: Updating group position on {0} {1} to {2}", Name, LocalId, pos);
2886
2887 RootPart.StoreUndoState(true);
2888
2889// SceneObjectPart[] parts = m_parts.GetArray();
2890// for (int i = 0; i < parts.Length; i++)
2891// parts[i].StoreUndoState();
2892
2893 if (m_scene.EventManager.TriggerGroupMove(UUID, pos)) 3638 if (m_scene.EventManager.TriggerGroupMove(UUID, pos))
2894 { 3639 {
2895 if (IsAttachment) 3640 if (IsAttachment)
@@ -2922,21 +3667,17 @@ namespace OpenSim.Region.Framework.Scenes
2922 /// </summary> 3667 /// </summary>
2923 /// <param name="pos"></param> 3668 /// <param name="pos"></param>
2924 /// <param name="localID"></param> 3669 /// <param name="localID"></param>
3670 ///
3671
2925 public void UpdateSinglePosition(Vector3 pos, uint localID) 3672 public void UpdateSinglePosition(Vector3 pos, uint localID)
2926 { 3673 {
2927 SceneObjectPart part = GetPart(localID); 3674 SceneObjectPart part = GetPart(localID);
2928 3675
2929// SceneObjectPart[] parts = m_parts.GetArray();
2930// for (int i = 0; i < parts.Length; i++)
2931// parts[i].StoreUndoState();
2932
2933 if (part != null) 3676 if (part != null)
2934 { 3677 {
2935// m_log.DebugFormat( 3678// unlock parts position change
2936// "[SCENE OBJECT GROUP]: Updating single position of {0} {1} to {2}", part.Name, part.LocalId, pos); 3679 if (m_rootPart.PhysActor != null)
2937 3680 m_rootPart.PhysActor.Building = true;
2938 part.StoreUndoState(false);
2939 part.IgnoreUndoUpdate = true;
2940 3681
2941 if (part.UUID == m_rootPart.UUID) 3682 if (part.UUID == m_rootPart.UUID)
2942 { 3683 {
@@ -2947,8 +3688,10 @@ namespace OpenSim.Region.Framework.Scenes
2947 part.UpdateOffSet(pos); 3688 part.UpdateOffSet(pos);
2948 } 3689 }
2949 3690
3691 if (m_rootPart.PhysActor != null)
3692 m_rootPart.PhysActor.Building = false;
3693
2950 HasGroupChanged = true; 3694 HasGroupChanged = true;
2951 part.IgnoreUndoUpdate = false;
2952 } 3695 }
2953 } 3696 }
2954 3697
@@ -2958,13 +3701,7 @@ namespace OpenSim.Region.Framework.Scenes
2958 /// <param name="pos"></param> 3701 /// <param name="pos"></param>
2959 public void UpdateRootPosition(Vector3 pos) 3702 public void UpdateRootPosition(Vector3 pos)
2960 { 3703 {
2961// m_log.DebugFormat( 3704 // needs to be called with phys building true
2962// "[SCENE OBJECT GROUP]: Updating root position of {0} {1} to {2}", Name, LocalId, pos);
2963
2964// SceneObjectPart[] parts = m_parts.GetArray();
2965// for (int i = 0; i < parts.Length; i++)
2966// parts[i].StoreUndoState();
2967
2968 Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z); 3705 Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z);
2969 Vector3 oldPos = 3706 Vector3 oldPos =
2970 new Vector3(AbsolutePosition.X + m_rootPart.OffsetPosition.X, 3707 new Vector3(AbsolutePosition.X + m_rootPart.OffsetPosition.X,
@@ -2987,7 +3724,14 @@ namespace OpenSim.Region.Framework.Scenes
2987 AbsolutePosition = newPos; 3724 AbsolutePosition = newPos;
2988 3725
2989 HasGroupChanged = true; 3726 HasGroupChanged = true;
2990 ScheduleGroupForTerseUpdate(); 3727 if (m_rootPart.Undoing)
3728 {
3729 ScheduleGroupForFullUpdate();
3730 }
3731 else
3732 {
3733 ScheduleGroupForTerseUpdate();
3734 }
2991 } 3735 }
2992 3736
2993 #endregion 3737 #endregion
@@ -3000,24 +3744,16 @@ namespace OpenSim.Region.Framework.Scenes
3000 /// <param name="rot"></param> 3744 /// <param name="rot"></param>
3001 public void UpdateGroupRotationR(Quaternion rot) 3745 public void UpdateGroupRotationR(Quaternion rot)
3002 { 3746 {
3003// m_log.DebugFormat(
3004// "[SCENE OBJECT GROUP]: Updating group rotation R of {0} {1} to {2}", Name, LocalId, rot);
3005
3006// SceneObjectPart[] parts = m_parts.GetArray();
3007// for (int i = 0; i < parts.Length; i++)
3008// parts[i].StoreUndoState();
3009
3010 m_rootPart.StoreUndoState(true);
3011
3012 m_rootPart.UpdateRotation(rot); 3747 m_rootPart.UpdateRotation(rot);
3013 3748
3749/* this is done by rootpart RotationOffset set called by UpdateRotation
3014 PhysicsActor actor = m_rootPart.PhysActor; 3750 PhysicsActor actor = m_rootPart.PhysActor;
3015 if (actor != null) 3751 if (actor != null)
3016 { 3752 {
3017 actor.Orientation = m_rootPart.RotationOffset; 3753 actor.Orientation = m_rootPart.RotationOffset;
3018 m_scene.PhysicsScene.AddPhysicsActorTaint(actor); 3754 m_scene.PhysicsScene.AddPhysicsActorTaint(actor);
3019 } 3755 }
3020 3756*/
3021 HasGroupChanged = true; 3757 HasGroupChanged = true;
3022 ScheduleGroupForTerseUpdate(); 3758 ScheduleGroupForTerseUpdate();
3023 } 3759 }
@@ -3029,16 +3765,6 @@ namespace OpenSim.Region.Framework.Scenes
3029 /// <param name="rot"></param> 3765 /// <param name="rot"></param>
3030 public void UpdateGroupRotationPR(Vector3 pos, Quaternion rot) 3766 public void UpdateGroupRotationPR(Vector3 pos, Quaternion rot)
3031 { 3767 {
3032// m_log.DebugFormat(
3033// "[SCENE OBJECT GROUP]: Updating group rotation PR of {0} {1} to {2}", Name, LocalId, rot);
3034
3035// SceneObjectPart[] parts = m_parts.GetArray();
3036// for (int i = 0; i < parts.Length; i++)
3037// parts[i].StoreUndoState();
3038
3039 RootPart.StoreUndoState(true);
3040 RootPart.IgnoreUndoUpdate = true;
3041
3042 m_rootPart.UpdateRotation(rot); 3768 m_rootPart.UpdateRotation(rot);
3043 3769
3044 PhysicsActor actor = m_rootPart.PhysActor; 3770 PhysicsActor actor = m_rootPart.PhysActor;
@@ -3057,8 +3783,6 @@ namespace OpenSim.Region.Framework.Scenes
3057 3783
3058 HasGroupChanged = true; 3784 HasGroupChanged = true;
3059 ScheduleGroupForTerseUpdate(); 3785 ScheduleGroupForTerseUpdate();
3060
3061 RootPart.IgnoreUndoUpdate = false;
3062 } 3786 }
3063 3787
3064 /// <summary> 3788 /// <summary>
@@ -3071,13 +3795,11 @@ namespace OpenSim.Region.Framework.Scenes
3071 SceneObjectPart part = GetPart(localID); 3795 SceneObjectPart part = GetPart(localID);
3072 3796
3073 SceneObjectPart[] parts = m_parts.GetArray(); 3797 SceneObjectPart[] parts = m_parts.GetArray();
3074 for (int i = 0; i < parts.Length; i++)
3075 parts[i].StoreUndoState();
3076 3798
3077 if (part != null) 3799 if (part != null)
3078 { 3800 {
3079// m_log.DebugFormat( 3801 if (m_rootPart.PhysActor != null)
3080// "[SCENE OBJECT GROUP]: Updating single rotation of {0} {1} to {2}", part.Name, part.LocalId, rot); 3802 m_rootPart.PhysActor.Building = true;
3081 3803
3082 if (part.UUID == m_rootPart.UUID) 3804 if (part.UUID == m_rootPart.UUID)
3083 { 3805 {
@@ -3087,6 +3809,9 @@ namespace OpenSim.Region.Framework.Scenes
3087 { 3809 {
3088 part.UpdateRotation(rot); 3810 part.UpdateRotation(rot);
3089 } 3811 }
3812
3813 if (m_rootPart.PhysActor != null)
3814 m_rootPart.PhysActor.Building = false;
3090 } 3815 }
3091 } 3816 }
3092 3817
@@ -3100,12 +3825,8 @@ namespace OpenSim.Region.Framework.Scenes
3100 SceneObjectPart part = GetPart(localID); 3825 SceneObjectPart part = GetPart(localID);
3101 if (part != null) 3826 if (part != null)
3102 { 3827 {
3103// m_log.DebugFormat( 3828 if (m_rootPart.PhysActor != null)
3104// "[SCENE OBJECT GROUP]: Updating single position and rotation of {0} {1} to {2}", 3829 m_rootPart.PhysActor.Building = true;
3105// part.Name, part.LocalId, rot);
3106
3107 part.StoreUndoState();
3108 part.IgnoreUndoUpdate = true;
3109 3830
3110 if (part.UUID == m_rootPart.UUID) 3831 if (part.UUID == m_rootPart.UUID)
3111 { 3832 {
@@ -3118,7 +3839,8 @@ namespace OpenSim.Region.Framework.Scenes
3118 part.OffsetPosition = pos; 3839 part.OffsetPosition = pos;
3119 } 3840 }
3120 3841
3121 part.IgnoreUndoUpdate = false; 3842 if (m_rootPart.PhysActor != null)
3843 m_rootPart.PhysActor.Building = false;
3122 } 3844 }
3123 } 3845 }
3124 3846
@@ -3128,15 +3850,12 @@ namespace OpenSim.Region.Framework.Scenes
3128 /// <param name="rot"></param> 3850 /// <param name="rot"></param>
3129 public void UpdateRootRotation(Quaternion rot) 3851 public void UpdateRootRotation(Quaternion rot)
3130 { 3852 {
3131// m_log.DebugFormat( 3853 // needs to be called with phys building true
3132// "[SCENE OBJECT GROUP]: Updating root rotation of {0} {1} to {2}",
3133// Name, LocalId, rot);
3134
3135 Quaternion axRot = rot; 3854 Quaternion axRot = rot;
3136 Quaternion oldParentRot = m_rootPart.RotationOffset; 3855 Quaternion oldParentRot = m_rootPart.RotationOffset;
3137 3856
3138 m_rootPart.StoreUndoState(); 3857 //Don't use UpdateRotation because it schedules an update prematurely
3139 m_rootPart.UpdateRotation(rot); 3858 m_rootPart.RotationOffset = rot;
3140 3859
3141 PhysicsActor pa = m_rootPart.PhysActor; 3860 PhysicsActor pa = m_rootPart.PhysActor;
3142 3861
@@ -3152,35 +3871,145 @@ namespace OpenSim.Region.Framework.Scenes
3152 SceneObjectPart prim = parts[i]; 3871 SceneObjectPart prim = parts[i];
3153 if (prim.UUID != m_rootPart.UUID) 3872 if (prim.UUID != m_rootPart.UUID)
3154 { 3873 {
3155 prim.IgnoreUndoUpdate = true; 3874 Quaternion NewRot = oldParentRot * prim.RotationOffset;
3875 NewRot = Quaternion.Inverse(axRot) * NewRot;
3876 prim.RotationOffset = NewRot;
3877
3156 Vector3 axPos = prim.OffsetPosition; 3878 Vector3 axPos = prim.OffsetPosition;
3879
3157 axPos *= oldParentRot; 3880 axPos *= oldParentRot;
3158 axPos *= Quaternion.Inverse(axRot); 3881 axPos *= Quaternion.Inverse(axRot);
3159 prim.OffsetPosition = axPos; 3882 prim.OffsetPosition = axPos;
3160 Quaternion primsRot = prim.RotationOffset; 3883 }
3161 Quaternion newRot = oldParentRot * primsRot; 3884 }
3162 newRot = Quaternion.Inverse(axRot) * newRot;
3163 prim.RotationOffset = newRot;
3164 prim.ScheduleTerseUpdate();
3165 prim.IgnoreUndoUpdate = false;
3166 }
3167 }
3168
3169// for (int i = 0; i < parts.Length; i++)
3170// {
3171// SceneObjectPart childpart = parts[i];
3172// if (childpart != m_rootPart)
3173// {
3174//// childpart.IgnoreUndoUpdate = false;
3175//// childpart.StoreUndoState();
3176// }
3177// }
3178 3885
3179 m_rootPart.ScheduleTerseUpdate(); 3886 HasGroupChanged = true;
3887 ScheduleGroupForFullUpdate();
3888 }
3180 3889
3181// m_log.DebugFormat( 3890 private enum updatetype :int
3182// "[SCENE OBJECT GROUP]: Updated root rotation of {0} {1} to {2}", 3891 {
3183// Name, LocalId, rot); 3892 none = 0,
3893 partterse = 1,
3894 partfull = 2,
3895 groupterse = 3,
3896 groupfull = 4
3897 }
3898
3899 public void doChangeObject(SceneObjectPart part, ObjectChangeData data)
3900 {
3901 // TODO this still as excessive *.Schedule*Update()s
3902
3903 if (part != null && part.ParentGroup != null)
3904 {
3905 ObjectChangeType change = data.change;
3906 bool togroup = ((change & ObjectChangeType.Group) != 0);
3907 // bool uniform = ((what & ObjectChangeType.UniformScale) != 0); not in use
3908
3909 SceneObjectGroup group = part.ParentGroup;
3910 PhysicsActor pha = group.RootPart.PhysActor;
3911
3912 updatetype updateType = updatetype.none;
3913
3914 if (togroup)
3915 {
3916 // related to group
3917 if ((change & (ObjectChangeType.Rotation | ObjectChangeType.Position)) != 0)
3918 {
3919 if ((change & ObjectChangeType.Rotation) != 0)
3920 {
3921 group.RootPart.UpdateRotation(data.rotation);
3922 updateType = updatetype.none;
3923 }
3924 if ((change & ObjectChangeType.Position) != 0)
3925 {
3926 if (IsAttachment || m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position))
3927 UpdateGroupPosition(data.position);
3928 updateType = updatetype.groupterse;
3929 }
3930 else
3931 // ugly rotation update of all parts
3932 {
3933 group.ResetChildPrimPhysicsPositions();
3934 }
3935
3936 }
3937 if ((change & ObjectChangeType.Scale) != 0)
3938 {
3939 if (pha != null)
3940 pha.Building = true;
3941
3942 group.GroupResize(data.scale);
3943 updateType = updatetype.none;
3944
3945 if (pha != null)
3946 pha.Building = false;
3947 }
3948 }
3949 else
3950 {
3951 // related to single prim in a link-set ( ie group)
3952 if (pha != null)
3953 pha.Building = true;
3954
3955 // root part is special
3956 // parts offset positions or rotations need to change also
3957
3958 if (part == group.RootPart)
3959 {
3960 if ((change & ObjectChangeType.Rotation) != 0)
3961 group.UpdateRootRotation(data.rotation);
3962 if ((change & ObjectChangeType.Position) != 0)
3963 group.UpdateRootPosition(data.position);
3964 if ((change & ObjectChangeType.Scale) != 0)
3965 part.Resize(data.scale);
3966 }
3967 else
3968 {
3969 if ((change & ObjectChangeType.Position) != 0)
3970 {
3971 part.OffsetPosition = data.position;
3972 updateType = updatetype.partterse;
3973 }
3974 if ((change & ObjectChangeType.Rotation) != 0)
3975 {
3976 part.UpdateRotation(data.rotation);
3977 updateType = updatetype.none;
3978 }
3979 if ((change & ObjectChangeType.Scale) != 0)
3980 {
3981 part.Resize(data.scale);
3982 updateType = updatetype.none;
3983 }
3984 }
3985
3986 if (pha != null)
3987 pha.Building = false;
3988 }
3989
3990 if (updateType != updatetype.none)
3991 {
3992 group.HasGroupChanged = true;
3993
3994 switch (updateType)
3995 {
3996 case updatetype.partterse:
3997 part.ScheduleTerseUpdate();
3998 break;
3999 case updatetype.partfull:
4000 part.ScheduleFullUpdate();
4001 break;
4002 case updatetype.groupterse:
4003 group.ScheduleGroupForTerseUpdate();
4004 break;
4005 case updatetype.groupfull:
4006 group.ScheduleGroupForFullUpdate();
4007 break;
4008 default:
4009 break;
4010 }
4011 }
4012 }
3184 } 4013 }
3185 4014
3186 #endregion 4015 #endregion
@@ -3279,10 +4108,11 @@ namespace OpenSim.Region.Framework.Scenes
3279 scriptPosTarget target = m_targets[idx]; 4108 scriptPosTarget target = m_targets[idx];
3280 if (Util.GetDistanceTo(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance) 4109 if (Util.GetDistanceTo(target.targetPos, m_rootPart.GroupPosition) <= target.tolerance)
3281 { 4110 {
4111 at_target = true;
4112
3282 // trigger at_target 4113 // trigger at_target
3283 if (m_scriptListens_atTarget) 4114 if (m_scriptListens_atTarget)
3284 { 4115 {
3285 at_target = true;
3286 scriptPosTarget att = new scriptPosTarget(); 4116 scriptPosTarget att = new scriptPosTarget();
3287 att.targetPos = target.targetPos; 4117 att.targetPos = target.targetPos;
3288 att.tolerance = target.tolerance; 4118 att.tolerance = target.tolerance;
@@ -3400,11 +4230,50 @@ namespace OpenSim.Region.Framework.Scenes
3400 } 4230 }
3401 } 4231 }
3402 } 4232 }
3403 4233
4234 public Vector3 GetGeometricCenter()
4235 {
4236 // this is not real geometric center but a average of positions relative to root prim acording to
4237 // http://wiki.secondlife.com/wiki/llGetGeometricCenter
4238 // ignoring tortured prims details since sl also seems to ignore
4239 // so no real use in doing it on physics
4240
4241 Vector3 gc = Vector3.Zero;
4242
4243 int nparts = m_parts.Count;
4244 if (nparts <= 1)
4245 return gc;
4246
4247 SceneObjectPart[] parts = m_parts.GetArray();
4248 nparts = parts.Length; // just in case it changed
4249 if (nparts <= 1)
4250 return gc;
4251
4252 Quaternion parentRot = RootPart.RotationOffset;
4253 Vector3 pPos;
4254
4255 // average all parts positions
4256 for (int i = 0; i < nparts; i++)
4257 {
4258 // do it directly
4259 // gc += parts[i].GetWorldPosition();
4260 if (parts[i] != RootPart)
4261 {
4262 pPos = parts[i].OffsetPosition;
4263 gc += pPos;
4264 }
4265
4266 }
4267 gc /= nparts;
4268
4269 // relative to root:
4270// gc -= AbsolutePosition;
4271 return gc;
4272 }
4273
3404 public float GetMass() 4274 public float GetMass()
3405 { 4275 {
3406 float retmass = 0f; 4276 float retmass = 0f;
3407
3408 SceneObjectPart[] parts = m_parts.GetArray(); 4277 SceneObjectPart[] parts = m_parts.GetArray();
3409 for (int i = 0; i < parts.Length; i++) 4278 for (int i = 0; i < parts.Length; i++)
3410 retmass += parts[i].GetMass(); 4279 retmass += parts[i].GetMass();
@@ -3412,6 +4281,39 @@ namespace OpenSim.Region.Framework.Scenes
3412 return retmass; 4281 return retmass;
3413 } 4282 }
3414 4283
4284 // center of mass of full object
4285 public Vector3 GetCenterOfMass()
4286 {
4287 PhysicsActor pa = RootPart.PhysActor;
4288
4289 if(((RootPart.Flags & PrimFlags.Physics) !=0) && pa !=null)
4290 {
4291 // physics knows better about center of mass of physical prims
4292 Vector3 tmp = pa.CenterOfMass;
4293 return tmp;
4294 }
4295
4296 Vector3 Ptot = Vector3.Zero;
4297 float totmass = 0f;
4298 float m;
4299
4300 SceneObjectPart[] parts = m_parts.GetArray();
4301 for (int i = 0; i < parts.Length; i++)
4302 {
4303 m = parts[i].GetMass();
4304 Ptot += parts[i].GetPartCenterOfMass() * m;
4305 totmass += m;
4306 }
4307
4308 if (totmass == 0)
4309 totmass = 0;
4310 else
4311 totmass = 1 / totmass;
4312 Ptot *= totmass;
4313
4314 return Ptot;
4315 }
4316
3415 /// <summary> 4317 /// <summary>
3416 /// If the object is a sculpt/mesh, retrieve the mesh data for each part and reinsert it into each shape so that 4318 /// If the object is a sculpt/mesh, retrieve the mesh data for each part and reinsert it into each shape so that
3417 /// the physics engine can use it. 4319 /// the physics engine can use it.
@@ -3579,6 +4481,14 @@ namespace OpenSim.Region.Framework.Scenes
3579 FromItemID = uuid; 4481 FromItemID = uuid;
3580 } 4482 }
3581 4483
4484 public void ResetOwnerChangeFlag()
4485 {
4486 ForEachPart(delegate(SceneObjectPart part)
4487 {
4488 part.ResetOwnerChangeFlag();
4489 });
4490 }
4491
3582 #endregion 4492 #endregion
3583 } 4493 }
3584} 4494}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 411dcc7..4ed3413 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -62,7 +62,8 @@ namespace OpenSim.Region.Framework.Scenes
62 TELEPORT = 512, 62 TELEPORT = 512,
63 REGION_RESTART = 1024, 63 REGION_RESTART = 1024,
64 MEDIA = 2048, 64 MEDIA = 2048,
65 ANIMATION = 16384 65 ANIMATION = 16384,
66 POSITION = 32768
66 } 67 }
67 68
68 // I don't really know where to put this except here. 69 // I don't really know where to put this except here.
@@ -121,7 +122,18 @@ namespace OpenSim.Region.Framework.Scenes
121 /// Denote all sides of the prim 122 /// Denote all sides of the prim
122 /// </value> 123 /// </value>
123 public const int ALL_SIDES = -1; 124 public const int ALL_SIDES = -1;
124 125
126 private const scriptEvents PhysicsNeededSubsEvents = (
127 scriptEvents.collision | scriptEvents.collision_start | scriptEvents.collision_end |
128 scriptEvents.land_collision | scriptEvents.land_collision_start | scriptEvents.land_collision_end
129 );
130 private const scriptEvents PhyscicsPhantonSubsEvents = (
131 scriptEvents.land_collision | scriptEvents.land_collision_start | scriptEvents.land_collision_end
132 );
133 private const scriptEvents PhyscicsVolumeDtcSubsEvents = (
134 scriptEvents.collision_start | scriptEvents.collision_end
135 );
136
125 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 137 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
126 138
127 /// <value> 139 /// <value>
@@ -191,12 +203,25 @@ namespace OpenSim.Region.Framework.Scenes
191 203
192 public double SoundRadius; 204 public double SoundRadius;
193 205
206
194 public uint TimeStampFull; 207 public uint TimeStampFull;
195 208
196 public uint TimeStampLastActivity; // Will be used for AutoReturn 209 public uint TimeStampLastActivity; // Will be used for AutoReturn
197 210
198 public uint TimeStampTerse; 211 public uint TimeStampTerse;
199 212
213 // The following two are to hold the attachment data
214 // while an object is inworld
215 [XmlIgnore]
216 public byte AttachPoint = 0;
217
218 [XmlIgnore]
219 public Vector3 AttachOffset = Vector3.Zero;
220
221 [XmlIgnore]
222 public Quaternion AttachRotation = Quaternion.Identity;
223
224 [XmlIgnore]
200 public int STATUS_ROTATE_X; 225 public int STATUS_ROTATE_X;
201 226
202 public int STATUS_ROTATE_Y; 227 public int STATUS_ROTATE_Y;
@@ -223,8 +248,7 @@ namespace OpenSim.Region.Framework.Scenes
223 248
224 public Vector3 RotationAxis = Vector3.One; 249 public Vector3 RotationAxis = Vector3.One;
225 250
226 public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this 251 public bool VolumeDetectActive;
227 // Certainly this must be a persistant setting finally
228 252
229 public bool IsWaitingForFirstSpinUpdatePacket; 253 public bool IsWaitingForFirstSpinUpdatePacket;
230 254
@@ -264,10 +288,10 @@ namespace OpenSim.Region.Framework.Scenes
264 private Quaternion m_sitTargetOrientation = Quaternion.Identity; 288 private Quaternion m_sitTargetOrientation = Quaternion.Identity;
265 private Vector3 m_sitTargetPosition; 289 private Vector3 m_sitTargetPosition;
266 private string m_sitAnimation = "SIT"; 290 private string m_sitAnimation = "SIT";
291 private bool m_occupied; // KF if any av is sitting on this prim
267 private string m_text = String.Empty; 292 private string m_text = String.Empty;
268 private string m_touchName = String.Empty; 293 private string m_touchName = String.Empty;
269 private readonly Stack<UndoState> m_undo = new Stack<UndoState>(5); 294 private UndoRedoState m_UndoRedo = null;
270 private readonly Stack<UndoState> m_redo = new Stack<UndoState>(5);
271 295
272 private bool m_passTouches = false; 296 private bool m_passTouches = false;
273 private bool m_passCollisions = false; 297 private bool m_passCollisions = false;
@@ -296,7 +320,19 @@ namespace OpenSim.Region.Framework.Scenes
296 protected Vector3 m_lastAcceleration; 320 protected Vector3 m_lastAcceleration;
297 protected Vector3 m_lastAngularVelocity; 321 protected Vector3 m_lastAngularVelocity;
298 protected int m_lastTerseSent; 322 protected int m_lastTerseSent;
299 323 protected float m_buoyancy = 0.0f;
324 protected Vector3 m_force;
325 protected Vector3 m_torque;
326
327 protected byte m_physicsShapeType = (byte)PhysShapeType.prim;
328 protected float m_density = 1000.0f; // in kg/m^3
329 protected float m_gravitymod = 1.0f;
330 protected float m_friction = 0.6f; // wood
331 protected float m_bounce = 0.5f; // wood
332
333
334 protected bool m_isSelected = false;
335
300 /// <summary> 336 /// <summary>
301 /// Stores media texture data 337 /// Stores media texture data
302 /// </summary> 338 /// </summary>
@@ -308,10 +344,25 @@ namespace OpenSim.Region.Framework.Scenes
308 private Vector3 m_cameraAtOffset; 344 private Vector3 m_cameraAtOffset;
309 private bool m_forceMouselook; 345 private bool m_forceMouselook;
310 346
311 // TODO: Collision sound should have default. 347
348 // 0 for default collision sounds, -1 for script disabled sound 1 for script defined sound
349 private sbyte m_collisionSoundType;
312 private UUID m_collisionSound; 350 private UUID m_collisionSound;
313 private float m_collisionSoundVolume; 351 private float m_collisionSoundVolume;
314 352
353 private int LastColSoundSentTime;
354
355
356 private SOPVehicle m_vehicleParams = null;
357
358 private KeyframeMotion m_keyframeMotion = null;
359
360 public KeyframeMotion KeyframeMotion
361 {
362 get; set;
363 }
364
365
315 #endregion Fields 366 #endregion Fields
316 367
317// ~SceneObjectPart() 368// ~SceneObjectPart()
@@ -340,6 +391,7 @@ namespace OpenSim.Region.Framework.Scenes
340 // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from 391 // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from
341 // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log 392 // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log
342 m_inventory = new SceneObjectPartInventory(this); 393 m_inventory = new SceneObjectPartInventory(this);
394 LastColSoundSentTime = Util.EnvironmentTickCount();
343 } 395 }
344 396
345 /// <summary> 397 /// <summary>
@@ -354,7 +406,7 @@ namespace OpenSim.Region.Framework.Scenes
354 UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 406 UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition,
355 Quaternion rotationOffset, Vector3 offsetPosition) : this() 407 Quaternion rotationOffset, Vector3 offsetPosition) : this()
356 { 408 {
357 m_name = "Primitive"; 409 m_name = "Object";
358 410
359 CreationDate = (int)Utils.DateTimeToUnixTime(Rezzed); 411 CreationDate = (int)Utils.DateTimeToUnixTime(Rezzed);
360 LastOwnerID = CreatorID = OwnerID = ownerID; 412 LastOwnerID = CreatorID = OwnerID = ownerID;
@@ -393,7 +445,7 @@ namespace OpenSim.Region.Framework.Scenes
393 private uint _ownerMask = (uint)PermissionMask.All; 445 private uint _ownerMask = (uint)PermissionMask.All;
394 private uint _groupMask = (uint)PermissionMask.None; 446 private uint _groupMask = (uint)PermissionMask.None;
395 private uint _everyoneMask = (uint)PermissionMask.None; 447 private uint _everyoneMask = (uint)PermissionMask.None;
396 private uint _nextOwnerMask = (uint)PermissionMask.All; 448 private uint _nextOwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer);
397 private PrimFlags _flags = PrimFlags.None; 449 private PrimFlags _flags = PrimFlags.None;
398 private DateTime m_expires; 450 private DateTime m_expires;
399 private DateTime m_rezzed; 451 private DateTime m_rezzed;
@@ -487,12 +539,16 @@ namespace OpenSim.Region.Framework.Scenes
487 } 539 }
488 540
489 /// <value> 541 /// <value>
490 /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes 542 /// Get the inventory list
491 /// </value> 543 /// </value>
492 public TaskInventoryDictionary TaskInventory 544 public TaskInventoryDictionary TaskInventory
493 { 545 {
494 get { return m_inventory.Items; } 546 get {
495 set { m_inventory.Items = value; } 547 return m_inventory.Items;
548 }
549 set {
550 m_inventory.Items = value;
551 }
496 } 552 }
497 553
498 /// <summary> 554 /// <summary>
@@ -542,20 +598,6 @@ namespace OpenSim.Region.Framework.Scenes
542 } 598 }
543 } 599 }
544 600
545 public byte Material
546 {
547 get { return (byte) m_material; }
548 set
549 {
550 m_material = (Material)value;
551
552 PhysicsActor pa = PhysActor;
553
554 if (pa != null)
555 pa.SetMaterial((int)value);
556 }
557 }
558
559 [XmlIgnore] 601 [XmlIgnore]
560 public bool PassTouches 602 public bool PassTouches
561 { 603 {
@@ -581,6 +623,18 @@ namespace OpenSim.Region.Framework.Scenes
581 } 623 }
582 } 624 }
583 625
626 public bool IsSelected
627 {
628 get { return m_isSelected; }
629 set
630 {
631 m_isSelected = value;
632 if (ParentGroup != null)
633 ParentGroup.PartSelectChanged(value);
634 }
635 }
636
637
584 public Dictionary<int, string> CollisionFilter 638 public Dictionary<int, string> CollisionFilter
585 { 639 {
586 get { return m_CollisionFilter; } 640 get { return m_CollisionFilter; }
@@ -649,14 +703,12 @@ namespace OpenSim.Region.Framework.Scenes
649 set { m_LoopSoundSlavePrims = value; } 703 set { m_LoopSoundSlavePrims = value; }
650 } 704 }
651 705
652
653 public Byte[] TextureAnimation 706 public Byte[] TextureAnimation
654 { 707 {
655 get { return m_TextureAnimation; } 708 get { return m_TextureAnimation; }
656 set { m_TextureAnimation = value; } 709 set { m_TextureAnimation = value; }
657 } 710 }
658 711
659
660 public Byte[] ParticleSystem 712 public Byte[] ParticleSystem
661 { 713 {
662 get { return m_particleSystem; } 714 get { return m_particleSystem; }
@@ -693,9 +745,12 @@ namespace OpenSim.Region.Framework.Scenes
693 { 745 {
694 // If this is a linkset, we don't want the physics engine mucking up our group position here. 746 // If this is a linkset, we don't want the physics engine mucking up our group position here.
695 PhysicsActor actor = PhysActor; 747 PhysicsActor actor = PhysActor;
696 // If physical and the root prim of a linkset, the position of the group is what physics thinks. 748 if (ParentID == 0)
697 if (actor != null && ParentID == 0) 749 {
698 m_groupPosition = actor.Position; 750 if (actor != null)
751 m_groupPosition = actor.Position;
752 return m_groupPosition;
753 }
699 754
700 // If I'm an attachment, my position is reported as the position of who I'm attached to 755 // If I'm an attachment, my position is reported as the position of who I'm attached to
701 if (ParentGroup.IsAttachment) 756 if (ParentGroup.IsAttachment)
@@ -705,12 +760,14 @@ namespace OpenSim.Region.Framework.Scenes
705 return sp.AbsolutePosition; 760 return sp.AbsolutePosition;
706 } 761 }
707 762
763 // use root prim's group position. Physics may have updated it
764 if (ParentGroup.RootPart != this)
765 m_groupPosition = ParentGroup.RootPart.GroupPosition;
708 return m_groupPosition; 766 return m_groupPosition;
709 } 767 }
710 set 768 set
711 { 769 {
712 m_groupPosition = value; 770 m_groupPosition = value;
713
714 PhysicsActor actor = PhysActor; 771 PhysicsActor actor = PhysActor;
715 if (actor != null) 772 if (actor != null)
716 { 773 {
@@ -736,16 +793,6 @@ namespace OpenSim.Region.Framework.Scenes
736 m_log.ErrorFormat("[SCENEOBJECTPART]: GROUP POSITION. {0}", e); 793 m_log.ErrorFormat("[SCENEOBJECTPART]: GROUP POSITION. {0}", e);
737 } 794 }
738 } 795 }
739
740 // TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too
741 if (SitTargetAvatar != UUID.Zero)
742 {
743 ScenePresence avatar;
744 if (ParentGroup.Scene.TryGetScenePresence(SitTargetAvatar, out avatar))
745 {
746 avatar.ParentPosition = GetWorldPosition();
747 }
748 }
749 } 796 }
750 } 797 }
751 798
@@ -754,7 +801,7 @@ namespace OpenSim.Region.Framework.Scenes
754 get { return m_offsetPosition; } 801 get { return m_offsetPosition; }
755 set 802 set
756 { 803 {
757// StoreUndoState(); 804 Vector3 oldpos = m_offsetPosition;
758 m_offsetPosition = value; 805 m_offsetPosition = value;
759 806
760 if (ParentGroup != null && !ParentGroup.IsDeleted) 807 if (ParentGroup != null && !ParentGroup.IsDeleted)
@@ -769,7 +816,22 @@ namespace OpenSim.Region.Framework.Scenes
769 if (ParentGroup.Scene != null) 816 if (ParentGroup.Scene != null)
770 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor); 817 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
771 } 818 }
819
820 if (!m_parentGroup.m_dupeInProgress)
821 {
822 List<ScenePresence> avs = ParentGroup.GetLinkedAvatars();
823 foreach (ScenePresence av in avs)
824 {
825 if (av.ParentID == m_localId)
826 {
827 Vector3 offset = (m_offsetPosition - oldpos);
828 av.AbsolutePosition += offset;
829 av.SendAvatarDataToAllAgents();
830 }
831 }
832 }
772 } 833 }
834 TriggerScriptChangedEvent(Changed.POSITION);
773 } 835 }
774 } 836 }
775 837
@@ -820,7 +882,7 @@ namespace OpenSim.Region.Framework.Scenes
820 882
821 set 883 set
822 { 884 {
823 StoreUndoState(); 885// StoreUndoState();
824 m_rotationOffset = value; 886 m_rotationOffset = value;
825 887
826 PhysicsActor actor = PhysActor; 888 PhysicsActor actor = PhysActor;
@@ -908,19 +970,36 @@ namespace OpenSim.Region.Framework.Scenes
908 get 970 get
909 { 971 {
910 PhysicsActor actor = PhysActor; 972 PhysicsActor actor = PhysActor;
911 if ((actor != null) && actor.IsPhysical) 973 if ((actor != null) && actor.IsPhysical && ParentGroup.RootPart == this)
912 { 974 {
913 m_angularVelocity = actor.RotationalVelocity; 975 m_angularVelocity = actor.RotationalVelocity;
914 } 976 }
915 return m_angularVelocity; 977 return m_angularVelocity;
916 } 978 }
917 set { m_angularVelocity = value; } 979 set
980 {
981 m_angularVelocity = value;
982 PhysicsActor actor = PhysActor;
983 if ((actor != null) && actor.IsPhysical && ParentGroup.RootPart == this && VehicleType == (int)Vehicle.TYPE_NONE)
984 {
985 actor.RotationalVelocity = m_angularVelocity;
986 }
987 }
918 } 988 }
919 989
920 /// <summary></summary> 990 /// <summary></summary>
921 public Vector3 Acceleration 991 public Vector3 Acceleration
922 { 992 {
923 get { return m_acceleration; } 993 get
994 {
995 PhysicsActor actor = PhysActor;
996 if (actor != null)
997 {
998 m_acceleration = actor.Acceleration;
999 }
1000 return m_acceleration;
1001 }
1002
924 set { m_acceleration = value; } 1003 set { m_acceleration = value; }
925 } 1004 }
926 1005
@@ -988,7 +1067,10 @@ namespace OpenSim.Region.Framework.Scenes
988 public PrimitiveBaseShape Shape 1067 public PrimitiveBaseShape Shape
989 { 1068 {
990 get { return m_shape; } 1069 get { return m_shape; }
991 set { m_shape = value;} 1070 set
1071 {
1072 m_shape = value;
1073 }
992 } 1074 }
993 1075
994 /// <summary> 1076 /// <summary>
@@ -1001,7 +1083,6 @@ namespace OpenSim.Region.Framework.Scenes
1001 { 1083 {
1002 if (m_shape != null) 1084 if (m_shape != null)
1003 { 1085 {
1004 StoreUndoState();
1005 1086
1006 m_shape.Scale = value; 1087 m_shape.Scale = value;
1007 1088
@@ -1028,6 +1109,7 @@ namespace OpenSim.Region.Framework.Scenes
1028 } 1109 }
1029 1110
1030 public UpdateRequired UpdateFlag { get; set; } 1111 public UpdateRequired UpdateFlag { get; set; }
1112 public bool UpdatePhysRequired { get; set; }
1031 1113
1032 /// <summary> 1114 /// <summary>
1033 /// Used for media on a prim. 1115 /// Used for media on a prim.
@@ -1068,10 +1150,7 @@ namespace OpenSim.Region.Framework.Scenes
1068 { 1150 {
1069 get 1151 get
1070 { 1152 {
1071 if (ParentGroup.IsAttachment) 1153 return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset);
1072 return GroupPosition;
1073
1074 return m_offsetPosition + m_groupPosition;
1075 } 1154 }
1076 } 1155 }
1077 1156
@@ -1249,6 +1328,13 @@ namespace OpenSim.Region.Framework.Scenes
1249 _flags = value; 1328 _flags = value;
1250 } 1329 }
1251 } 1330 }
1331
1332 [XmlIgnore]
1333 public bool IsOccupied // KF If an av is sittingon this prim
1334 {
1335 get { return m_occupied; }
1336 set { m_occupied = value; }
1337 }
1252 1338
1253 /// <summary> 1339 /// <summary>
1254 /// ID of the avatar that is sat on us if we have a sit target. If there is no such avatar then is UUID.Zero 1340 /// ID of the avatar that is sat on us if we have a sit target. If there is no such avatar then is UUID.Zero
@@ -1299,12 +1385,41 @@ namespace OpenSim.Region.Framework.Scenes
1299 set { m_sitAnimation = value; } 1385 set { m_sitAnimation = value; }
1300 } 1386 }
1301 1387
1388 public UUID invalidCollisionSoundUUID = new UUID("ffffffff-ffff-ffff-ffff-ffffffffffff");
1389
1390 // 0 for default collision sounds, -1 for script disabled sound 1 for script defined sound
1391 // runtime thing.. do not persist
1392 [XmlIgnore]
1393 public sbyte CollisionSoundType
1394 {
1395 get
1396 {
1397 return m_collisionSoundType;
1398 }
1399 set
1400 {
1401 m_collisionSoundType = value;
1402 if (value == -1)
1403 m_collisionSound = invalidCollisionSoundUUID;
1404 else if (value == 0)
1405 m_collisionSound = UUID.Zero;
1406 }
1407 }
1408
1302 public UUID CollisionSound 1409 public UUID CollisionSound
1303 { 1410 {
1304 get { return m_collisionSound; } 1411 get { return m_collisionSound; }
1305 set 1412 set
1306 { 1413 {
1307 m_collisionSound = value; 1414 m_collisionSound = value;
1415
1416 if (value == invalidCollisionSoundUUID)
1417 m_collisionSoundType = -1;
1418 else if (value == UUID.Zero)
1419 m_collisionSoundType = 0;
1420 else
1421 m_collisionSoundType = 1;
1422
1308 aggregateScriptEvents(); 1423 aggregateScriptEvents();
1309 } 1424 }
1310 } 1425 }
@@ -1315,6 +1430,319 @@ namespace OpenSim.Region.Framework.Scenes
1315 set { m_collisionSoundVolume = value; } 1430 set { m_collisionSoundVolume = value; }
1316 } 1431 }
1317 1432
1433 public float Buoyancy
1434 {
1435 get
1436 {
1437 if (ParentGroup.RootPart == this)
1438 return m_buoyancy;
1439
1440 return ParentGroup.RootPart.Buoyancy;
1441 }
1442 set
1443 {
1444 if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this)
1445 {
1446 ParentGroup.RootPart.Buoyancy = value;
1447 return;
1448 }
1449 m_buoyancy = value;
1450 if (PhysActor != null)
1451 PhysActor.Buoyancy = value;
1452 }
1453 }
1454
1455 public Vector3 Force
1456 {
1457 get
1458 {
1459 if (ParentGroup.RootPart == this)
1460 return m_force;
1461
1462 return ParentGroup.RootPart.Force;
1463 }
1464
1465 set
1466 {
1467 if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this)
1468 {
1469 ParentGroup.RootPart.Force = value;
1470 return;
1471 }
1472 m_force = value;
1473 if (PhysActor != null)
1474 PhysActor.Force = value;
1475 }
1476 }
1477
1478 public Vector3 Torque
1479 {
1480 get
1481 {
1482 if (ParentGroup.RootPart == this)
1483 return m_torque;
1484
1485 return ParentGroup.RootPart.Torque;
1486 }
1487
1488 set
1489 {
1490 if (ParentGroup != null && ParentGroup.RootPart != null && ParentGroup.RootPart != this)
1491 {
1492 ParentGroup.RootPart.Torque = value;
1493 return;
1494 }
1495 m_torque = value;
1496 if (PhysActor != null)
1497 PhysActor.Torque = value;
1498 }
1499 }
1500
1501 public byte Material
1502 {
1503 get { return (byte)m_material; }
1504 set
1505 {
1506 if (value >= 0 && value <= (byte)SOPMaterialData.MaxMaterial)
1507 {
1508 bool update = false;
1509
1510 if (m_material != (Material)value)
1511 {
1512 update = true;
1513 m_material = (Material)value;
1514 }
1515
1516 if (m_friction != SOPMaterialData.friction(m_material))
1517 {
1518 update = true;
1519 m_friction = SOPMaterialData.friction(m_material);
1520 }
1521
1522 if (m_bounce != SOPMaterialData.bounce(m_material))
1523 {
1524 update = true;
1525 m_bounce = SOPMaterialData.bounce(m_material);
1526 }
1527
1528 if (update)
1529 {
1530 if (PhysActor != null)
1531 {
1532 PhysActor.SetMaterial((int)value);
1533 }
1534 if(ParentGroup != null)
1535 ParentGroup.HasGroupChanged = true;
1536 ScheduleFullUpdateIfNone();
1537 UpdatePhysRequired = true;
1538 }
1539 }
1540 }
1541 }
1542
1543 // not a propriety to move to methods place later
1544 private bool HasMesh()
1545 {
1546 if (Shape != null && (Shape.SculptType == (byte)SculptType.Mesh))
1547 return true;
1548 return false;
1549 }
1550
1551 // not a propriety to move to methods place later
1552 public byte DefaultPhysicsShapeType()
1553 {
1554 byte type;
1555
1556 if (Shape != null && (Shape.SculptType == (byte)SculptType.Mesh))
1557 type = (byte)PhysShapeType.convex;
1558 else
1559 type = (byte)PhysShapeType.prim;
1560
1561 return type;
1562 }
1563
1564 [XmlIgnore]
1565 public bool UsesComplexCost
1566 {
1567 get
1568 {
1569 byte pst = PhysicsShapeType;
1570 if(pst == (byte) PhysShapeType.none || pst == (byte) PhysShapeType.convex || HasMesh())
1571 return true;
1572 return false;
1573 }
1574 }
1575
1576 [XmlIgnore]
1577 public float PhysicsCost
1578 {
1579 get
1580 {
1581 if(PhysicsShapeType == (byte)PhysShapeType.none)
1582 return 0;
1583
1584 float cost = 0.1f;
1585 if (PhysActor != null)
1586// cost += PhysActor.Cost;
1587
1588 if ((Flags & PrimFlags.Physics) != 0)
1589 cost *= (1.0f + 0.01333f * Scale.LengthSquared()); // 0.01333 == 0.04/3
1590 return cost;
1591 }
1592 }
1593
1594 [XmlIgnore]
1595 public float StreamingCost
1596 {
1597 get
1598 {
1599
1600
1601 return 0.1f;
1602 }
1603 }
1604
1605 [XmlIgnore]
1606 public float SimulationCost
1607 {
1608 get
1609 {
1610 // ignoring scripts. Don't like considering them for this
1611 if((Flags & PrimFlags.Physics) != 0)
1612 return 1.0f;
1613
1614 return 0.5f;
1615 }
1616 }
1617
1618 public byte PhysicsShapeType
1619 {
1620 get { return m_physicsShapeType; }
1621 set
1622 {
1623 byte oldv = m_physicsShapeType;
1624
1625 if (value >= 0 && value <= (byte)PhysShapeType.convex)
1626 {
1627 if (value == (byte)PhysShapeType.none && ParentGroup != null && ParentGroup.RootPart == this)
1628 m_physicsShapeType = DefaultPhysicsShapeType();
1629 else
1630 m_physicsShapeType = value;
1631 }
1632 else
1633 m_physicsShapeType = DefaultPhysicsShapeType();
1634
1635 if (m_physicsShapeType != oldv && ParentGroup != null)
1636 {
1637 if (m_physicsShapeType == (byte)PhysShapeType.none)
1638 {
1639 if (PhysActor != null)
1640 {
1641 Velocity = new Vector3(0, 0, 0);
1642 Acceleration = new Vector3(0, 0, 0);
1643 if (ParentGroup.RootPart == this)
1644 AngularVelocity = new Vector3(0, 0, 0);
1645 ParentGroup.Scene.RemovePhysicalPrim(1);
1646 RemoveFromPhysics();
1647 }
1648 }
1649 else if (PhysActor == null)
1650 {
1651 ApplyPhysics((uint)Flags, VolumeDetectActive, false);
1652 UpdatePhysicsSubscribedEvents();
1653 }
1654 else
1655 {
1656 PhysActor.PhysicsShapeType = m_physicsShapeType;
1657 if (Shape.SculptEntry)
1658 CheckSculptAndLoad();
1659 }
1660
1661 if (ParentGroup != null)
1662 ParentGroup.HasGroupChanged = true;
1663 }
1664
1665 if (m_physicsShapeType != value)
1666 {
1667 UpdatePhysRequired = true;
1668 }
1669 }
1670 }
1671
1672 public float Density // in kg/m^3
1673 {
1674 get { return m_density; }
1675 set
1676 {
1677 if (value >=1 && value <= 22587.0)
1678 {
1679 m_density = value;
1680 UpdatePhysRequired = true;
1681 }
1682
1683 ScheduleFullUpdateIfNone();
1684
1685 if (ParentGroup != null)
1686 ParentGroup.HasGroupChanged = true;
1687 }
1688 }
1689
1690 public float GravityModifier
1691 {
1692 get { return m_gravitymod; }
1693 set
1694 {
1695 if( value >= -1 && value <=28.0f)
1696 {
1697 m_gravitymod = value;
1698 UpdatePhysRequired = true;
1699 }
1700
1701 ScheduleFullUpdateIfNone();
1702
1703 if (ParentGroup != null)
1704 ParentGroup.HasGroupChanged = true;
1705
1706 }
1707 }
1708
1709 public float Friction
1710 {
1711 get { return m_friction; }
1712 set
1713 {
1714 if (value >= 0 && value <= 255.0f)
1715 {
1716 m_friction = value;
1717 UpdatePhysRequired = true;
1718 }
1719
1720 ScheduleFullUpdateIfNone();
1721
1722 if (ParentGroup != null)
1723 ParentGroup.HasGroupChanged = true;
1724 }
1725 }
1726
1727 public float Bounciness
1728 {
1729 get { return m_bounce; }
1730 set
1731 {
1732 if (value >= 0 && value <= 1.0f)
1733 {
1734 m_bounce = value;
1735 UpdatePhysRequired = true;
1736 }
1737
1738 ScheduleFullUpdateIfNone();
1739
1740 if (ParentGroup != null)
1741 ParentGroup.HasGroupChanged = true;
1742 }
1743 }
1744
1745
1318 #endregion Public Properties with only Get 1746 #endregion Public Properties with only Get
1319 1747
1320 private uint ApplyMask(uint val, bool set, uint mask) 1748 private uint ApplyMask(uint val, bool set, uint mask)
@@ -1460,6 +1888,61 @@ namespace OpenSim.Region.Framework.Scenes
1460 } 1888 }
1461 } 1889 }
1462 1890
1891 // SetVelocity for LSL llSetVelocity.. may need revision if having other uses in future
1892 public void SetVelocity(Vector3 pVel, bool localGlobalTF)
1893 {
1894 if (ParentGroup == null || ParentGroup.IsDeleted)
1895 return;
1896
1897 if (ParentGroup.IsAttachment)
1898 return; // don't work on attachments (for now ??)
1899
1900 SceneObjectPart root = ParentGroup.RootPart;
1901
1902 if (root.VehicleType != (int)Vehicle.TYPE_NONE) // don't mess with vehicles
1903 return;
1904
1905 PhysicsActor pa = root.PhysActor;
1906
1907 if (pa == null || !pa.IsPhysical)
1908 return;
1909
1910 if (localGlobalTF)
1911 {
1912 pVel = pVel * GetWorldRotation();
1913 }
1914
1915 ParentGroup.Velocity = pVel;
1916 }
1917
1918 // SetAngularVelocity for LSL llSetAngularVelocity.. may need revision if having other uses in future
1919 public void SetAngularVelocity(Vector3 pAngVel, bool localGlobalTF)
1920 {
1921 if (ParentGroup == null || ParentGroup.IsDeleted)
1922 return;
1923
1924 if (ParentGroup.IsAttachment)
1925 return; // don't work on attachments (for now ??)
1926
1927 SceneObjectPart root = ParentGroup.RootPart;
1928
1929 if (root.VehicleType != (int)Vehicle.TYPE_NONE) // don't mess with vehicles
1930 return;
1931
1932 PhysicsActor pa = root.PhysActor;
1933
1934 if (pa == null || !pa.IsPhysical)
1935 return;
1936
1937 if (localGlobalTF)
1938 {
1939 pAngVel = pAngVel * GetWorldRotation();
1940 }
1941
1942 root.AngularVelocity = pAngVel;
1943 }
1944
1945
1463 /// <summary> 1946 /// <summary>
1464 /// hook to the physics scene to apply angular impulse 1947 /// hook to the physics scene to apply angular impulse
1465 /// This is sent up to the group, which then finds the root prim 1948 /// This is sent up to the group, which then finds the root prim
@@ -1480,7 +1963,7 @@ namespace OpenSim.Region.Framework.Scenes
1480 impulse = newimpulse; 1963 impulse = newimpulse;
1481 } 1964 }
1482 1965
1483 ParentGroup.applyAngularImpulse(impulse); 1966 ParentGroup.ApplyAngularImpulse(impulse);
1484 } 1967 }
1485 1968
1486 /// <summary> 1969 /// <summary>
@@ -1490,20 +1973,24 @@ namespace OpenSim.Region.Framework.Scenes
1490 /// </summary> 1973 /// </summary>
1491 /// <param name="impulsei">Vector force</param> 1974 /// <param name="impulsei">Vector force</param>
1492 /// <param name="localGlobalTF">true for the local frame, false for the global frame</param> 1975 /// <param name="localGlobalTF">true for the local frame, false for the global frame</param>
1493 public void SetAngularImpulse(Vector3 impulsei, bool localGlobalTF) 1976
1977 // this is actualy Set Torque.. keeping naming so not to edit lslapi also
1978 public void SetAngularImpulse(Vector3 torquei, bool localGlobalTF)
1494 { 1979 {
1495 Vector3 impulse = impulsei; 1980 Vector3 torque = torquei;
1496 1981
1497 if (localGlobalTF) 1982 if (localGlobalTF)
1498 { 1983 {
1984/*
1499 Quaternion grot = GetWorldRotation(); 1985 Quaternion grot = GetWorldRotation();
1500 Quaternion AXgrot = grot; 1986 Quaternion AXgrot = grot;
1501 Vector3 AXimpulsei = impulsei; 1987 Vector3 AXimpulsei = impulsei;
1502 Vector3 newimpulse = AXimpulsei * AXgrot; 1988 Vector3 newimpulse = AXimpulsei * AXgrot;
1503 impulse = newimpulse; 1989 */
1990 torque *= GetWorldRotation();
1504 } 1991 }
1505 1992
1506 ParentGroup.setAngularImpulse(impulse); 1993 Torque = torque;
1507 } 1994 }
1508 1995
1509 /// <summary> 1996 /// <summary>
@@ -1511,17 +1998,23 @@ namespace OpenSim.Region.Framework.Scenes
1511 /// </summary> 1998 /// </summary>
1512 /// <param name="rootObjectFlags"></param> 1999 /// <param name="rootObjectFlags"></param>
1513 /// <param name="VolumeDetectActive"></param> 2000 /// <param name="VolumeDetectActive"></param>
1514 public void ApplyPhysics(uint rootObjectFlags, bool VolumeDetectActive) 2001 /// <param name="building"></param>
2002
2003 public void ApplyPhysics(uint _ObjectFlags, bool _VolumeDetectActive, bool building)
1515 { 2004 {
2005 VolumeDetectActive = _VolumeDetectActive;
2006
1516 if (!ParentGroup.Scene.CollidablePrims) 2007 if (!ParentGroup.Scene.CollidablePrims)
1517 return; 2008 return;
1518 2009
1519// m_log.DebugFormat( 2010 if (PhysicsShapeType == (byte)PhysShapeType.none)
1520// "[SCENE OBJECT PART]: Applying physics to {0} {1}, m_physicalPrim {2}", 2011 return;
1521// Name, LocalId, UUID, m_physicalPrim); 2012
2013 bool isPhysical = (_ObjectFlags & (uint) PrimFlags.Physics) != 0;
2014 bool isPhantom = (_ObjectFlags & (uint)PrimFlags.Phantom) != 0;
1522 2015
1523 bool isPhysical = (rootObjectFlags & (uint) PrimFlags.Physics) != 0; 2016 if (_VolumeDetectActive)
1524 bool isPhantom = (rootObjectFlags & (uint) PrimFlags.Phantom) != 0; 2017 isPhantom = true;
1525 2018
1526 if (IsJoint()) 2019 if (IsJoint())
1527 { 2020 {
@@ -1529,22 +2022,14 @@ namespace OpenSim.Region.Framework.Scenes
1529 } 2022 }
1530 else 2023 else
1531 { 2024 {
1532 // Special case for VolumeDetection: If VolumeDetection is set, the phantom flag is locally ignored 2025 if ((!isPhantom || isPhysical || _VolumeDetectActive) && !ParentGroup.IsAttachment
1533 if (VolumeDetectActive) 2026 && !(Shape.PathCurve == (byte)Extrusion.Flexible))
1534 isPhantom = false;
1535
1536 // The only time the physics scene shouldn't know about the prim is if it's phantom or an attachment, which is phantom by definition
1537 // or flexible
1538 if (!isPhantom && !ParentGroup.IsAttachment && !(Shape.PathCurve == (byte)Extrusion.Flexible))
1539 { 2027 {
1540 // Added clarification.. since A rigid body is an object that you can kick around, etc. 2028 AddToPhysics(isPhysical, isPhantom, building, isPhysical);
1541 bool rigidBody = isPhysical && !isPhantom; 2029 UpdatePhysicsSubscribedEvents(); // not sure if appliable here
1542
1543 PhysicsActor pa = AddToPhysics(rigidBody);
1544
1545 if (pa != null)
1546 pa.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
1547 } 2030 }
2031 else
2032 PhysActor = null; // just to be sure
1548 } 2033 }
1549 } 2034 }
1550 2035
@@ -1596,6 +2081,12 @@ namespace OpenSim.Region.Framework.Scenes
1596 dupe.Category = Category; 2081 dupe.Category = Category;
1597 dupe.m_rezzed = m_rezzed; 2082 dupe.m_rezzed = m_rezzed;
1598 2083
2084 dupe.m_UndoRedo = null;
2085 dupe.m_isSelected = false;
2086
2087 dupe.IgnoreUndoUpdate = false;
2088 dupe.Undoing = false;
2089
1599 dupe.m_inventory = new SceneObjectPartInventory(dupe); 2090 dupe.m_inventory = new SceneObjectPartInventory(dupe);
1600 dupe.m_inventory.Items = (TaskInventoryDictionary)m_inventory.Items.Clone(); 2091 dupe.m_inventory.Items = (TaskInventoryDictionary)m_inventory.Items.Clone();
1601 2092
@@ -1611,6 +2102,7 @@ namespace OpenSim.Region.Framework.Scenes
1611 2102
1612 // Move afterwards ResetIDs as it clears the localID 2103 // Move afterwards ResetIDs as it clears the localID
1613 dupe.LocalId = localID; 2104 dupe.LocalId = localID;
2105
1614 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. 2106 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated.
1615 dupe.LastOwnerID = OwnerID; 2107 dupe.LastOwnerID = OwnerID;
1616 2108
@@ -1628,8 +2120,12 @@ namespace OpenSim.Region.Framework.Scenes
1628 2120
1629 bool UsePhysics = ((dupe.Flags & PrimFlags.Physics) != 0); 2121 bool UsePhysics = ((dupe.Flags & PrimFlags.Physics) != 0);
1630 dupe.DoPhysicsPropertyUpdate(UsePhysics, true); 2122 dupe.DoPhysicsPropertyUpdate(UsePhysics, true);
2123// dupe.UpdatePhysicsSubscribedEvents(); // not sure...
1631 } 2124 }
1632 2125
2126 if (dupe.PhysActor != null)
2127 dupe.PhysActor.LocalID = localID;
2128
1633 ParentGroup.Scene.EventManager.TriggerOnSceneObjectPartCopy(dupe, this, userExposed); 2129 ParentGroup.Scene.EventManager.TriggerOnSceneObjectPartCopy(dupe, this, userExposed);
1634 2130
1635// m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID); 2131// m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID);
@@ -1749,6 +2245,7 @@ namespace OpenSim.Region.Framework.Scenes
1749 2245
1750 /// <summary> 2246 /// <summary>
1751 /// Do a physics propery update for this part. 2247 /// Do a physics propery update for this part.
2248 /// now also updates phantom and volume detector
1752 /// </summary> 2249 /// </summary>
1753 /// <param name="UsePhysics"></param> 2250 /// <param name="UsePhysics"></param>
1754 /// <param name="isNew"></param> 2251 /// <param name="isNew"></param>
@@ -1774,61 +2271,69 @@ namespace OpenSim.Region.Framework.Scenes
1774 { 2271 {
1775 if (pa.IsPhysical) // implies UsePhysics==false for this block 2272 if (pa.IsPhysical) // implies UsePhysics==false for this block
1776 { 2273 {
1777 if (!isNew) 2274 if (!isNew) // implies UsePhysics==false for this block
2275 {
1778 ParentGroup.Scene.RemovePhysicalPrim(1); 2276 ParentGroup.Scene.RemovePhysicalPrim(1);
1779 2277
1780 pa.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate; 2278 Velocity = new Vector3(0, 0, 0);
1781 pa.OnOutOfBounds -= PhysicsOutOfBounds; 2279 Acceleration = new Vector3(0, 0, 0);
1782 pa.delink(); 2280 if (ParentGroup.RootPart == this)
2281 AngularVelocity = new Vector3(0, 0, 0);
1783 2282
1784 if (ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints && (!isNew)) 2283 if (pa.Phantom && !VolumeDetectActive)
1785 { 2284 {
1786 // destroy all joints connected to this now deactivated body 2285 RemoveFromPhysics();
1787 ParentGroup.Scene.PhysicsScene.RemoveAllJointsConnectedToActorThreadLocked(pa); 2286 return;
1788 } 2287 }
1789 2288
1790 // stop client-side interpolation of all joint proxy objects that have just been deleted 2289 pa.IsPhysical = UsePhysics;
1791 // this is done because RemoveAllJointsConnectedToActor invokes the OnJointDeactivated callback, 2290 pa.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate;
1792 // which stops client-side interpolation of deactivated joint proxy objects. 2291 pa.OnOutOfBounds -= PhysicsOutOfBounds;
2292 pa.delink();
2293 if (ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
2294 {
2295 // destroy all joints connected to this now deactivated body
2296 ParentGroup.Scene.PhysicsScene.RemoveAllJointsConnectedToActorThreadLocked(pa);
2297 }
2298 }
1793 } 2299 }
1794 2300
1795 if (!UsePhysics && !isNew) 2301 if (pa.IsPhysical != UsePhysics)
1796 { 2302 pa.IsPhysical = UsePhysics;
1797 // reset velocity to 0 on physics switch-off. Without that, the client thinks the
1798 // prim still has velocity and continues to interpolate its position along the old
1799 // velocity-vector.
1800 Velocity = new Vector3(0, 0, 0);
1801 Acceleration = new Vector3(0, 0, 0);
1802 AngularVelocity = new Vector3(0, 0, 0);
1803 //RotationalVelocity = new Vector3(0, 0, 0);
1804 }
1805 2303
1806 pa.IsPhysical = UsePhysics; 2304 if (UsePhysics)
2305 {
2306 if (ParentGroup.RootPart.KeyframeMotion != null)
2307 ParentGroup.RootPart.KeyframeMotion.Stop();
2308 ParentGroup.RootPart.KeyframeMotion = null;
2309 ParentGroup.Scene.AddPhysicalPrim(1);
1807 2310
1808 // If we're not what we're supposed to be in the physics scene, recreate ourselves. 2311 PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
1809 //m_parentGroup.Scene.PhysicsScene.RemovePrim(PhysActor); 2312 PhysActor.OnOutOfBounds += PhysicsOutOfBounds;
1810 /// that's not wholesome. Had to make Scene public
1811 //PhysActor = null;
1812 2313
1813 if ((Flags & PrimFlags.Phantom) == 0) 2314 if (ParentID != 0 && ParentID != LocalId)
1814 {
1815 if (UsePhysics)
1816 { 2315 {
1817 ParentGroup.Scene.AddPhysicalPrim(1); 2316 PhysicsActor parentPa = ParentGroup.RootPart.PhysActor;
1818 2317
1819 pa.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate; 2318 if (parentPa != null)
1820 pa.OnOutOfBounds += PhysicsOutOfBounds;
1821 if (ParentID != 0 && ParentID != LocalId)
1822 { 2319 {
1823 PhysicsActor parentPa = ParentGroup.RootPart.PhysActor; 2320 pa.link(parentPa);
1824
1825 if (parentPa != null)
1826 {
1827 pa.link(parentPa);
1828 }
1829 } 2321 }
1830 } 2322 }
1831 } 2323 }
2324 }
2325
2326 bool phan = ((Flags & PrimFlags.Phantom) != 0);
2327 if (pa.Phantom != phan)
2328 pa.Phantom = phan;
2329
2330// some engines dont' have this check still
2331// if (VolumeDetectActive != pa.IsVolumeDtc)
2332 {
2333 if (VolumeDetectActive)
2334 pa.SetVolumeDetect(1);
2335 else
2336 pa.SetVolumeDetect(0);
1832 } 2337 }
1833 2338
1834 // If this part is a sculpt then delay the physics update until we've asynchronously loaded the 2339 // If this part is a sculpt then delay the physics update until we've asynchronously loaded the
@@ -1947,12 +2452,26 @@ namespace OpenSim.Region.Framework.Scenes
1947 2452
1948 public Vector3 GetGeometricCenter() 2453 public Vector3 GetGeometricCenter()
1949 { 2454 {
1950 PhysicsActor pa = PhysActor; 2455 // this is not real geometric center but a average of positions relative to root prim acording to
1951 2456 // http://wiki.secondlife.com/wiki/llGetGeometricCenter
1952 if (pa != null) 2457 // ignoring tortured prims details since sl also seems to ignore
1953 return new Vector3(pa.CenterOfMass.X, pa.CenterOfMass.Y, pa.CenterOfMass.Z); 2458 // so no real use in doing it on physics
1954 else 2459 if (ParentGroup.IsDeleted)
1955 return new Vector3(0, 0, 0); 2460 return new Vector3(0, 0, 0);
2461
2462 return ParentGroup.GetGeometricCenter();
2463
2464 /*
2465 PhysicsActor pa = PhysActor;
2466
2467 if (pa != null)
2468 {
2469 Vector3 vtmp = pa.CenterOfMass;
2470 return vtmp;
2471 }
2472 else
2473 return new Vector3(0, 0, 0);
2474 */
1956 } 2475 }
1957 2476
1958 public float GetMass() 2477 public float GetMass()
@@ -1965,14 +2484,43 @@ namespace OpenSim.Region.Framework.Scenes
1965 return 0; 2484 return 0;
1966 } 2485 }
1967 2486
1968 public Vector3 GetForce() 2487 public Vector3 GetCenterOfMass()
1969 { 2488 {
2489 if (ParentGroup.RootPart == this)
2490 {
2491 if (ParentGroup.IsDeleted)
2492 return AbsolutePosition;
2493 return ParentGroup.GetCenterOfMass();
2494 }
2495
1970 PhysicsActor pa = PhysActor; 2496 PhysicsActor pa = PhysActor;
1971 2497
1972 if (pa != null) 2498 if (pa != null)
1973 return pa.Force; 2499 {
2500 Vector3 tmp = pa.CenterOfMass;
2501 return tmp;
2502 }
2503 else
2504 return AbsolutePosition;
2505 }
2506
2507 public Vector3 GetPartCenterOfMass()
2508 {
2509 PhysicsActor pa = PhysActor;
2510
2511 if (pa != null)
2512 {
2513 Vector3 tmp = pa.CenterOfMass;
2514 return tmp;
2515 }
1974 else 2516 else
1975 return Vector3.Zero; 2517 return AbsolutePosition;
2518 }
2519
2520
2521 public Vector3 GetForce()
2522 {
2523 return Force;
1976 } 2524 }
1977 2525
1978 /// <summary> 2526 /// <summary>
@@ -2187,15 +2735,25 @@ namespace OpenSim.Region.Framework.Scenes
2187 2735
2188 private void SendLandCollisionEvent(scriptEvents ev, ScriptCollidingNotification notify) 2736 private void SendLandCollisionEvent(scriptEvents ev, ScriptCollidingNotification notify)
2189 { 2737 {
2190 if ((ParentGroup.RootPart.ScriptEvents & ev) != 0) 2738 bool sendToRoot = true;
2191 { 2739
2192 ColliderArgs LandCollidingMessage = new ColliderArgs(); 2740 ColliderArgs LandCollidingMessage = new ColliderArgs();
2193 List<DetectedObject> colliding = new List<DetectedObject>(); 2741 List<DetectedObject> colliding = new List<DetectedObject>();
2194 2742
2195 colliding.Add(CreateDetObjectForGround()); 2743 colliding.Add(CreateDetObjectForGround());
2196 LandCollidingMessage.Colliders = colliding; 2744 LandCollidingMessage.Colliders = colliding;
2197 2745
2746 if (Inventory.ContainsScripts())
2747 {
2748 if (!PassCollisions)
2749 sendToRoot = false;
2750 }
2751 if ((ScriptEvents & ev) != 0)
2198 notify(LocalId, LandCollidingMessage); 2752 notify(LocalId, LandCollidingMessage);
2753
2754 if ((ParentGroup.RootPart.ScriptEvents & ev) != 0 && sendToRoot)
2755 {
2756 notify(ParentGroup.RootPart.LocalId, LandCollidingMessage);
2199 } 2757 }
2200 } 2758 }
2201 2759
@@ -2211,45 +2769,87 @@ namespace OpenSim.Region.Framework.Scenes
2211 List<uint> endedColliders = new List<uint>(); 2769 List<uint> endedColliders = new List<uint>();
2212 List<uint> startedColliders = new List<uint>(); 2770 List<uint> startedColliders = new List<uint>();
2213 2771
2214 // calculate things that started colliding this time 2772 if (collissionswith.Count == 0)
2215 // and build up list of colliders this time
2216 foreach (uint localid in collissionswith.Keys)
2217 { 2773 {
2218 thisHitColliders.Add(localid); 2774 if (m_lastColliders.Count == 0)
2219 if (!m_lastColliders.Contains(localid)) 2775 return; // nothing to do
2220 startedColliders.Add(localid);
2221 }
2222 2776
2223 // calculate things that ended colliding 2777 foreach (uint localID in m_lastColliders)
2224 foreach (uint localID in m_lastColliders) 2778 {
2225 {
2226 if (!thisHitColliders.Contains(localID))
2227 endedColliders.Add(localID); 2779 endedColliders.Add(localID);
2780 }
2781 m_lastColliders.Clear();
2228 } 2782 }
2229 2783
2230 //add the items that started colliding this time to the last colliders list. 2784 else
2231 foreach (uint localID in startedColliders) 2785 {
2232 m_lastColliders.Add(localID); 2786 List<CollisionForSoundInfo> soundinfolist = new List<CollisionForSoundInfo>();
2787
2788 // calculate things that started colliding this time
2789 // and build up list of colliders this time
2790 if (!VolumeDetectActive && CollisionSoundType >= 0)
2791 {
2792 CollisionForSoundInfo soundinfo;
2793 ContactPoint curcontact;
2794
2795 foreach (uint id in collissionswith.Keys)
2796 {
2797 thisHitColliders.Add(id);
2798 if (!m_lastColliders.Contains(id))
2799 {
2800 startedColliders.Add(id);
2801
2802 curcontact = collissionswith[id];
2803 if (Math.Abs(curcontact.RelativeSpeed) > 0.2)
2804 {
2805 soundinfo = new CollisionForSoundInfo();
2806 soundinfo.colliderID = id;
2807 soundinfo.position = curcontact.Position;
2808 soundinfo.relativeVel = curcontact.RelativeSpeed;
2809 soundinfolist.Add(soundinfo);
2810 }
2811 }
2812 }
2813 }
2814 else
2815 {
2816 foreach (uint id in collissionswith.Keys)
2817 {
2818 thisHitColliders.Add(id);
2819 if (!m_lastColliders.Contains(id))
2820 startedColliders.Add(id);
2821 }
2822 }
2823
2824 // calculate things that ended colliding
2825 foreach (uint localID in m_lastColliders)
2826 {
2827 if (!thisHitColliders.Contains(localID))
2828 endedColliders.Add(localID);
2829 }
2830
2831 //add the items that started colliding this time to the last colliders list.
2832 foreach (uint localID in startedColliders)
2833 m_lastColliders.Add(localID);
2233 2834
2234 // remove things that ended colliding from the last colliders list 2835 // remove things that ended colliding from the last colliders list
2235 foreach (uint localID in endedColliders) 2836 foreach (uint localID in endedColliders)
2236 m_lastColliders.Remove(localID); 2837 m_lastColliders.Remove(localID);
2237 2838
2238 // play the sound. 2839 // play sounds.
2239 if (startedColliders.Count > 0 && CollisionSound != UUID.Zero && CollisionSoundVolume > 0.0f) 2840 if (soundinfolist.Count > 0)
2240 SendSound(CollisionSound.ToString(), CollisionSoundVolume, true, (byte)0, 0, false, false); 2841 CollisionSounds.PartCollisionSound(this, soundinfolist);
2842 }
2241 2843
2242 SendCollisionEvent(scriptEvents.collision_start, startedColliders, ParentGroup.Scene.EventManager.TriggerScriptCollidingStart); 2844 SendCollisionEvent(scriptEvents.collision_start, startedColliders, ParentGroup.Scene.EventManager.TriggerScriptCollidingStart);
2243 SendCollisionEvent(scriptEvents.collision , m_lastColliders , ParentGroup.Scene.EventManager.TriggerScriptColliding); 2845 if (!VolumeDetectActive)
2846 SendCollisionEvent(scriptEvents.collision , m_lastColliders , ParentGroup.Scene.EventManager.TriggerScriptColliding);
2244 SendCollisionEvent(scriptEvents.collision_end , endedColliders , ParentGroup.Scene.EventManager.TriggerScriptCollidingEnd); 2847 SendCollisionEvent(scriptEvents.collision_end , endedColliders , ParentGroup.Scene.EventManager.TriggerScriptCollidingEnd);
2245 2848
2246 if (startedColliders.Contains(0)) 2849 if (startedColliders.Contains(0))
2247 { 2850 SendLandCollisionEvent(scriptEvents.land_collision_start, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingStart);
2248 if (m_lastColliders.Contains(0)) 2851 if (m_lastColliders.Contains(0))
2249 SendLandCollisionEvent(scriptEvents.land_collision, ParentGroup.Scene.EventManager.TriggerScriptLandColliding); 2852 SendLandCollisionEvent(scriptEvents.land_collision, ParentGroup.Scene.EventManager.TriggerScriptLandColliding);
2250 else
2251 SendLandCollisionEvent(scriptEvents.land_collision_start, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingStart);
2252 }
2253 if (endedColliders.Contains(0)) 2853 if (endedColliders.Contains(0))
2254 SendLandCollisionEvent(scriptEvents.land_collision_end, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingEnd); 2854 SendLandCollisionEvent(scriptEvents.land_collision_end, ParentGroup.Scene.EventManager.TriggerScriptLandCollidingEnd);
2255 } 2855 }
@@ -2272,9 +2872,9 @@ namespace OpenSim.Region.Framework.Scenes
2272 Vector3 newpos = new Vector3(pa.Position.GetBytes(), 0); 2872 Vector3 newpos = new Vector3(pa.Position.GetBytes(), 0);
2273 2873
2274 if (ParentGroup.Scene.TestBorderCross(newpos, Cardinals.N) 2874 if (ParentGroup.Scene.TestBorderCross(newpos, Cardinals.N)
2275 | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.S) 2875 || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.S)
2276 | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.E) 2876 || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.E)
2277 | ParentGroup.Scene.TestBorderCross(newpos, Cardinals.W)) 2877 || ParentGroup.Scene.TestBorderCross(newpos, Cardinals.W))
2278 { 2878 {
2279 ParentGroup.AbsolutePosition = newpos; 2879 ParentGroup.AbsolutePosition = newpos;
2280 return; 2880 return;
@@ -2296,17 +2896,18 @@ namespace OpenSim.Region.Framework.Scenes
2296 //Trys to fetch sound id from prim's inventory. 2896 //Trys to fetch sound id from prim's inventory.
2297 //Prim's inventory doesn't support non script items yet 2897 //Prim's inventory doesn't support non script items yet
2298 2898
2299 lock (TaskInventory) 2899 TaskInventory.LockItemsForRead(true);
2900
2901 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
2300 { 2902 {
2301 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 2903 if (item.Value.Name == sound)
2302 { 2904 {
2303 if (item.Value.Name == sound) 2905 soundID = item.Value.ItemID;
2304 { 2906 break;
2305 soundID = item.Value.ItemID;
2306 break;
2307 }
2308 } 2907 }
2309 } 2908 }
2909
2910 TaskInventory.LockItemsForRead(false);
2310 } 2911 }
2311 2912
2312 ParentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp) 2913 ParentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
@@ -2428,6 +3029,19 @@ namespace OpenSim.Region.Framework.Scenes
2428 APIDTarget = Quaternion.Identity; 3029 APIDTarget = Quaternion.Identity;
2429 } 3030 }
2430 3031
3032
3033
3034 public void ScheduleFullUpdateIfNone()
3035 {
3036 if (ParentGroup == null)
3037 return;
3038
3039// ??? ParentGroup.HasGroupChanged = true;
3040
3041 if (UpdateFlag != UpdateRequired.FULL)
3042 ScheduleFullUpdate();
3043 }
3044
2431 /// <summary> 3045 /// <summary>
2432 /// Schedules this prim for a full update 3046 /// Schedules this prim for a full update
2433 /// </summary> 3047 /// </summary>
@@ -2630,8 +3244,8 @@ namespace OpenSim.Region.Framework.Scenes
2630 { 3244 {
2631 const float ROTATION_TOLERANCE = 0.01f; 3245 const float ROTATION_TOLERANCE = 0.01f;
2632 const float VELOCITY_TOLERANCE = 0.001f; 3246 const float VELOCITY_TOLERANCE = 0.001f;
2633 const float POSITION_TOLERANCE = 0.05f; 3247 const float POSITION_TOLERANCE = 0.05f; // I don't like this, but I suppose it's necessary
2634 const int TIME_MS_TOLERANCE = 3000; 3248 const int TIME_MS_TOLERANCE = 200; //llSetPos has a 200ms delay. This should NOT be 3 seconds.
2635 3249
2636 switch (UpdateFlag) 3250 switch (UpdateFlag)
2637 { 3251 {
@@ -2693,17 +3307,16 @@ namespace OpenSim.Region.Framework.Scenes
2693 if (!UUID.TryParse(sound, out soundID)) 3307 if (!UUID.TryParse(sound, out soundID))
2694 { 3308 {
2695 // search sound file from inventory 3309 // search sound file from inventory
2696 lock (TaskInventory) 3310 TaskInventory.LockItemsForRead(true);
3311 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
2697 { 3312 {
2698 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 3313 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound)
2699 { 3314 {
2700 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound) 3315 soundID = item.Value.ItemID;
2701 { 3316 break;
2702 soundID = item.Value.ItemID;
2703 break;
2704 }
2705 } 3317 }
2706 } 3318 }
3319 TaskInventory.LockItemsForRead(false);
2707 } 3320 }
2708 3321
2709 if (soundID == UUID.Zero) 3322 if (soundID == UUID.Zero)
@@ -2760,6 +3373,35 @@ namespace OpenSim.Region.Framework.Scenes
2760 } 3373 }
2761 } 3374 }
2762 3375
3376 public void SendCollisionSound(UUID soundID, double volume, Vector3 position)
3377 {
3378 if (soundID == UUID.Zero)
3379 return;
3380
3381 ISoundModule soundModule = ParentGroup.Scene.RequestModuleInterface<ISoundModule>();
3382 if (soundModule == null)
3383 return;
3384
3385 if (volume > 1)
3386 volume = 1;
3387 if (volume < 0)
3388 volume = 0;
3389
3390 int now = Util.EnvironmentTickCount();
3391 if(Util.EnvironmentTickCountSubtract(now,LastColSoundSentTime) <200)
3392 return;
3393
3394 LastColSoundSentTime = now;
3395
3396 UUID ownerID = OwnerID;
3397 UUID objectID = ParentGroup.RootPart.UUID;
3398 UUID parentID = ParentGroup.UUID;
3399 ulong regionHandle = ParentGroup.Scene.RegionInfo.RegionHandle;
3400
3401 soundModule.TriggerSound(soundID, ownerID, objectID, parentID, volume, position, regionHandle, 0 );
3402 }
3403
3404
2763 /// <summary> 3405 /// <summary>
2764 /// Send a terse update to all clients 3406 /// Send a terse update to all clients
2765 /// </summary> 3407 /// </summary>
@@ -2788,10 +3430,13 @@ namespace OpenSim.Region.Framework.Scenes
2788 3430
2789 public void SetBuoyancy(float fvalue) 3431 public void SetBuoyancy(float fvalue)
2790 { 3432 {
2791 PhysicsActor pa = PhysActor; 3433 Buoyancy = fvalue;
2792 3434/*
2793 if (pa != null) 3435 if (PhysActor != null)
2794 pa.Buoyancy = fvalue; 3436 {
3437 PhysActor.Buoyancy = fvalue;
3438 }
3439 */
2795 } 3440 }
2796 3441
2797 public void SetDieAtEdge(bool p) 3442 public void SetDieAtEdge(bool p)
@@ -2807,47 +3452,111 @@ namespace OpenSim.Region.Framework.Scenes
2807 PhysicsActor pa = PhysActor; 3452 PhysicsActor pa = PhysActor;
2808 3453
2809 if (pa != null) 3454 if (pa != null)
2810 pa.FloatOnWater = floatYN == 1; 3455 pa.FloatOnWater = (floatYN == 1);
2811 } 3456 }
2812 3457
2813 public void SetForce(Vector3 force) 3458 public void SetForce(Vector3 force)
2814 { 3459 {
2815 PhysicsActor pa = PhysActor; 3460 Force = force;
3461 }
2816 3462
2817 if (pa != null) 3463 public SOPVehicle VehicleParams
2818 pa.Force = force; 3464 {
3465 get
3466 {
3467 return m_vehicleParams;
3468 }
3469 set
3470 {
3471 m_vehicleParams = value;
3472 }
3473 }
3474
3475
3476 public int VehicleType
3477 {
3478 get
3479 {
3480 if (m_vehicleParams == null)
3481 return (int)Vehicle.TYPE_NONE;
3482 else
3483 return (int)m_vehicleParams.Type;
3484 }
3485 set
3486 {
3487 SetVehicleType(value);
3488 }
2819 } 3489 }
2820 3490
2821 public void SetVehicleType(int type) 3491 public void SetVehicleType(int type)
2822 { 3492 {
2823 PhysicsActor pa = PhysActor; 3493 m_vehicleParams = null;
3494
3495 if (type == (int)Vehicle.TYPE_NONE)
3496 {
3497 if (_parentID ==0 && PhysActor != null)
3498 PhysActor.VehicleType = (int)Vehicle.TYPE_NONE;
3499 return;
3500 }
3501 m_vehicleParams = new SOPVehicle();
3502 m_vehicleParams.ProcessTypeChange((Vehicle)type);
3503 {
3504 if (_parentID ==0 && PhysActor != null)
3505 PhysActor.VehicleType = type;
3506 return;
3507 }
3508 }
2824 3509
2825 if (pa != null) 3510 public void SetVehicleFlags(int param, bool remove)
2826 pa.VehicleType = type; 3511 {
3512 if (m_vehicleParams == null)
3513 return;
3514
3515 m_vehicleParams.ProcessVehicleFlags(param, remove);
3516
3517 if (_parentID ==0 && PhysActor != null)
3518 {
3519 PhysActor.VehicleFlags(param, remove);
3520 }
2827 } 3521 }
2828 3522
2829 public void SetVehicleFloatParam(int param, float value) 3523 public void SetVehicleFloatParam(int param, float value)
2830 { 3524 {
2831 PhysicsActor pa = PhysActor; 3525 if (m_vehicleParams == null)
3526 return;
2832 3527
2833 if (pa != null) 3528 m_vehicleParams.ProcessFloatVehicleParam((Vehicle)param, value);
2834 pa.VehicleFloatParam(param, value); 3529
3530 if (_parentID == 0 && PhysActor != null)
3531 {
3532 PhysActor.VehicleFloatParam(param, value);
3533 }
2835 } 3534 }
2836 3535
2837 public void SetVehicleVectorParam(int param, Vector3 value) 3536 public void SetVehicleVectorParam(int param, Vector3 value)
2838 { 3537 {
2839 PhysicsActor pa = PhysActor; 3538 if (m_vehicleParams == null)
3539 return;
2840 3540
2841 if (pa != null) 3541 m_vehicleParams.ProcessVectorVehicleParam((Vehicle)param, value);
2842 pa.VehicleVectorParam(param, value); 3542
3543 if (_parentID == 0 && PhysActor != null)
3544 {
3545 PhysActor.VehicleVectorParam(param, value);
3546 }
2843 } 3547 }
2844 3548
2845 public void SetVehicleRotationParam(int param, Quaternion rotation) 3549 public void SetVehicleRotationParam(int param, Quaternion rotation)
2846 { 3550 {
2847 PhysicsActor pa = PhysActor; 3551 if (m_vehicleParams == null)
3552 return;
2848 3553
2849 if (pa != null) 3554 m_vehicleParams.ProcessRotationVehicleParam((Vehicle)param, rotation);
2850 pa.VehicleRotationParam(param, rotation); 3555
3556 if (_parentID == 0 && PhysActor != null)
3557 {
3558 PhysActor.VehicleRotationParam(param, rotation);
3559 }
2851 } 3560 }
2852 3561
2853 /// <summary> 3562 /// <summary>
@@ -3048,14 +3757,6 @@ namespace OpenSim.Region.Framework.Scenes
3048 hasProfileCut = hasDimple; // is it the same thing? 3757 hasProfileCut = hasDimple; // is it the same thing?
3049 } 3758 }
3050 3759
3051 public void SetVehicleFlags(int param, bool remove)
3052 {
3053 PhysicsActor pa = PhysActor;
3054
3055 if (pa != null)
3056 pa.VehicleFlags(param, remove);
3057 }
3058
3059 public void SetGroup(UUID groupID, IClientAPI client) 3760 public void SetGroup(UUID groupID, IClientAPI client)
3060 { 3761 {
3061 // Scene.AddNewPrims() calls with client == null so can't use this. 3762 // Scene.AddNewPrims() calls with client == null so can't use this.
@@ -3159,68 +3860,18 @@ namespace OpenSim.Region.Framework.Scenes
3159 //ParentGroup.ScheduleGroupForFullUpdate(); 3860 //ParentGroup.ScheduleGroupForFullUpdate();
3160 } 3861 }
3161 3862
3162 public void StoreUndoState() 3863 public void StoreUndoState(ObjectChangeType change)
3163 { 3864 {
3164 StoreUndoState(false); 3865 if (m_UndoRedo == null)
3165 } 3866 m_UndoRedo = new UndoRedoState(5);
3166 3867
3167 public void StoreUndoState(bool forGroup) 3868 lock (m_UndoRedo)
3168 {
3169 if (!Undoing)
3170 { 3869 {
3171 if (!IgnoreUndoUpdate) 3870 if (!Undoing && !IgnoreUndoUpdate && ParentGroup != null) // just to read better - undo is in progress, or suspended
3172 { 3871 {
3173 if (ParentGroup != null) 3872 m_UndoRedo.StoreUndo(this, change);
3174 {
3175 lock (m_undo)
3176 {
3177 if (m_undo.Count > 0)
3178 {
3179 UndoState last = m_undo.Peek();
3180 if (last != null)
3181 {
3182 // TODO: May need to fix for group comparison
3183 if (last.Compare(this))
3184 {
3185 // m_log.DebugFormat(
3186 // "[SCENE OBJECT PART]: Not storing undo for {0} {1} since current state is same as last undo state, initial stack size {2}",
3187 // Name, LocalId, m_undo.Count);
3188
3189 return;
3190 }
3191 }
3192 }
3193
3194 // m_log.DebugFormat(
3195 // "[SCENE OBJECT PART]: Storing undo state for {0} {1}, forGroup {2}, initial stack size {3}",
3196 // Name, LocalId, forGroup, m_undo.Count);
3197
3198 if (ParentGroup.GetSceneMaxUndo() > 0)
3199 {
3200 UndoState nUndo = new UndoState(this, forGroup);
3201
3202 m_undo.Push(nUndo);
3203
3204 if (m_redo.Count > 0)
3205 m_redo.Clear();
3206
3207 // m_log.DebugFormat(
3208 // "[SCENE OBJECT PART]: Stored undo state for {0} {1}, forGroup {2}, stack size now {3}",
3209 // Name, LocalId, forGroup, m_undo.Count);
3210 }
3211 }
3212 }
3213 } 3873 }
3214// else
3215// {
3216// m_log.DebugFormat("[SCENE OBJECT PART]: Ignoring undo store for {0} {1}", Name, LocalId);
3217// }
3218 } 3874 }
3219// else
3220// {
3221// m_log.DebugFormat(
3222// "[SCENE OBJECT PART]: Ignoring undo store for {0} {1} since already undoing", Name, LocalId);
3223// }
3224 } 3875 }
3225 3876
3226 /// <summary> 3877 /// <summary>
@@ -3230,84 +3881,46 @@ namespace OpenSim.Region.Framework.Scenes
3230 { 3881 {
3231 get 3882 get
3232 { 3883 {
3233 lock (m_undo) 3884 if (m_UndoRedo == null)
3234 return m_undo.Count; 3885 return 0;
3886 return m_UndoRedo.Count;
3235 } 3887 }
3236 } 3888 }
3237 3889
3238 public void Undo() 3890 public void Undo()
3239 { 3891 {
3240 lock (m_undo) 3892 if (m_UndoRedo == null || Undoing || ParentGroup == null)
3241 { 3893 return;
3242// m_log.DebugFormat(
3243// "[SCENE OBJECT PART]: Handling undo request for {0} {1}, stack size {2}",
3244// Name, LocalId, m_undo.Count);
3245
3246 if (m_undo.Count > 0)
3247 {
3248 UndoState goback = m_undo.Pop();
3249
3250 if (goback != null)
3251 {
3252 UndoState nUndo = null;
3253
3254 if (ParentGroup.GetSceneMaxUndo() > 0)
3255 {
3256 nUndo = new UndoState(this, goback.ForGroup);
3257 }
3258
3259 goback.PlaybackState(this);
3260
3261 if (nUndo != null)
3262 m_redo.Push(nUndo);
3263 }
3264 }
3265 3894
3266// m_log.DebugFormat( 3895 lock (m_UndoRedo)
3267// "[SCENE OBJECT PART]: Handled undo request for {0} {1}, stack size now {2}", 3896 {
3268// Name, LocalId, m_undo.Count); 3897 Undoing = true;
3898 m_UndoRedo.Undo(this);
3899 Undoing = false;
3269 } 3900 }
3270 } 3901 }
3271 3902
3272 public void Redo() 3903 public void Redo()
3273 { 3904 {
3274 lock (m_undo) 3905 if (m_UndoRedo == null || Undoing || ParentGroup == null)
3275 { 3906 return;
3276// m_log.DebugFormat(
3277// "[SCENE OBJECT PART]: Handling redo request for {0} {1}, stack size {2}",
3278// Name, LocalId, m_redo.Count);
3279
3280 if (m_redo.Count > 0)
3281 {
3282 UndoState gofwd = m_redo.Pop();
3283
3284 if (gofwd != null)
3285 {
3286 if (ParentGroup.GetSceneMaxUndo() > 0)
3287 {
3288 UndoState nUndo = new UndoState(this, gofwd.ForGroup);
3289
3290 m_undo.Push(nUndo);
3291 }
3292
3293 gofwd.PlayfwdState(this);
3294 }
3295 3907
3296// m_log.DebugFormat( 3908 lock (m_UndoRedo)
3297// "[SCENE OBJECT PART]: Handled redo request for {0} {1}, stack size now {2}", 3909 {
3298// Name, LocalId, m_redo.Count); 3910 Undoing = true;
3299 } 3911 m_UndoRedo.Redo(this);
3912 Undoing = false;
3300 } 3913 }
3301 } 3914 }
3302 3915
3303 public void ClearUndoState() 3916 public void ClearUndoState()
3304 { 3917 {
3305// m_log.DebugFormat("[SCENE OBJECT PART]: Clearing undo and redo stacks in {0} {1}", Name, LocalId); 3918 if (m_UndoRedo == null || Undoing)
3919 return;
3306 3920
3307 lock (m_undo) 3921 lock (m_UndoRedo)
3308 { 3922 {
3309 m_undo.Clear(); 3923 m_UndoRedo.Clear();
3310 m_redo.Clear();
3311 } 3924 }
3312 } 3925 }
3313 3926
@@ -3958,6 +4571,27 @@ namespace OpenSim.Region.Framework.Scenes
3958 } 4571 }
3959 } 4572 }
3960 4573
4574
4575 public void UpdateExtraPhysics(ExtraPhysicsData physdata)
4576 {
4577 if (physdata.PhysShapeType == PhysShapeType.invalid || ParentGroup == null)
4578 return;
4579
4580 if (PhysicsShapeType != (byte)physdata.PhysShapeType)
4581 {
4582 PhysicsShapeType = (byte)physdata.PhysShapeType;
4583
4584 }
4585
4586 if(Density != physdata.Density)
4587 Density = physdata.Density;
4588 if(GravityModifier != physdata.GravitationModifier)
4589 GravityModifier = physdata.GravitationModifier;
4590 if(Friction != physdata.Friction)
4591 Friction = physdata.Friction;
4592 if(Bounciness != physdata.Bounce)
4593 Bounciness = physdata.Bounce;
4594 }
3961 /// <summary> 4595 /// <summary>
3962 /// Update the flags on this prim. This covers properties such as phantom, physics and temporary. 4596 /// Update the flags on this prim. This covers properties such as phantom, physics and temporary.
3963 /// </summary> 4597 /// </summary>
@@ -3965,7 +4599,7 @@ namespace OpenSim.Region.Framework.Scenes
3965 /// <param name="SetTemporary"></param> 4599 /// <param name="SetTemporary"></param>
3966 /// <param name="SetPhantom"></param> 4600 /// <param name="SetPhantom"></param>
3967 /// <param name="SetVD"></param> 4601 /// <param name="SetVD"></param>
3968 public void UpdatePrimFlags(bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVD) 4602 public void UpdatePrimFlags(bool UsePhysics, bool SetTemporary, bool SetPhantom, bool SetVD, bool building)
3969 { 4603 {
3970 bool wasUsingPhysics = ((Flags & PrimFlags.Physics) != 0); 4604 bool wasUsingPhysics = ((Flags & PrimFlags.Physics) != 0);
3971 bool wasTemporary = ((Flags & PrimFlags.TemporaryOnRez) != 0); 4605 bool wasTemporary = ((Flags & PrimFlags.TemporaryOnRez) != 0);
@@ -3975,237 +4609,230 @@ namespace OpenSim.Region.Framework.Scenes
3975 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD)) 4609 if ((UsePhysics == wasUsingPhysics) && (wasTemporary == SetTemporary) && (wasPhantom == SetPhantom) && (SetVD == wasVD))
3976 return; 4610 return;
3977 4611
3978 PhysicsActor pa = PhysActor; 4612 VolumeDetectActive = SetVD;
3979
3980 // Special cases for VD. VD can only be called from a script
3981 // and can't be combined with changes to other states. So we can rely
3982 // that...
3983 // ... if VD is changed, all others are not.
3984 // ... if one of the others is changed, VD is not.
3985 if (SetVD) // VD is active, special logic applies
3986 {
3987 // State machine logic for VolumeDetect
3988 // More logic below
3989 bool phanReset = (SetPhantom != wasPhantom) && !SetPhantom;
3990
3991 if (phanReset) // Phantom changes from on to off switch VD off too
3992 {
3993 SetVD = false; // Switch it of for the course of this routine
3994 VolumeDetectActive = false; // and also permanently
3995
3996 if (pa != null)
3997 pa.SetVolumeDetect(0); // Let physics know about it too
3998 }
3999 else
4000 {
4001 // If volumedetect is active we don't want phantom to be applied.
4002 // If this is a new call to VD out of the state "phantom"
4003 // this will also cause the prim to be visible to physics
4004 SetPhantom = false;
4005 }
4006 }
4007 4613
4008 if (UsePhysics && IsJoint()) 4614 // volume detector implies phantom
4009 { 4615 if (VolumeDetectActive)
4010 SetPhantom = true; 4616 SetPhantom = true;
4011 }
4012 4617
4013 if (UsePhysics) 4618 if (UsePhysics)
4014 {
4015 AddFlag(PrimFlags.Physics); 4619 AddFlag(PrimFlags.Physics);
4016 if (!wasUsingPhysics)
4017 {
4018 DoPhysicsPropertyUpdate(UsePhysics, false);
4019
4020 if (!ParentGroup.IsDeleted)
4021 {
4022 if (LocalId == ParentGroup.RootPart.LocalId)
4023 {
4024 ParentGroup.CheckSculptAndLoad();
4025 }
4026 }
4027 }
4028 }
4029 else 4620 else
4030 {
4031 RemFlag(PrimFlags.Physics); 4621 RemFlag(PrimFlags.Physics);
4032 if (wasUsingPhysics)
4033 {
4034 DoPhysicsPropertyUpdate(UsePhysics, false);
4035 }
4036 }
4037 4622
4038 if (SetPhantom 4623 if (SetPhantom)
4039 || ParentGroup.IsAttachment
4040 || (Shape.PathCurve == (byte)Extrusion.Flexible)) // note: this may have been changed above in the case of joints
4041 {
4042 AddFlag(PrimFlags.Phantom); 4624 AddFlag(PrimFlags.Phantom);
4625 else
4626 RemFlag(PrimFlags.Phantom);
4043 4627
4044 if (PhysActor != null) 4628 if (SetTemporary)
4629 AddFlag(PrimFlags.TemporaryOnRez);
4630 else
4631 RemFlag(PrimFlags.TemporaryOnRez);
4632
4633
4634 if (ParentGroup.Scene == null)
4635 return;
4636
4637 PhysicsActor pa = PhysActor;
4638
4639 if (pa != null && building && pa.Building != building)
4640 pa.Building = building;
4641
4642 if ((SetPhantom && !UsePhysics && !SetVD) || ParentGroup.IsAttachment || PhysicsShapeType == (byte)PhysShapeType.none
4643 || (Shape.PathCurve == (byte)Extrusion.Flexible))
4644 {
4645 if (pa != null)
4045 { 4646 {
4647 if(wasUsingPhysics)
4648 ParentGroup.Scene.RemovePhysicalPrim(1);
4046 RemoveFromPhysics(); 4649 RemoveFromPhysics();
4047 pa = null;
4048 } 4650 }
4651
4652 Velocity = new Vector3(0, 0, 0);
4653 Acceleration = new Vector3(0, 0, 0);
4654 if (ParentGroup.RootPart == this)
4655 AngularVelocity = new Vector3(0, 0, 0);
4049 } 4656 }
4050 else // Not phantom 4657 else
4051 { 4658 {
4052 RemFlag(PrimFlags.Phantom); 4659 if (ParentGroup.Scene.CollidablePrims)
4053
4054 if (ParentGroup.Scene == null)
4055 return;
4056
4057 if (ParentGroup.Scene.CollidablePrims && pa == null)
4058 { 4660 {
4059 pa = AddToPhysics(UsePhysics); 4661 if (pa == null)
4060
4061 if (pa != null)
4062 { 4662 {
4063 pa.SetMaterial(Material); 4663 AddToPhysics(UsePhysics, SetPhantom, building, false);
4064 DoPhysicsPropertyUpdate(UsePhysics, true); 4664 pa = PhysActor;
4065 4665/*
4066 if (!ParentGroup.IsDeleted) 4666 if (pa != null)
4067 { 4667 {
4068 if (LocalId == ParentGroup.RootPart.LocalId) 4668 if (
4669// ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
4670// ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
4671// ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
4672// ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
4673// ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
4674// ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
4675 ((AggregateScriptEvents & PhysicsNeededSubsEvents) != 0) ||
4676 ((ParentGroup.RootPart.AggregateScriptEvents & PhysicsNeededSubsEvents) != 0) ||
4677 (CollisionSound != UUID.Zero)
4678 )
4069 { 4679 {
4070 ParentGroup.CheckSculptAndLoad(); 4680 pa.OnCollisionUpdate += PhysicsCollision;
4681 pa.SubscribeEvents(1000);
4071 } 4682 }
4072 } 4683 }
4073 4684*/
4074 if (
4075 ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
4076 ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
4077 ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
4078 ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
4079 ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
4080 ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
4081 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision) != 0) ||
4082 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
4083 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
4084 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
4085 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
4086 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
4087 (CollisionSound != UUID.Zero)
4088 )
4089 {
4090 pa.OnCollisionUpdate += PhysicsCollision;
4091 pa.SubscribeEvents(1000);
4092 }
4093 } 4685 }
4094 } 4686 else // it already has a physical representation
4095 else // it already has a physical representation
4096 {
4097 DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim
4098
4099 if (!ParentGroup.IsDeleted)
4100 { 4687 {
4101 if (LocalId == ParentGroup.RootPart.LocalId) 4688 DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status.
4102 { 4689/* moved into DoPhysicsPropertyUpdate
4103 ParentGroup.CheckSculptAndLoad(); 4690 if(VolumeDetectActive)
4104 } 4691 pa.SetVolumeDetect(1);
4692 else
4693 pa.SetVolumeDetect(0);
4694*/
4695
4696 if (pa.Building != building)
4697 pa.Building = building;
4105 } 4698 }
4106 }
4107 }
4108 4699
4109 if (SetVD) 4700 UpdatePhysicsSubscribedEvents();
4110 {
4111 // If the above logic worked (this is urgent candidate to unit tests!)
4112 // we now have a physicsactor.
4113 // Defensive programming calls for a check here.
4114 // Better would be throwing an exception that could be catched by a unit test as the internal
4115 // logic should make sure, this Physactor is always here.
4116 if (pa != null)
4117 {
4118 pa.SetVolumeDetect(1);
4119 AddFlag(PrimFlags.Phantom); // We set this flag also if VD is active
4120 VolumeDetectActive = true;
4121 } 4701 }
4122 } 4702 }
4123 else
4124 {
4125 // Remove VolumeDetect in any case. Note, it's safe to call SetVolumeDetect as often as you like
4126 // (mumbles, well, at least if you have infinte CPU powers :-))
4127 if (pa != null)
4128 pa.SetVolumeDetect(0);
4129
4130 VolumeDetectActive = false;
4131 }
4132
4133 if (SetTemporary)
4134 {
4135 AddFlag(PrimFlags.TemporaryOnRez);
4136 }
4137 else
4138 {
4139 RemFlag(PrimFlags.TemporaryOnRez);
4140 }
4141 4703
4142 // m_log.Debug("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString()); 4704 // m_log.Debug("Update: PHY:" + UsePhysics.ToString() + ", T:" + IsTemporary.ToString() + ", PHA:" + IsPhantom.ToString() + " S:" + CastsShadows.ToString());
4143 4705
4706 // and last in case we have a new actor and not building
4707
4144 if (ParentGroup != null) 4708 if (ParentGroup != null)
4145 { 4709 {
4146 ParentGroup.HasGroupChanged = true; 4710 ParentGroup.HasGroupChanged = true;
4147 ScheduleFullUpdate(); 4711 ScheduleFullUpdate();
4148 } 4712 }
4149 4713
4150// m_log.DebugFormat("[SCENE OBJECT PART]: Updated PrimFlags on {0} {1} to {2}", Name, LocalId, Flags); 4714// m_log.DebugFormat("[SCENE OBJECT PART]: Updated PrimFlags on {0} {1} to {2}", Name, LocalId, Flags);
4151 } 4715 }
4152 4716
4153 /// <summary> 4717 /// <summary>
4154 /// Adds this part to the physics scene. 4718 /// Adds this part to the physics scene.
4719 /// and sets the PhysActor property
4155 /// </summary> 4720 /// </summary>
4156 /// <remarks>This method also sets the PhysActor property.</remarks> 4721 /// <param name="isPhysical">Add this prim as physical.</param>
4157 /// <param name="rigidBody">Add this prim with a rigid body.</param> 4722 /// <param name="isPhantom">Add this prim as phantom.</param>
4158 /// <returns> 4723 /// <param name="building">tells physics to delay full construction of object</param>
4159 /// The physics actor. null if there was a failure. 4724 /// <param name="applyDynamics">applies velocities, force and torque</param>
4160 /// </returns> 4725 private void AddToPhysics(bool isPhysical, bool isPhantom, bool building, bool applyDynamics)
4161 private PhysicsActor AddToPhysics(bool rigidBody) 4726 {
4162 {
4163 PhysicsActor pa; 4727 PhysicsActor pa;
4164 4728
4729 Vector3 velocity = Velocity;
4730 Vector3 rotationalVelocity = AngularVelocity;;
4731
4165 try 4732 try
4166 { 4733 {
4167 pa = ParentGroup.Scene.PhysicsScene.AddPrimShape( 4734 pa = ParentGroup.Scene.PhysicsScene.AddPrimShape(
4168 string.Format("{0}/{1}", Name, UUID), 4735 string.Format("{0}/{1}", Name, UUID),
4169 Shape, 4736 Shape,
4170 AbsolutePosition, 4737 AbsolutePosition,
4171 Scale, 4738 Scale,
4172 RotationOffset, 4739 GetWorldRotation(),
4173 rigidBody, 4740 isPhysical,
4174 m_localId); 4741 isPhantom,
4742 PhysicsShapeType,
4743 m_localId);
4175 } 4744 }
4176 catch 4745 catch (Exception ex)
4177 { 4746 {
4178 m_log.ErrorFormat("[SCENE]: caught exception meshing object {0}. Object set to phantom.", m_uuid); 4747 m_log.ErrorFormat("[SCENE]: AddToPhysics object {0} failed: {1}", m_uuid, ex.Message);
4179 pa = null; 4748 pa = null;
4180 } 4749 }
4181 4750
4182 // FIXME: Ideally we wouldn't set the property here to reduce situations where threads changing physical
4183 // properties can stop on each other. However, DoPhysicsPropertyUpdate() currently relies on PhysActor
4184 // being set.
4185 PhysActor = pa;
4186
4187 // Basic Physics can also return null as well as an exception catch.
4188 if (pa != null) 4751 if (pa != null)
4189 { 4752 {
4190 pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info 4753 pa.SOPName = this.Name; // save object into the PhysActor so ODE internals know the joint/body info
4191 pa.SetMaterial(Material); 4754 pa.SetMaterial(Material);
4192 DoPhysicsPropertyUpdate(rigidBody, true); 4755
4756 if (VolumeDetectActive) // change if not the default only
4757 pa.SetVolumeDetect(1);
4758
4759 if (m_vehicleParams != null && LocalId == ParentGroup.RootPart.LocalId)
4760 m_vehicleParams.SetVehicle(pa);
4761
4762 // we are going to tell rest of code about physics so better have this here
4763 PhysActor = pa;
4764
4765 // DoPhysicsPropertyUpdate(isPhysical, true);
4766 // lets expand it here just with what it really needs to do
4767
4768 if (isPhysical)
4769 {
4770 if (ParentGroup.RootPart.KeyframeMotion != null)
4771 ParentGroup.RootPart.KeyframeMotion.Stop();
4772 ParentGroup.RootPart.KeyframeMotion = null;
4773 ParentGroup.Scene.AddPhysicalPrim(1);
4774
4775 pa.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate;
4776 pa.OnOutOfBounds += PhysicsOutOfBounds;
4777
4778 if (ParentID != 0 && ParentID != LocalId)
4779 {
4780 PhysicsActor parentPa = ParentGroup.RootPart.PhysActor;
4781
4782 if (parentPa != null)
4783 {
4784 pa.link(parentPa);
4785 }
4786 }
4787 }
4788
4789 if (applyDynamics)
4790 // do independent of isphysical so parameters get setted (at least some)
4791 {
4792 Velocity = velocity;
4793 AngularVelocity = rotationalVelocity;
4794// pa.Velocity = velocity;
4795 pa.RotationalVelocity = rotationalVelocity;
4796
4797 // if not vehicle and root part apply force and torque
4798 if ((m_vehicleParams == null || m_vehicleParams.Type == Vehicle.TYPE_NONE)
4799 && LocalId == ParentGroup.RootPart.LocalId)
4800 {
4801 pa.Force = Force;
4802 pa.Torque = Torque;
4803 }
4804 }
4805
4806 if (Shape.SculptEntry)
4807 CheckSculptAndLoad();
4808 else
4809 ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(pa);
4810
4811 if (!building)
4812 pa.Building = false;
4193 } 4813 }
4194 4814
4195 return pa; 4815 PhysActor = pa;
4196 } 4816 }
4197 4817
4198 /// <summary> 4818 /// <summary>
4199 /// This removes the part from the physics scene. 4819 /// This removes the part from the physics scene.
4200 /// </summary> 4820 /// </summary>
4201 /// <remarks> 4821 /// <remarks>
4202 /// This isn't the same as turning off physical, since even without being physical the prim has a physics 4822 /// This isn't the same as turning off physical, since even without being physical the prim has a physics
4203 /// representation for collision detection. Rather, this would be used in situations such as making a prim 4823 /// representation for collision detection.
4204 /// phantom.
4205 /// </remarks> 4824 /// </remarks>
4206 public void RemoveFromPhysics() 4825 public void RemoveFromPhysics()
4207 { 4826 {
4208 ParentGroup.Scene.PhysicsScene.RemovePrim(PhysActor); 4827 PhysicsActor pa = PhysActor;
4828 if (pa != null)
4829 {
4830 pa.OnCollisionUpdate -= PhysicsCollision;
4831 pa.OnRequestTerseUpdate -= PhysicsRequestingTerseUpdate;
4832 pa.OnOutOfBounds -= PhysicsOutOfBounds;
4833
4834 ParentGroup.Scene.PhysicsScene.RemovePrim(pa);
4835 }
4209 PhysActor = null; 4836 PhysActor = null;
4210 } 4837 }
4211 4838
@@ -4416,6 +5043,44 @@ namespace OpenSim.Region.Framework.Scenes
4416 ScheduleFullUpdate(); 5043 ScheduleFullUpdate();
4417 } 5044 }
4418 5045
5046
5047 private void UpdatePhysicsSubscribedEvents()
5048 {
5049 PhysicsActor pa = PhysActor;
5050 if (pa == null)
5051 return;
5052
5053 pa.OnCollisionUpdate -= PhysicsCollision;
5054
5055 bool hassound = (!VolumeDetectActive && CollisionSoundType >= 0 && ((Flags & PrimFlags.Physics) != 0));
5056
5057 scriptEvents CombinedEvents = AggregateScriptEvents;
5058
5059 // merge with root part
5060 if (ParentGroup != null && ParentGroup.RootPart != null)
5061 CombinedEvents |= ParentGroup.RootPart.AggregateScriptEvents;
5062
5063 // submit to this part case
5064 if (VolumeDetectActive)
5065 CombinedEvents &= PhyscicsVolumeDtcSubsEvents;
5066 else if ((Flags & PrimFlags.Phantom) != 0)
5067 CombinedEvents &= PhyscicsPhantonSubsEvents;
5068 else
5069 CombinedEvents &= PhysicsNeededSubsEvents;
5070
5071 if (hassound || CombinedEvents != 0)
5072 {
5073 // subscribe to physics updates.
5074 pa.OnCollisionUpdate += PhysicsCollision;
5075 pa.SubscribeEvents(50); // 20 reports per second
5076 }
5077 else
5078 {
5079 pa.UnSubscribeEvents();
5080 }
5081 }
5082
5083
4419 public void aggregateScriptEvents() 5084 public void aggregateScriptEvents()
4420 { 5085 {
4421 if (ParentGroup == null || ParentGroup.RootPart == null) 5086 if (ParentGroup == null || ParentGroup.RootPart == null)
@@ -4452,40 +5117,32 @@ namespace OpenSim.Region.Framework.Scenes
4452 { 5117 {
4453 objectflagupdate |= (uint) PrimFlags.AllowInventoryDrop; 5118 objectflagupdate |= (uint) PrimFlags.AllowInventoryDrop;
4454 } 5119 }
4455 5120/*
4456 PhysicsActor pa = PhysActor; 5121 PhysicsActor pa = PhysActor;
4457 5122 if (pa != null)
4458 if (
4459 ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
4460 ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
4461 ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
4462 ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
4463 ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
4464 ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
4465 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision) != 0) ||
4466 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
4467 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
4468 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
4469 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
4470 ((ParentGroup.RootPart.AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
4471 (CollisionSound != UUID.Zero)
4472 )
4473 { 5123 {
4474 // subscribe to physics updates. 5124 if (
4475 if (pa != null) 5125// ((AggregateScriptEvents & scriptEvents.collision) != 0) ||
5126// ((AggregateScriptEvents & scriptEvents.collision_end) != 0) ||
5127// ((AggregateScriptEvents & scriptEvents.collision_start) != 0) ||
5128// ((AggregateScriptEvents & scriptEvents.land_collision_start) != 0) ||
5129// ((AggregateScriptEvents & scriptEvents.land_collision) != 0) ||
5130// ((AggregateScriptEvents & scriptEvents.land_collision_end) != 0) ||
5131 ((AggregateScriptEvents & PhysicsNeededSubsEvents) != 0) || ((ParentGroup.RootPart.AggregateScriptEvents & PhysicsNeededSubsEvents) != 0) || (CollisionSound != UUID.Zero)
5132 )
4476 { 5133 {
5134 // subscribe to physics updates.
4477 pa.OnCollisionUpdate += PhysicsCollision; 5135 pa.OnCollisionUpdate += PhysicsCollision;
4478 pa.SubscribeEvents(1000); 5136 pa.SubscribeEvents(1000);
4479 } 5137 }
4480 } 5138 else
4481 else
4482 {
4483 if (pa != null)
4484 { 5139 {
4485 pa.UnSubscribeEvents(); 5140 pa.UnSubscribeEvents();
4486 pa.OnCollisionUpdate -= PhysicsCollision; 5141 pa.OnCollisionUpdate -= PhysicsCollision;
4487 } 5142 }
4488 } 5143 }
5144 */
5145 UpdatePhysicsSubscribedEvents();
4489 5146
4490 //if ((GetEffectiveObjectFlags() & (uint)PrimFlags.Scripted) != 0) 5147 //if ((GetEffectiveObjectFlags() & (uint)PrimFlags.Scripted) != 0)
4491 //{ 5148 //{
@@ -4615,6 +5272,18 @@ namespace OpenSim.Region.Framework.Scenes
4615 return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A)); 5272 return new Color4(color.R, color.G, color.B, (byte)(0xFF - color.A));
4616 } 5273 }
4617 5274
5275 public void ResetOwnerChangeFlag()
5276 {
5277 List<UUID> inv = Inventory.GetInventoryList();
5278
5279 foreach (UUID itemID in inv)
5280 {
5281 TaskInventoryItem item = Inventory.GetInventoryItem(itemID);
5282 item.OwnerChanged = false;
5283 Inventory.UpdateInventoryItem(item, false, false);
5284 }
5285 }
5286
4618 /// <summary> 5287 /// <summary>
4619 /// Record an avatar sitting on this part. 5288 /// Record an avatar sitting on this part.
4620 /// </summary> 5289 /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 821fd81..e010864 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -48,6 +48,9 @@ namespace OpenSim.Region.Framework.Scenes
48 private string m_inventoryFileName = String.Empty; 48 private string m_inventoryFileName = String.Empty;
49 private byte[] m_inventoryFileData = new byte[0]; 49 private byte[] m_inventoryFileData = new byte[0];
50 private uint m_inventoryFileNameSerial = 0; 50 private uint m_inventoryFileNameSerial = 0;
51 private bool m_inventoryPrivileged = false;
52
53 private Dictionary<UUID, ArrayList> m_scriptErrors = new Dictionary<UUID, ArrayList>();
51 54
52 /// <value> 55 /// <value>
53 /// The part to which the inventory belongs. 56 /// The part to which the inventory belongs.
@@ -84,7 +87,9 @@ namespace OpenSim.Region.Framework.Scenes
84 /// </value> 87 /// </value>
85 protected internal TaskInventoryDictionary Items 88 protected internal TaskInventoryDictionary Items
86 { 89 {
87 get { return m_items; } 90 get {
91 return m_items;
92 }
88 set 93 set
89 { 94 {
90 m_items = value; 95 m_items = value;
@@ -124,38 +129,45 @@ namespace OpenSim.Region.Framework.Scenes
124 public void ResetInventoryIDs() 129 public void ResetInventoryIDs()
125 { 130 {
126 if (null == m_part) 131 if (null == m_part)
127 return; 132 m_items.LockItemsForWrite(true);
128 133
129 lock (m_items) 134 if (Items.Count == 0)
130 { 135 {
131 if (0 == m_items.Count) 136 m_items.LockItemsForWrite(false);
132 return; 137 return;
138 }
133 139
134 IList<TaskInventoryItem> items = GetInventoryItems(); 140 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
135 m_items.Clear(); 141 Items.Clear();
136 142
137 foreach (TaskInventoryItem item in items) 143 foreach (TaskInventoryItem item in items)
138 { 144 {
139 item.ResetIDs(m_part.UUID); 145 item.ResetIDs(m_part.UUID);
140 m_items.Add(item.ItemID, item); 146 Items.Add(item.ItemID, item);
141 }
142 } 147 }
148 m_items.LockItemsForWrite(false);
143 } 149 }
144 150
145 public void ResetObjectID() 151 public void ResetObjectID()
146 { 152 {
147 lock (Items) 153 m_items.LockItemsForWrite(true);
154
155 if (Items.Count == 0)
148 { 156 {
149 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 157 m_items.LockItemsForWrite(false);
150 Items.Clear(); 158 return;
151
152 foreach (TaskInventoryItem item in items)
153 {
154 item.ParentPartID = m_part.UUID;
155 item.ParentID = m_part.UUID;
156 Items.Add(item.ItemID, item);
157 }
158 } 159 }
160
161 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
162 Items.Clear();
163
164 foreach (TaskInventoryItem item in items)
165 {
166 item.ParentPartID = m_part.UUID;
167 item.ParentID = m_part.UUID;
168 Items.Add(item.ItemID, item);
169 }
170 m_items.LockItemsForWrite(false);
159 } 171 }
160 172
161 /// <summary> 173 /// <summary>
@@ -164,17 +176,14 @@ namespace OpenSim.Region.Framework.Scenes
164 /// <param name="ownerId"></param> 176 /// <param name="ownerId"></param>
165 public void ChangeInventoryOwner(UUID ownerId) 177 public void ChangeInventoryOwner(UUID ownerId)
166 { 178 {
167 lock (Items) 179 List<TaskInventoryItem> items = GetInventoryItems();
168 { 180
169 if (0 == Items.Count) 181 if (items.Count == 0)
170 { 182 return;
171 return;
172 }
173 }
174 183
184 m_items.LockItemsForWrite(true);
175 HasInventoryChanged = true; 185 HasInventoryChanged = true;
176 m_part.ParentGroup.HasGroupChanged = true; 186 m_part.ParentGroup.HasGroupChanged = true;
177 List<TaskInventoryItem> items = GetInventoryItems();
178 foreach (TaskInventoryItem item in items) 187 foreach (TaskInventoryItem item in items)
179 { 188 {
180 if (ownerId != item.OwnerID) 189 if (ownerId != item.OwnerID)
@@ -185,6 +194,7 @@ namespace OpenSim.Region.Framework.Scenes
185 item.PermsGranter = UUID.Zero; 194 item.PermsGranter = UUID.Zero;
186 item.OwnerChanged = true; 195 item.OwnerChanged = true;
187 } 196 }
197 m_items.LockItemsForWrite(false);
188 } 198 }
189 199
190 /// <summary> 200 /// <summary>
@@ -193,12 +203,11 @@ namespace OpenSim.Region.Framework.Scenes
193 /// <param name="groupID"></param> 203 /// <param name="groupID"></param>
194 public void ChangeInventoryGroup(UUID groupID) 204 public void ChangeInventoryGroup(UUID groupID)
195 { 205 {
196 lock (Items) 206 m_items.LockItemsForWrite(true);
207 if (0 == Items.Count)
197 { 208 {
198 if (0 == Items.Count) 209 m_items.LockItemsForWrite(false);
199 { 210 return;
200 return;
201 }
202 } 211 }
203 212
204 // Don't let this set the HasGroupChanged flag for attachments 213 // Don't let this set the HasGroupChanged flag for attachments
@@ -210,12 +219,15 @@ namespace OpenSim.Region.Framework.Scenes
210 m_part.ParentGroup.HasGroupChanged = true; 219 m_part.ParentGroup.HasGroupChanged = true;
211 } 220 }
212 221
213 List<TaskInventoryItem> items = GetInventoryItems(); 222 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
214 foreach (TaskInventoryItem item in items) 223 foreach (TaskInventoryItem item in items)
215 { 224 {
216 if (groupID != item.GroupID) 225 if (groupID != item.GroupID)
226 {
217 item.GroupID = groupID; 227 item.GroupID = groupID;
228 }
218 } 229 }
230 m_items.LockItemsForWrite(false);
219 } 231 }
220 232
221 private void QueryScriptStates() 233 private void QueryScriptStates()
@@ -227,25 +239,25 @@ namespace OpenSim.Region.Framework.Scenes
227 if (engines == null) // No engine at all 239 if (engines == null) // No engine at all
228 return; 240 return;
229 241
230 lock (Items) 242 Items.LockItemsForRead(true);
243 foreach (TaskInventoryItem item in Items.Values)
231 { 244 {
232 foreach (TaskInventoryItem item in Items.Values) 245 if (item.InvType == (int)InventoryType.LSL)
233 { 246 {
234 if (item.InvType == (int)InventoryType.LSL) 247 foreach (IScriptModule e in engines)
235 { 248 {
236 foreach (IScriptModule e in engines) 249 bool running;
237 {
238 bool running;
239 250
240 if (e.HasScript(item.ItemID, out running)) 251 if (e.HasScript(item.ItemID, out running))
241 { 252 {
242 item.ScriptRunning = running; 253 item.ScriptRunning = running;
243 break; 254 break;
244 }
245 } 255 }
246 } 256 }
247 } 257 }
248 } 258 }
259
260 Items.LockItemsForRead(false);
249 } 261 }
250 262
251 public int CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource) 263 public int CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
@@ -290,7 +302,10 @@ namespace OpenSim.Region.Framework.Scenes
290 { 302 {
291 List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL); 303 List<TaskInventoryItem> scripts = GetInventoryItems(InventoryType.LSL);
292 foreach (TaskInventoryItem item in scripts) 304 foreach (TaskInventoryItem item in scripts)
305 {
293 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted); 306 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
307 m_part.RemoveScriptEvents(item.ItemID);
308 }
294 } 309 }
295 310
296 /// <summary> 311 /// <summary>
@@ -312,7 +327,10 @@ namespace OpenSim.Region.Framework.Scenes
312// item.Name, item.ItemID, m_part.Name, m_part.UUID, m_part.ParentGroup.Scene.RegionInfo.RegionName); 327// item.Name, item.ItemID, m_part.Name, m_part.UUID, m_part.ParentGroup.Scene.RegionInfo.RegionName);
313 328
314 if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID)) 329 if (!m_part.ParentGroup.Scene.Permissions.CanRunScript(item.ItemID, m_part.UUID, item.OwnerID))
330 {
331 StoreScriptError(item.ItemID, "no permission");
315 return false; 332 return false;
333 }
316 334
317 m_part.AddFlag(PrimFlags.Scripted); 335 m_part.AddFlag(PrimFlags.Scripted);
318 336
@@ -322,14 +340,13 @@ namespace OpenSim.Region.Framework.Scenes
322 if (stateSource == 2 && // Prim crossing 340 if (stateSource == 2 && // Prim crossing
323 m_part.ParentGroup.Scene.m_trustBinaries) 341 m_part.ParentGroup.Scene.m_trustBinaries)
324 { 342 {
325 lock (m_items) 343 m_items.LockItemsForWrite(true);
326 { 344 m_items[item.ItemID].PermsMask = 0;
327 m_items[item.ItemID].PermsMask = 0; 345 m_items[item.ItemID].PermsGranter = UUID.Zero;
328 m_items[item.ItemID].PermsGranter = UUID.Zero; 346 m_items.LockItemsForWrite(false);
329 }
330
331 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 347 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
332 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource); 348 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource);
349 StoreScriptErrors(item.ItemID, null);
333 m_part.ParentGroup.AddActiveScriptCount(1); 350 m_part.ParentGroup.AddActiveScriptCount(1);
334 m_part.ScheduleFullUpdate(); 351 m_part.ScheduleFullUpdate();
335 return true; 352 return true;
@@ -338,6 +355,8 @@ namespace OpenSim.Region.Framework.Scenes
338 AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString()); 355 AssetBase asset = m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString());
339 if (null == asset) 356 if (null == asset)
340 { 357 {
358 string msg = String.Format("asset ID {0} could not be found", item.AssetID);
359 StoreScriptError(item.ItemID, msg);
341 m_log.ErrorFormat( 360 m_log.ErrorFormat(
342 "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", 361 "[PRIM INVENTORY]: Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found",
343 item.Name, item.ItemID, m_part.AbsolutePosition, 362 item.Name, item.ItemID, m_part.AbsolutePosition,
@@ -350,16 +369,18 @@ namespace OpenSim.Region.Framework.Scenes
350 if (m_part.ParentGroup.m_savedScriptState != null) 369 if (m_part.ParentGroup.m_savedScriptState != null)
351 item.OldItemID = RestoreSavedScriptState(item.LoadedItemID, item.OldItemID, item.ItemID); 370 item.OldItemID = RestoreSavedScriptState(item.LoadedItemID, item.OldItemID, item.ItemID);
352 371
353 lock (m_items) 372 m_items.LockItemsForWrite(true);
354 {
355 m_items[item.ItemID].OldItemID = item.OldItemID;
356 m_items[item.ItemID].PermsMask = 0;
357 m_items[item.ItemID].PermsGranter = UUID.Zero;
358 }
359 373
374 m_items[item.ItemID].OldItemID = item.OldItemID;
375 m_items[item.ItemID].PermsMask = 0;
376 m_items[item.ItemID].PermsGranter = UUID.Zero;
377
378 m_items.LockItemsForWrite(false);
379
360 string script = Utils.BytesToString(asset.Data); 380 string script = Utils.BytesToString(asset.Data);
361 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 381 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
362 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource); 382 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
383 StoreScriptErrors(item.ItemID, null);
363 if (!item.ScriptRunning) 384 if (!item.ScriptRunning)
364 m_part.ParentGroup.Scene.EventManager.TriggerStopScript( 385 m_part.ParentGroup.Scene.EventManager.TriggerStopScript(
365 m_part.LocalId, item.ItemID); 386 m_part.LocalId, item.ItemID);
@@ -432,24 +453,151 @@ namespace OpenSim.Region.Framework.Scenes
432 return stateID; 453 return stateID;
433 } 454 }
434 455
456 /// <summary>
457 /// Start a script which is in this prim's inventory.
458 /// Some processing may occur in the background, but this routine returns asap.
459 /// </summary>
460 /// <param name="itemId">
461 /// A <see cref="UUID"/>
462 /// </param>
435 public bool CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource) 463 public bool CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
436 { 464 {
437 TaskInventoryItem item = GetInventoryItem(itemId); 465 lock (m_scriptErrors)
438 if (item != null) 466 {
467 // Indicate to CreateScriptInstanceInternal() we don't want it to wait for completion
468 m_scriptErrors.Remove(itemId);
469 }
470 CreateScriptInstanceInternal(itemId, startParam, postOnRez, engine, stateSource);
471 return true;
472 }
473
474 private void CreateScriptInstanceInternal(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
475 {
476 m_items.LockItemsForRead(true);
477 if (m_items.ContainsKey(itemId))
439 { 478 {
440 return CreateScriptInstance(item, startParam, postOnRez, engine, stateSource); 479 if (m_items.ContainsKey(itemId))
480 {
481 m_items.LockItemsForRead(false);
482 CreateScriptInstance(m_items[itemId], startParam, postOnRez, engine, stateSource);
483 }
484 else
485 {
486 m_items.LockItemsForRead(false);
487 string msg = String.Format("couldn't be found for prim {0}, {1} at {2} in {3}", m_part.Name, m_part.UUID,
488 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
489 StoreScriptError(itemId, msg);
490 m_log.ErrorFormat(
491 "[PRIM INVENTORY]: " +
492 "Couldn't start script with ID {0} since it {1}", itemId, msg);
493 }
441 } 494 }
442 else 495 else
443 { 496 {
497 m_items.LockItemsForRead(false);
498 string msg = String.Format("couldn't be found for prim {0}, {1}", m_part.Name, m_part.UUID);
499 StoreScriptError(itemId, msg);
444 m_log.ErrorFormat( 500 m_log.ErrorFormat(
445 "[PRIM INVENTORY]: Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}", 501 "[PRIM INVENTORY]: Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}",
446 itemId, m_part.Name, m_part.UUID, 502 itemId, m_part.Name, m_part.UUID,
447 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); 503 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
504 }
505
506 }
448 507
449 return false; 508 /// <summary>
509 /// Start a script which is in this prim's inventory and return any compilation error messages.
510 /// </summary>
511 /// <param name="itemId">
512 /// A <see cref="UUID"/>
513 /// </param>
514 public ArrayList CreateScriptInstanceEr(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
515 {
516 ArrayList errors;
517
518 // Indicate to CreateScriptInstanceInternal() we want it to
519 // post any compilation/loading error messages
520 lock (m_scriptErrors)
521 {
522 m_scriptErrors[itemId] = null;
523 }
524
525 // Perform compilation/loading
526 CreateScriptInstanceInternal(itemId, startParam, postOnRez, engine, stateSource);
527
528 // Wait for and retrieve any errors
529 lock (m_scriptErrors)
530 {
531 while ((errors = m_scriptErrors[itemId]) == null)
532 {
533 if (!System.Threading.Monitor.Wait(m_scriptErrors, 15000))
534 {
535 m_log.ErrorFormat(
536 "[PRIM INVENTORY]: " +
537 "timedout waiting for script {0} errors", itemId);
538 errors = m_scriptErrors[itemId];
539 if (errors == null)
540 {
541 errors = new ArrayList(1);
542 errors.Add("timedout waiting for errors");
543 }
544 break;
545 }
546 }
547 m_scriptErrors.Remove(itemId);
548 }
549 return errors;
550 }
551
552 // Signal to CreateScriptInstanceEr() that compilation/loading is complete
553 private void StoreScriptErrors(UUID itemId, ArrayList errors)
554 {
555 lock (m_scriptErrors)
556 {
557 // If compilation/loading initiated via CreateScriptInstance(),
558 // it does not want the errors, so just get out
559 if (!m_scriptErrors.ContainsKey(itemId))
560 {
561 return;
562 }
563
564 // Initiated via CreateScriptInstanceEr(), if we know what the
565 // errors are, save them and wake CreateScriptInstanceEr().
566 if (errors != null)
567 {
568 m_scriptErrors[itemId] = errors;
569 System.Threading.Monitor.PulseAll(m_scriptErrors);
570 return;
571 }
572 }
573
574 // Initiated via CreateScriptInstanceEr() but we don't know what
575 // the errors are yet, so retrieve them from the script engine.
576 // This may involve some waiting internal to GetScriptErrors().
577 errors = GetScriptErrors(itemId);
578
579 // Get a default non-null value to indicate success.
580 if (errors == null)
581 {
582 errors = new ArrayList();
583 }
584
585 // Post to CreateScriptInstanceEr() and wake it up
586 lock (m_scriptErrors)
587 {
588 m_scriptErrors[itemId] = errors;
589 System.Threading.Monitor.PulseAll(m_scriptErrors);
450 } 590 }
451 } 591 }
452 592
593 // Like StoreScriptErrors(), but just posts a single string message
594 private void StoreScriptError(UUID itemId, string message)
595 {
596 ArrayList errors = new ArrayList(1);
597 errors.Add(message);
598 StoreScriptErrors(itemId, errors);
599 }
600
453 /// <summary> 601 /// <summary>
454 /// Stop and remove a script which is in this prim's inventory. 602 /// Stop and remove a script which is in this prim's inventory.
455 /// </summary> 603 /// </summary>
@@ -460,15 +608,7 @@ namespace OpenSim.Region.Framework.Scenes
460 /// </param> 608 /// </param>
461 public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted) 609 public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted)
462 { 610 {
463 bool scriptPresent = false; 611 if (m_items.ContainsKey(itemId))
464
465 lock (m_items)
466 {
467 if (m_items.ContainsKey(itemId))
468 scriptPresent = true;
469 }
470
471 if (scriptPresent)
472 { 612 {
473 if (!sceneObjectBeingDeleted) 613 if (!sceneObjectBeingDeleted)
474 m_part.RemoveScriptEvents(itemId); 614 m_part.RemoveScriptEvents(itemId);
@@ -538,14 +678,16 @@ namespace OpenSim.Region.Framework.Scenes
538 /// <returns></returns> 678 /// <returns></returns>
539 private bool InventoryContainsName(string name) 679 private bool InventoryContainsName(string name)
540 { 680 {
541 lock (m_items) 681 m_items.LockItemsForRead(true);
682 foreach (TaskInventoryItem item in m_items.Values)
542 { 683 {
543 foreach (TaskInventoryItem item in m_items.Values) 684 if (item.Name == name)
544 { 685 {
545 if (item.Name == name) 686 m_items.LockItemsForRead(false);
546 return true; 687 return true;
547 } 688 }
548 } 689 }
690 m_items.LockItemsForRead(false);
549 return false; 691 return false;
550 } 692 }
551 693
@@ -587,8 +729,9 @@ namespace OpenSim.Region.Framework.Scenes
587 /// <param name="item"></param> 729 /// <param name="item"></param>
588 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop) 730 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop)
589 { 731 {
590 List<TaskInventoryItem> il = GetInventoryItems(); 732 m_items.LockItemsForRead(true);
591 733 List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_items.Values);
734 m_items.LockItemsForRead(false);
592 foreach (TaskInventoryItem i in il) 735 foreach (TaskInventoryItem i in il)
593 { 736 {
594 if (i.Name == item.Name) 737 if (i.Name == item.Name)
@@ -626,14 +769,14 @@ namespace OpenSim.Region.Framework.Scenes
626 item.Name = name; 769 item.Name = name;
627 item.GroupID = m_part.GroupID; 770 item.GroupID = m_part.GroupID;
628 771
629 lock (m_items) 772 m_items.LockItemsForWrite(true);
630 m_items.Add(item.ItemID, item); 773 m_items.Add(item.ItemID, item);
631 774 m_items.LockItemsForWrite(false);
632 if (allowedDrop) 775 if (allowedDrop)
633 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP); 776 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
634 else 777 else
635 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 778 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
636 779
637 m_inventorySerial++; 780 m_inventorySerial++;
638 //m_inventorySerial += 2; 781 //m_inventorySerial += 2;
639 HasInventoryChanged = true; 782 HasInventoryChanged = true;
@@ -649,15 +792,15 @@ namespace OpenSim.Region.Framework.Scenes
649 /// <param name="items"></param> 792 /// <param name="items"></param>
650 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items) 793 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items)
651 { 794 {
652 lock (m_items) 795 m_items.LockItemsForWrite(true);
796 foreach (TaskInventoryItem item in items)
653 { 797 {
654 foreach (TaskInventoryItem item in items) 798 m_items.Add(item.ItemID, item);
655 { 799// m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
656 m_items.Add(item.ItemID, item);
657// m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
658 }
659 m_inventorySerial++;
660 } 800 }
801 m_items.LockItemsForWrite(false);
802
803 m_inventorySerial++;
661 } 804 }
662 805
663 /// <summary> 806 /// <summary>
@@ -668,23 +811,24 @@ namespace OpenSim.Region.Framework.Scenes
668 public TaskInventoryItem GetInventoryItem(UUID itemId) 811 public TaskInventoryItem GetInventoryItem(UUID itemId)
669 { 812 {
670 TaskInventoryItem item; 813 TaskInventoryItem item;
671 814 m_items.LockItemsForRead(true);
672 lock (m_items) 815 m_items.TryGetValue(itemId, out item);
673 m_items.TryGetValue(itemId, out item); 816 m_items.LockItemsForRead(false);
674
675 return item; 817 return item;
676 } 818 }
677 819
678 public TaskInventoryItem GetInventoryItem(string name) 820 public TaskInventoryItem GetInventoryItem(string name)
679 { 821 {
680 lock (m_items) 822 m_items.LockItemsForRead(true);
823 foreach (TaskInventoryItem item in m_items.Values)
681 { 824 {
682 foreach (TaskInventoryItem item in m_items.Values) 825 if (item.Name == name)
683 { 826 {
684 if (item.Name == name) 827 m_items.LockItemsForRead(false);
685 return item; 828 return item;
686 } 829 }
687 } 830 }
831 m_items.LockItemsForRead(false);
688 832
689 return null; 833 return null;
690 } 834 }
@@ -693,15 +837,16 @@ namespace OpenSim.Region.Framework.Scenes
693 { 837 {
694 List<TaskInventoryItem> items = new List<TaskInventoryItem>(); 838 List<TaskInventoryItem> items = new List<TaskInventoryItem>();
695 839
696 lock (m_items) 840 m_items.LockItemsForRead(true);
841
842 foreach (TaskInventoryItem item in m_items.Values)
697 { 843 {
698 foreach (TaskInventoryItem item in m_items.Values) 844 if (item.Name == name)
699 { 845 items.Add(item);
700 if (item.Name == name)
701 items.Add(item);
702 }
703 } 846 }
704 847
848 m_items.LockItemsForRead(false);
849
705 return items; 850 return items;
706 } 851 }
707 852
@@ -720,6 +865,10 @@ namespace OpenSim.Region.Framework.Scenes
720 string xmlData = Utils.BytesToString(rezAsset.Data); 865 string xmlData = Utils.BytesToString(rezAsset.Data);
721 SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); 866 SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
722 867
868 group.RootPart.AttachPoint = group.RootPart.Shape.State;
869 group.RootPart.AttachOffset = group.AbsolutePosition;
870 group.RootPart.AttachRotation = group.GroupRotation;
871
723 group.ResetIDs(); 872 group.ResetIDs();
724 873
725 SceneObjectPart rootPart = group.GetPart(group.UUID); 874 SceneObjectPart rootPart = group.GetPart(group.UUID);
@@ -794,8 +943,9 @@ namespace OpenSim.Region.Framework.Scenes
794 943
795 public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents, bool considerChanged) 944 public bool UpdateInventoryItem(TaskInventoryItem item, bool fireScriptEvents, bool considerChanged)
796 { 945 {
797 TaskInventoryItem it = GetInventoryItem(item.ItemID); 946 m_items.LockItemsForWrite(true);
798 if (it != null) 947
948 if (m_items.ContainsKey(item.ItemID))
799 { 949 {
800// m_log.DebugFormat("[PRIM INVENTORY]: Updating item {0} in {1}", item.Name, m_part.Name); 950// m_log.DebugFormat("[PRIM INVENTORY]: Updating item {0} in {1}", item.Name, m_part.Name);
801 951
@@ -808,14 +958,10 @@ namespace OpenSim.Region.Framework.Scenes
808 item.GroupID = m_part.GroupID; 958 item.GroupID = m_part.GroupID;
809 959
810 if (item.AssetID == UUID.Zero) 960 if (item.AssetID == UUID.Zero)
811 item.AssetID = it.AssetID; 961 item.AssetID = m_items[item.ItemID].AssetID;
812 962
813 lock (m_items) 963 m_items[item.ItemID] = item;
814 { 964 m_inventorySerial++;
815 m_items[item.ItemID] = item;
816 m_inventorySerial++;
817 }
818
819 if (fireScriptEvents) 965 if (fireScriptEvents)
820 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 966 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
821 967
@@ -824,7 +970,7 @@ namespace OpenSim.Region.Framework.Scenes
824 HasInventoryChanged = true; 970 HasInventoryChanged = true;
825 m_part.ParentGroup.HasGroupChanged = true; 971 m_part.ParentGroup.HasGroupChanged = true;
826 } 972 }
827 973 m_items.LockItemsForWrite(false);
828 return true; 974 return true;
829 } 975 }
830 else 976 else
@@ -835,8 +981,9 @@ namespace OpenSim.Region.Framework.Scenes
835 item.ItemID, m_part.Name, m_part.UUID, 981 item.ItemID, m_part.Name, m_part.UUID,
836 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); 982 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
837 } 983 }
838 return false; 984 m_items.LockItemsForWrite(false);
839 985
986 return false;
840 } 987 }
841 988
842 /// <summary> 989 /// <summary>
@@ -847,43 +994,59 @@ namespace OpenSim.Region.Framework.Scenes
847 /// in this prim's inventory.</returns> 994 /// in this prim's inventory.</returns>
848 public int RemoveInventoryItem(UUID itemID) 995 public int RemoveInventoryItem(UUID itemID)
849 { 996 {
850 TaskInventoryItem item = GetInventoryItem(itemID); 997 m_items.LockItemsForRead(true);
851 if (item != null) 998
999 if (m_items.ContainsKey(itemID))
852 { 1000 {
853 int type = m_items[itemID].InvType; 1001 int type = m_items[itemID].InvType;
1002 m_items.LockItemsForRead(false);
854 if (type == 10) // Script 1003 if (type == 10) // Script
855 { 1004 {
856 m_part.RemoveScriptEvents(itemID);
857 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID); 1005 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
858 } 1006 }
1007 m_items.LockItemsForWrite(true);
859 m_items.Remove(itemID); 1008 m_items.Remove(itemID);
1009 m_items.LockItemsForWrite(false);
860 m_inventorySerial++; 1010 m_inventorySerial++;
861 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 1011 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
862 1012
863 HasInventoryChanged = true; 1013 HasInventoryChanged = true;
864 m_part.ParentGroup.HasGroupChanged = true; 1014 m_part.ParentGroup.HasGroupChanged = true;
865 1015
866 if (!ContainsScripts()) 1016 int scriptcount = 0;
1017 m_items.LockItemsForRead(true);
1018 foreach (TaskInventoryItem item in m_items.Values)
1019 {
1020 if (item.Type == 10)
1021 {
1022 scriptcount++;
1023 }
1024 }
1025 m_items.LockItemsForRead(false);
1026
1027
1028 if (scriptcount <= 0)
1029 {
867 m_part.RemFlag(PrimFlags.Scripted); 1030 m_part.RemFlag(PrimFlags.Scripted);
1031 }
868 1032
869 m_part.ScheduleFullUpdate(); 1033 m_part.ScheduleFullUpdate();
870 1034
871 return type; 1035 return type;
872
873 } 1036 }
874 else 1037 else
875 { 1038 {
1039 m_items.LockItemsForRead(false);
876 m_log.ErrorFormat( 1040 m_log.ErrorFormat(
877 "[PRIM INVENTORY]: " + 1041 "[PRIM INVENTORY]: " +
878 "Tried to remove item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory", 1042 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
879 itemID, m_part.Name, m_part.UUID, 1043 itemID, m_part.Name, m_part.UUID);
880 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
881 } 1044 }
882 1045
883 return -1; 1046 return -1;
884 } 1047 }
885 1048
886 private bool CreateInventoryFile() 1049 private bool CreateInventoryFileName()
887 { 1050 {
888// m_log.DebugFormat( 1051// m_log.DebugFormat(
889// "[PRIM INVENTORY]: Creating inventory file for {0} {1} {2}, serial {3}", 1052// "[PRIM INVENTORY]: Creating inventory file for {0} {1} {2}, serial {3}",
@@ -892,70 +1055,12 @@ namespace OpenSim.Region.Framework.Scenes
892 if (m_inventoryFileName == String.Empty || 1055 if (m_inventoryFileName == String.Empty ||
893 m_inventoryFileNameSerial < m_inventorySerial) 1056 m_inventoryFileNameSerial < m_inventorySerial)
894 { 1057 {
895 // Something changed, we need to create a new file
896 m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp"; 1058 m_inventoryFileName = "inventory_" + UUID.Random().ToString() + ".tmp";
897 m_inventoryFileNameSerial = m_inventorySerial; 1059 m_inventoryFileNameSerial = m_inventorySerial;
898 1060
899 InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
900
901 lock (m_items)
902 {
903 foreach (TaskInventoryItem item in m_items.Values)
904 {
905// m_log.DebugFormat(
906// "[PRIM INVENTORY]: Adding item {0} {1} for serial {2} on prim {3} {4} {5}",
907// item.Name, item.ItemID, m_inventorySerial, m_part.Name, m_part.UUID, m_part.LocalId);
908
909 UUID ownerID = item.OwnerID;
910 uint everyoneMask = 0;
911 uint baseMask = item.BasePermissions;
912 uint ownerMask = item.CurrentPermissions;
913 uint groupMask = item.GroupPermissions;
914
915 invString.AddItemStart();
916 invString.AddNameValueLine("item_id", item.ItemID.ToString());
917 invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
918
919 invString.AddPermissionsStart();
920
921 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
922 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
923 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
924 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
925 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
926
927 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
928 invString.AddNameValueLine("owner_id", ownerID.ToString());
929
930 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
931
932 invString.AddNameValueLine("group_id", item.GroupID.ToString());
933 invString.AddSectionEnd();
934
935 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
936 invString.AddNameValueLine("type", Utils.AssetTypeToString((AssetType)item.Type));
937 invString.AddNameValueLine("inv_type", Utils.InventoryTypeToString((InventoryType)item.InvType));
938 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
939
940 invString.AddSaleStart();
941 invString.AddNameValueLine("sale_type", "not");
942 invString.AddNameValueLine("sale_price", "0");
943 invString.AddSectionEnd();
944
945 invString.AddNameValueLine("name", item.Name + "|");
946 invString.AddNameValueLine("desc", item.Description + "|");
947
948 invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
949 invString.AddSectionEnd();
950 }
951 }
952
953 m_inventoryFileData = Utils.StringToBytes(invString.BuildString);
954
955 return true; 1061 return true;
956 } 1062 }
957 1063
958 // No need to recreate, the existing file is fine
959 return false; 1064 return false;
960 } 1065 }
961 1066
@@ -965,43 +1070,110 @@ namespace OpenSim.Region.Framework.Scenes
965 /// <param name="xferManager"></param> 1070 /// <param name="xferManager"></param>
966 public void RequestInventoryFile(IClientAPI client, IXfer xferManager) 1071 public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
967 { 1072 {
968 lock (m_items) 1073 bool changed = CreateInventoryFileName();
969 {
970 // Don't send a inventory xfer name if there are no items. Doing so causes viewer 3 to crash when rezzing
971 // a new script if any previous deletion has left the prim inventory empty.
972 if (m_items.Count == 0) // No inventory
973 {
974// m_log.DebugFormat(
975// "[PRIM INVENTORY]: Not sending inventory data for part {0} {1} {2} for {3} since no items",
976// m_part.Name, m_part.LocalId, m_part.UUID, client.Name);
977 1074
978 client.SendTaskInventory(m_part.UUID, 0, new byte[0]); 1075 bool includeAssets = false;
979 return; 1076 if (m_part.ParentGroup.Scene.Permissions.CanEditObjectInventory(m_part.UUID, client.AgentId))
980 } 1077 includeAssets = true;
1078
1079 if (m_inventoryPrivileged != includeAssets)
1080 changed = true;
981 1081
982 CreateInventoryFile(); 1082 InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
1083
1084 Items.LockItemsForRead(true);
1085
1086 if (m_inventorySerial == 0) // No inventory
1087 {
1088 client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
1089 Items.LockItemsForRead(false);
1090 return;
1091 }
1092
1093 if (m_items.Count == 0) // No inventory
1094 {
1095 client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
1096 Items.LockItemsForRead(false);
1097 return;
1098 }
983 1099
984 // In principle, we should only do the rest if the inventory changed; 1100 if (!changed)
985 // by sending m_inventorySerial to the client, it ought to know 1101 {
986 // that nothing changed and that it doesn't need to request the file.
987 // Unfortunately, it doesn't look like the client optimizes this;
988 // the client seems to always come back and request the Xfer,
989 // no matter what value m_inventorySerial has.
990 // FIXME: Could probably be > 0 here rather than > 2
991 if (m_inventoryFileData.Length > 2) 1102 if (m_inventoryFileData.Length > 2)
992 { 1103 {
993 // Add the file for Xfer 1104 xferManager.AddNewFile(m_inventoryFileName,
994 // m_log.DebugFormat( 1105 m_inventoryFileData);
995 // "[PRIM INVENTORY]: Adding inventory file {0} (length {1}) for transfer on {2} {3} {4}", 1106 client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
996 // m_inventoryFileName, m_inventoryFileData.Length, m_part.Name, m_part.UUID, m_part.LocalId); 1107 Util.StringToBytes256(m_inventoryFileName));
997 1108
998 xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData); 1109 Items.LockItemsForRead(false);
1110 return;
999 } 1111 }
1000
1001 // Tell the client we're ready to Xfer the file
1002 client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
1003 Util.StringToBytes256(m_inventoryFileName));
1004 } 1112 }
1113
1114 m_inventoryPrivileged = includeAssets;
1115
1116 foreach (TaskInventoryItem item in m_items.Values)
1117 {
1118 UUID ownerID = item.OwnerID;
1119 uint everyoneMask = 0;
1120 uint baseMask = item.BasePermissions;
1121 uint ownerMask = item.CurrentPermissions;
1122 uint groupMask = item.GroupPermissions;
1123
1124 invString.AddItemStart();
1125 invString.AddNameValueLine("item_id", item.ItemID.ToString());
1126 invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
1127
1128 invString.AddPermissionsStart();
1129
1130 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
1131 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
1132 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(groupMask));
1133 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
1134 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
1135
1136 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
1137 invString.AddNameValueLine("owner_id", ownerID.ToString());
1138
1139 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
1140
1141 invString.AddNameValueLine("group_id", item.GroupID.ToString());
1142 invString.AddSectionEnd();
1143
1144 if (includeAssets)
1145 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
1146 else
1147 invString.AddNameValueLine("asset_id", UUID.Zero.ToString());
1148 invString.AddNameValueLine("type", Utils.AssetTypeToString((AssetType)item.Type));
1149 invString.AddNameValueLine("inv_type", Utils.InventoryTypeToString((InventoryType)item.InvType));
1150 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
1151
1152 invString.AddSaleStart();
1153 invString.AddNameValueLine("sale_type", "not");
1154 invString.AddNameValueLine("sale_price", "0");
1155 invString.AddSectionEnd();
1156
1157 invString.AddNameValueLine("name", item.Name + "|");
1158 invString.AddNameValueLine("desc", item.Description + "|");
1159
1160 invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
1161 invString.AddSectionEnd();
1162 }
1163
1164 Items.LockItemsForRead(false);
1165
1166 m_inventoryFileData = Utils.StringToBytes(invString.BuildString);
1167
1168 if (m_inventoryFileData.Length > 2)
1169 {
1170 xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
1171 client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
1172 Util.StringToBytes256(m_inventoryFileName));
1173 return;
1174 }
1175
1176 client.SendTaskInventory(m_part.UUID, 0, new byte[0]);
1005 } 1177 }
1006 1178
1007 /// <summary> 1179 /// <summary>
@@ -1010,13 +1182,19 @@ namespace OpenSim.Region.Framework.Scenes
1010 /// <param name="datastore"></param> 1182 /// <param name="datastore"></param>
1011 public void ProcessInventoryBackup(ISimulationDataService datastore) 1183 public void ProcessInventoryBackup(ISimulationDataService datastore)
1012 { 1184 {
1013 if (HasInventoryChanged) 1185// Removed this because linking will cause an immediate delete of the new
1014 { 1186// child prim from the database and the subsequent storing of the prim sees
1015 HasInventoryChanged = false; 1187// the inventory of it as unchanged and doesn't store it at all. The overhead
1016 List<TaskInventoryItem> items = GetInventoryItems(); 1188// of storing prim inventory needlessly is much less than the aggravation
1017 datastore.StorePrimInventory(m_part.UUID, items); 1189// of prim inventory loss.
1190// if (HasInventoryChanged)
1191// {
1192 Items.LockItemsForRead(true);
1193 datastore.StorePrimInventory(m_part.UUID, Items.Values);
1194 Items.LockItemsForRead(false);
1018 1195
1019 } 1196 HasInventoryChanged = false;
1197// }
1020 } 1198 }
1021 1199
1022 public class InventoryStringBuilder 1200 public class InventoryStringBuilder
@@ -1082,87 +1260,63 @@ namespace OpenSim.Region.Framework.Scenes
1082 { 1260 {
1083 uint mask=0x7fffffff; 1261 uint mask=0x7fffffff;
1084 1262
1085 lock (m_items) 1263 foreach (TaskInventoryItem item in m_items.Values)
1086 { 1264 {
1087 foreach (TaskInventoryItem item in m_items.Values) 1265 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
1266 mask &= ~((uint)PermissionMask.Copy >> 13);
1267 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
1268 mask &= ~((uint)PermissionMask.Transfer >> 13);
1269 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
1270 mask &= ~((uint)PermissionMask.Modify >> 13);
1271
1272 if (item.InvType == (int)InventoryType.Object)
1088 { 1273 {
1089 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0) 1274 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
1090 mask &= ~((uint)PermissionMask.Copy >> 13); 1275 mask &= ~((uint)PermissionMask.Copy >> 13);
1091 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0) 1276 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
1092 mask &= ~((uint)PermissionMask.Transfer >> 13); 1277 mask &= ~((uint)PermissionMask.Transfer >> 13);
1093 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0) 1278 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1094 mask &= ~((uint)PermissionMask.Modify >> 13); 1279 mask &= ~((uint)PermissionMask.Modify >> 13);
1095
1096 if (item.InvType != (int)InventoryType.Object)
1097 {
1098 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
1099 mask &= ~((uint)PermissionMask.Copy >> 13);
1100 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
1101 mask &= ~((uint)PermissionMask.Transfer >> 13);
1102 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
1103 mask &= ~((uint)PermissionMask.Modify >> 13);
1104 }
1105 else
1106 {
1107 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
1108 mask &= ~((uint)PermissionMask.Copy >> 13);
1109 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
1110 mask &= ~((uint)PermissionMask.Transfer >> 13);
1111 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1112 mask &= ~((uint)PermissionMask.Modify >> 13);
1113 }
1114
1115 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
1116 mask &= ~(uint)PermissionMask.Copy;
1117 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
1118 mask &= ~(uint)PermissionMask.Transfer;
1119 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
1120 mask &= ~(uint)PermissionMask.Modify;
1121 } 1280 }
1281
1282 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
1283 mask &= ~(uint)PermissionMask.Copy;
1284 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
1285 mask &= ~(uint)PermissionMask.Transfer;
1286 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
1287 mask &= ~(uint)PermissionMask.Modify;
1122 } 1288 }
1123
1124 return mask; 1289 return mask;
1125 } 1290 }
1126 1291
1127 public void ApplyNextOwnerPermissions() 1292 public void ApplyNextOwnerPermissions()
1128 { 1293 {
1129 lock (m_items) 1294 foreach (TaskInventoryItem item in m_items.Values)
1130 { 1295 {
1131 foreach (TaskInventoryItem item in m_items.Values) 1296 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
1132 { 1297 {
1133// m_log.DebugFormat ( 1298 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
1134// "[SCENE OBJECT PART INVENTORY]: Applying next permissions {0} to {1} in {2} with current {3}, base {4}, everyone {5}", 1299 item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
1135// item.NextPermissions, item.Name, m_part.Name, item.CurrentPermissions, item.BasePermissions, item.EveryonePermissions); 1300 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
1136 1301 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
1137 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) 1302 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1138 { 1303 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
1139 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
1140 item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
1141 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
1142 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
1143 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
1144 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
1145 }
1146
1147 item.CurrentPermissions &= item.NextPermissions;
1148 item.BasePermissions &= item.NextPermissions;
1149 item.EveryonePermissions &= item.NextPermissions;
1150 item.OwnerChanged = true;
1151 item.PermsMask = 0;
1152 item.PermsGranter = UUID.Zero;
1153 } 1304 }
1305 item.CurrentPermissions &= item.NextPermissions;
1306 item.BasePermissions &= item.NextPermissions;
1307 item.EveryonePermissions &= item.NextPermissions;
1308 item.OwnerChanged = true;
1309 item.PermsMask = 0;
1310 item.PermsGranter = UUID.Zero;
1154 } 1311 }
1155 } 1312 }
1156 1313
1157 public void ApplyGodPermissions(uint perms) 1314 public void ApplyGodPermissions(uint perms)
1158 { 1315 {
1159 lock (m_items) 1316 foreach (TaskInventoryItem item in m_items.Values)
1160 { 1317 {
1161 foreach (TaskInventoryItem item in m_items.Values) 1318 item.CurrentPermissions = perms;
1162 { 1319 item.BasePermissions = perms;
1163 item.CurrentPermissions = perms;
1164 item.BasePermissions = perms;
1165 }
1166 } 1320 }
1167 1321
1168 m_inventorySerial++; 1322 m_inventorySerial++;
@@ -1175,14 +1329,11 @@ namespace OpenSim.Region.Framework.Scenes
1175 /// <returns></returns> 1329 /// <returns></returns>
1176 public bool ContainsScripts() 1330 public bool ContainsScripts()
1177 { 1331 {
1178 lock (m_items) 1332 foreach (TaskInventoryItem item in m_items.Values)
1179 { 1333 {
1180 foreach (TaskInventoryItem item in m_items.Values) 1334 if (item.InvType == (int)InventoryType.LSL)
1181 { 1335 {
1182 if (item.InvType == (int)InventoryType.LSL) 1336 return true;
1183 {
1184 return true;
1185 }
1186 } 1337 }
1187 } 1338 }
1188 1339
@@ -1196,17 +1347,15 @@ namespace OpenSim.Region.Framework.Scenes
1196 public int ScriptCount() 1347 public int ScriptCount()
1197 { 1348 {
1198 int count = 0; 1349 int count = 0;
1199 lock (m_items) 1350 Items.LockItemsForRead(true);
1351 foreach (TaskInventoryItem item in m_items.Values)
1200 { 1352 {
1201 foreach (TaskInventoryItem item in m_items.Values) 1353 if (item.InvType == (int)InventoryType.LSL)
1202 { 1354 {
1203 if (item.InvType == (int)InventoryType.LSL) 1355 count++;
1204 {
1205 count++;
1206 }
1207 } 1356 }
1208 } 1357 }
1209 1358 Items.LockItemsForRead(false);
1210 return count; 1359 return count;
1211 } 1360 }
1212 /// <summary> 1361 /// <summary>
@@ -1242,11 +1391,8 @@ namespace OpenSim.Region.Framework.Scenes
1242 { 1391 {
1243 List<UUID> ret = new List<UUID>(); 1392 List<UUID> ret = new List<UUID>();
1244 1393
1245 lock (m_items) 1394 foreach (TaskInventoryItem item in m_items.Values)
1246 { 1395 ret.Add(item.ItemID);
1247 foreach (TaskInventoryItem item in m_items.Values)
1248 ret.Add(item.ItemID);
1249 }
1250 1396
1251 return ret; 1397 return ret;
1252 } 1398 }
@@ -1255,8 +1401,9 @@ namespace OpenSim.Region.Framework.Scenes
1255 { 1401 {
1256 List<TaskInventoryItem> ret = new List<TaskInventoryItem>(); 1402 List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
1257 1403
1258 lock (m_items) 1404 Items.LockItemsForRead(true);
1259 ret = new List<TaskInventoryItem>(m_items.Values); 1405 ret = new List<TaskInventoryItem>(m_items.Values);
1406 Items.LockItemsForRead(false);
1260 1407
1261 return ret; 1408 return ret;
1262 } 1409 }
@@ -1265,18 +1412,24 @@ namespace OpenSim.Region.Framework.Scenes
1265 { 1412 {
1266 List<TaskInventoryItem> ret = new List<TaskInventoryItem>(); 1413 List<TaskInventoryItem> ret = new List<TaskInventoryItem>();
1267 1414
1268 lock (m_items) 1415 Items.LockItemsForRead(true);
1269 { 1416
1270 foreach (TaskInventoryItem item in m_items.Values) 1417 foreach (TaskInventoryItem item in m_items.Values)
1271 if (item.InvType == (int)type) 1418 if (item.InvType == (int)type)
1272 ret.Add(item); 1419 ret.Add(item);
1273 } 1420
1421 Items.LockItemsForRead(false);
1274 1422
1275 return ret; 1423 return ret;
1276 } 1424 }
1277 1425
1278 public Dictionary<UUID, string> GetScriptStates() 1426 public Dictionary<UUID, string> GetScriptStates()
1279 { 1427 {
1428 return GetScriptStates(false);
1429 }
1430
1431 public Dictionary<UUID, string> GetScriptStates(bool oldIDs)
1432 {
1280 Dictionary<UUID, string> ret = new Dictionary<UUID, string>(); 1433 Dictionary<UUID, string> ret = new Dictionary<UUID, string>();
1281 1434
1282 if (m_part.ParentGroup.Scene == null) // Group not in a scene 1435 if (m_part.ParentGroup.Scene == null) // Group not in a scene
@@ -1302,14 +1455,21 @@ namespace OpenSim.Region.Framework.Scenes
1302 string n = e.GetXMLState(item.ItemID); 1455 string n = e.GetXMLState(item.ItemID);
1303 if (n != String.Empty) 1456 if (n != String.Empty)
1304 { 1457 {
1305 if (!ret.ContainsKey(item.ItemID)) 1458 if (oldIDs)
1306 ret[item.ItemID] = n; 1459 {
1460 if (!ret.ContainsKey(item.OldItemID))
1461 ret[item.OldItemID] = n;
1462 }
1463 else
1464 {
1465 if (!ret.ContainsKey(item.ItemID))
1466 ret[item.ItemID] = n;
1467 }
1307 break; 1468 break;
1308 } 1469 }
1309 } 1470 }
1310 } 1471 }
1311 } 1472 }
1312
1313 return ret; 1473 return ret;
1314 } 1474 }
1315 1475
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5bf69ad..3e8c7e5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Region.Framework.Scenes
63 63
64 struct ScriptControllers 64 struct ScriptControllers
65 { 65 {
66 public UUID objectID;
66 public UUID itemID; 67 public UUID itemID;
67 public ScriptControlled ignoreControls; 68 public ScriptControlled ignoreControls;
68 public ScriptControlled eventControls; 69 public ScriptControlled eventControls;
@@ -98,7 +99,7 @@ namespace OpenSim.Region.Framework.Scenes
98 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis 99 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis
99 /// issue #1716 100 /// issue #1716
100 /// </summary> 101 /// </summary>
101 public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f); 102 public static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.4f);
102 103
103 /// <summary> 104 /// <summary>
104 /// Movement updates for agents in neighboring regions are sent directly to clients. 105 /// Movement updates for agents in neighboring regions are sent directly to clients.
@@ -170,6 +171,7 @@ namespace OpenSim.Region.Framework.Scenes
170// private int m_lastColCount = -1; //KF: Look for Collision chnages 171// private int m_lastColCount = -1; //KF: Look for Collision chnages
171// private int m_updateCount = 0; //KF: Update Anims for a while 172// private int m_updateCount = 0; //KF: Update Anims for a while
172// private static readonly int UPDATE_COUNT = 10; // how many frames to update for 173// private static readonly int UPDATE_COUNT = 10; // how many frames to update for
174 private List<uint> m_lastColliders = new List<uint>();
173 175
174 private TeleportFlags m_teleportFlags; 176 private TeleportFlags m_teleportFlags;
175 public TeleportFlags TeleportFlags 177 public TeleportFlags TeleportFlags
@@ -231,6 +233,13 @@ namespace OpenSim.Region.Framework.Scenes
231 //private int m_moveToPositionStateStatus; 233 //private int m_moveToPositionStateStatus;
232 //***************************************************** 234 //*****************************************************
233 235
236 private bool m_collisionEventFlag = false;
237 private object m_collisionEventLock = new Object();
238
239 private int m_movementAnimationUpdateCounter = 0;
240
241 private Vector3 m_prevSitOffset;
242
234 protected AvatarAppearance m_appearance; 243 protected AvatarAppearance m_appearance;
235 244
236 public AvatarAppearance Appearance 245 public AvatarAppearance Appearance
@@ -425,7 +434,7 @@ namespace OpenSim.Region.Framework.Scenes
425 get { return (IClientCore)ControllingClient; } 434 get { return (IClientCore)ControllingClient; }
426 } 435 }
427 436
428 public Vector3 ParentPosition { get; set; } 437// public Vector3 ParentPosition { get; set; }
429 438
430 /// <summary> 439 /// <summary>
431 /// Position of this avatar relative to the region the avatar is in 440 /// Position of this avatar relative to the region the avatar is in
@@ -483,7 +492,7 @@ namespace OpenSim.Region.Framework.Scenes
483 if (ParentID == 0) 492 if (ParentID == 0)
484 { 493 {
485 m_pos = value; 494 m_pos = value;
486 ParentPosition = Vector3.Zero; 495// ParentPosition = Vector3.Zero;
487 } 496 }
488 497
489 //m_log.DebugFormat( 498 //m_log.DebugFormat(
@@ -572,6 +581,13 @@ namespace OpenSim.Region.Framework.Scenes
572 /// </summary> 581 /// </summary>
573 public uint ParentID { get; set; } 582 public uint ParentID { get; set; }
574 583
584 public UUID ParentUUID
585 {
586 get { return m_parentUUID; }
587 set { m_parentUUID = value; }
588 }
589 private UUID m_parentUUID = UUID.Zero;
590
575 /// <summary> 591 /// <summary>
576 /// Are we sitting on an object? 592 /// Are we sitting on an object?
577 /// </summary> 593 /// </summary>
@@ -738,6 +754,33 @@ namespace OpenSim.Region.Framework.Scenes
738 Appearance = appearance; 754 Appearance = appearance;
739 } 755 }
740 756
757 private void RegionHeartbeatEnd(Scene scene)
758 {
759 if (IsChildAgent)
760 return;
761
762 m_movementAnimationUpdateCounter ++;
763 if (m_movementAnimationUpdateCounter >= 2)
764 {
765 m_movementAnimationUpdateCounter = 0;
766 if (Animator != null)
767 {
768 // If the parentID == 0 we are not sitting
769 // if !SitGournd then we are not sitting on the ground
770 // Fairly straightforward, now here comes the twist
771 // if ParentUUID is NOT UUID.Zero, we are looking to
772 // be sat on an object that isn't there yet. Should
773 // be treated as if sat.
774 if(ParentID == 0 && !SitGround && ParentUUID == UUID.Zero) // skip it if sitting
775 Animator.UpdateMovementAnimations();
776 }
777 else
778 {
779 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
780 }
781 }
782 }
783
741 public void RegisterToEvents() 784 public void RegisterToEvents()
742 { 785 {
743 ControllingClient.OnCompleteMovementToRegion += CompleteMovement; 786 ControllingClient.OnCompleteMovementToRegion += CompleteMovement;
@@ -747,6 +790,7 @@ namespace OpenSim.Region.Framework.Scenes
747 ControllingClient.OnSetAlwaysRun += HandleSetAlwaysRun; 790 ControllingClient.OnSetAlwaysRun += HandleSetAlwaysRun;
748 ControllingClient.OnStartAnim += HandleStartAnim; 791 ControllingClient.OnStartAnim += HandleStartAnim;
749 ControllingClient.OnStopAnim += HandleStopAnim; 792 ControllingClient.OnStopAnim += HandleStopAnim;
793 ControllingClient.OnChangeAnim += avnHandleChangeAnim;
750 ControllingClient.OnForceReleaseControls += HandleForceReleaseControls; 794 ControllingClient.OnForceReleaseControls += HandleForceReleaseControls;
751 ControllingClient.OnAutoPilotGo += MoveToTarget; 795 ControllingClient.OnAutoPilotGo += MoveToTarget;
752 796
@@ -807,10 +851,39 @@ namespace OpenSim.Region.Framework.Scenes
807 "[SCENE]: Upgrading child to root agent for {0} in {1}", 851 "[SCENE]: Upgrading child to root agent for {0} in {1}",
808 Name, m_scene.RegionInfo.RegionName); 852 Name, m_scene.RegionInfo.RegionName);
809 853
810 //m_log.DebugFormat("[SCENE]: known regions in {0}: {1}", Scene.RegionInfo.RegionName, KnownChildRegionHandles.Count);
811
812 bool wasChild = IsChildAgent; 854 bool wasChild = IsChildAgent;
813 IsChildAgent = false; 855
856 if (ParentUUID != UUID.Zero)
857 {
858 m_log.DebugFormat("[SCENE PRESENCE]: Sitting avatar back on prim {0}", ParentUUID);
859 SceneObjectPart part = m_scene.GetSceneObjectPart(ParentUUID);
860 if (part == null)
861 {
862 m_log.ErrorFormat("[SCENE PRESENCE]: Can't find prim {0} to sit on", ParentUUID);
863 }
864 else
865 {
866 part.ParentGroup.AddAvatar(UUID);
867 if (part.SitTargetPosition != Vector3.Zero)
868 part.SitTargetAvatar = UUID;
869// ParentPosition = part.GetWorldPosition();
870 ParentID = part.LocalId;
871 ParentPart = part;
872 m_pos = m_prevSitOffset;
873// pos = ParentPosition;
874 pos = part.GetWorldPosition();
875 }
876 ParentUUID = UUID.Zero;
877
878 IsChildAgent = false;
879
880// Animator.TrySetMovementAnimation("SIT");
881 }
882 else
883 {
884 IsChildAgent = false;
885 }
886
814 887
815 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); 888 IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
816 if (gm != null) 889 if (gm != null)
@@ -820,62 +893,72 @@ namespace OpenSim.Region.Framework.Scenes
820 893
821 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene); 894 m_scene.EventManager.TriggerSetRootAgentScene(m_uuid, m_scene);
822 895
823 // Moved this from SendInitialData to ensure that Appearance is initialized 896 if (ParentID == 0)
824 // before the inventory is processed in MakeRootAgent. This fixes a race condition
825 // related to the handling of attachments
826 //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
827 if (m_scene.TestBorderCross(pos, Cardinals.E))
828 { 897 {
829 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); 898 // Moved this from SendInitialData to ensure that Appearance is initialized
830 pos.X = crossedBorder.BorderLine.Z - 1; 899 // before the inventory is processed in MakeRootAgent. This fixes a race condition
831 } 900 // related to the handling of attachments
901 //m_scene.GetAvatarAppearance(ControllingClient, out Appearance);
902 if (m_scene.TestBorderCross(pos, Cardinals.E))
903 {
904 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E);
905 pos.X = crossedBorder.BorderLine.Z - 1;
906 }
832 907
833 if (m_scene.TestBorderCross(pos, Cardinals.N)) 908 if (m_scene.TestBorderCross(pos, Cardinals.N))
834 { 909 {
835 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N); 910 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
836 pos.Y = crossedBorder.BorderLine.Z - 1; 911 pos.Y = crossedBorder.BorderLine.Z - 1;
837 } 912 }
838 913
839 CheckAndAdjustLandingPoint(ref pos); 914 CheckAndAdjustLandingPoint(ref pos);
840 915
841 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f) 916 if (pos.X < 0f || pos.Y < 0f || pos.Z < 0f)
842 { 917 {
843 m_log.WarnFormat( 918 m_log.WarnFormat(
844 "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping", 919 "[SCENE PRESENCE]: MakeRootAgent() was given an illegal position of {0} for avatar {1}, {2}. Clamping",
845 pos, Name, UUID); 920 pos, Name, UUID);
846 921
847 if (pos.X < 0f) pos.X = 0f; 922 if (pos.X < 0f) pos.X = 0f;
848 if (pos.Y < 0f) pos.Y = 0f; 923 if (pos.Y < 0f) pos.Y = 0f;
849 if (pos.Z < 0f) pos.Z = 0f; 924 if (pos.Z < 0f) pos.Z = 0f;
850 } 925 }
851 926
852 float localAVHeight = 1.56f; 927 float localAVHeight = 1.56f;
853 if (Appearance.AvatarHeight > 0) 928 if (Appearance.AvatarHeight > 0)
854 localAVHeight = Appearance.AvatarHeight; 929 localAVHeight = Appearance.AvatarHeight;
855 930
856 float posZLimit = 0; 931 float posZLimit = 0;
857 932
858 if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize) 933 if (pos.X < Constants.RegionSize && pos.Y < Constants.RegionSize)
859 posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y]; 934 posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y];
860 935
861 float newPosZ = posZLimit + localAVHeight / 2; 936 float newPosZ = posZLimit + localAVHeight / 2;
862 if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) 937 if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
863 { 938 {
864 pos.Z = newPosZ; 939 pos.Z = newPosZ;
865 } 940 }
866 AbsolutePosition = pos; 941 AbsolutePosition = pos;
867 942
868 AddToPhysicalScene(isFlying); 943 if (m_teleportFlags == TeleportFlags.Default)
944 {
945 Vector3 vel = Velocity;
946 AddToPhysicalScene(isFlying);
947 if (PhysicsActor != null)
948 PhysicsActor.SetMomentum(vel);
949 }
950 else
951 AddToPhysicalScene(isFlying);
869 952
870 if (ForceFly) 953 if (ForceFly)
871 { 954 {
872 Flying = true; 955 Flying = true;
873 } 956 }
874 else if (FlyDisabled) 957 else if (FlyDisabled)
875 { 958 {
876 Flying = false; 959 Flying = false;
960 }
877 } 961 }
878
879 // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying 962 // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying
880 // avatar to return to the standing position in mid-air. On login it looks like this is being sent 963 // avatar to return to the standing position in mid-air. On login it looks like this is being sent
881 // elsewhere anyway 964 // elsewhere anyway
@@ -895,14 +978,19 @@ namespace OpenSim.Region.Framework.Scenes
895 "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name); 978 "[SCENE PRESENCE]: Restarting scripts in attachments for {0} in {1}", Name, Scene.Name);
896 979
897 // Resume scripts 980 // Resume scripts
898 foreach (SceneObjectGroup sog in m_attachments) 981 Util.FireAndForget(delegate(object x) {
899 { 982 foreach (SceneObjectGroup sog in m_attachments)
900 sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); 983 {
901 sog.ResumeScripts(); 984 sog.ScheduleGroupForFullUpdate();
902 } 985 sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
986 sog.ResumeScripts();
987 }
988 });
903 } 989 }
904 } 990 }
905 991
992 SendAvatarDataToAllAgents();
993
906 // send the animations of the other presences to me 994 // send the animations of the other presences to me
907 m_scene.ForEachRootScenePresence(delegate(ScenePresence presence) 995 m_scene.ForEachRootScenePresence(delegate(ScenePresence presence)
908 { 996 {
@@ -913,9 +1001,12 @@ namespace OpenSim.Region.Framework.Scenes
913 // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will 1001 // If we don't reset the movement flag here, an avatar that crosses to a neighbouring sim and returns will
914 // stall on the border crossing since the existing child agent will still have the last movement 1002 // stall on the border crossing since the existing child agent will still have the last movement
915 // recorded, which stops the input from being processed. 1003 // recorded, which stops the input from being processed.
1004
916 MovementFlag = 0; 1005 MovementFlag = 0;
917 1006
918 m_scene.EventManager.TriggerOnMakeRootAgent(this); 1007 m_scene.EventManager.TriggerOnMakeRootAgent(this);
1008
1009 m_scene.EventManager.OnRegionHeartbeatEnd += RegionHeartbeatEnd;
919 } 1010 }
920 1011
921 public int GetStateSource() 1012 public int GetStateSource()
@@ -943,12 +1034,16 @@ namespace OpenSim.Region.Framework.Scenes
943 /// </remarks> 1034 /// </remarks>
944 public void MakeChildAgent() 1035 public void MakeChildAgent()
945 { 1036 {
1037 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
1038
946 m_log.DebugFormat("[SCENE PRESENCE]: Making {0} a child agent in {1}", Name, Scene.RegionInfo.RegionName); 1039 m_log.DebugFormat("[SCENE PRESENCE]: Making {0} a child agent in {1}", Name, Scene.RegionInfo.RegionName);
947 1040
948 // Reset these so that teleporting in and walking out isn't seen 1041 // Reset these so that teleporting in and walking out isn't seen
949 // as teleporting back 1042 // as teleporting back
950 TeleportFlags = TeleportFlags.Default; 1043 TeleportFlags = TeleportFlags.Default;
951 1044
1045 MovementFlag = 0;
1046
952 // It looks like Animator is set to null somewhere, and MakeChild 1047 // It looks like Animator is set to null somewhere, and MakeChild
953 // is called after that. Probably in aborted teleports. 1048 // is called after that. Probably in aborted teleports.
954 if (Animator == null) 1049 if (Animator == null)
@@ -956,6 +1051,7 @@ namespace OpenSim.Region.Framework.Scenes
956 else 1051 else
957 Animator.ResetAnimations(); 1052 Animator.ResetAnimations();
958 1053
1054
959// m_log.DebugFormat( 1055// m_log.DebugFormat(
960// "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", 1056// "[SCENE PRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
961// Name, UUID, m_scene.RegionInfo.RegionName); 1057// Name, UUID, m_scene.RegionInfo.RegionName);
@@ -967,6 +1063,7 @@ namespace OpenSim.Region.Framework.Scenes
967 IsChildAgent = true; 1063 IsChildAgent = true;
968 m_scene.SwapRootAgentCount(true); 1064 m_scene.SwapRootAgentCount(true);
969 RemoveFromPhysicalScene(); 1065 RemoveFromPhysicalScene();
1066 ParentID = 0; // Child agents can't be sitting
970 1067
971 // FIXME: Set RegionHandle to the region handle of the scene this agent is moving into 1068 // FIXME: Set RegionHandle to the region handle of the scene this agent is moving into
972 1069
@@ -982,9 +1079,9 @@ namespace OpenSim.Region.Framework.Scenes
982 { 1079 {
983// PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients; 1080// PhysicsActor.OnRequestTerseUpdate -= SendTerseUpdateToAllClients;
984 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall; 1081 PhysicsActor.OnOutOfBounds -= OutOfBoundsCall;
985 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
986 PhysicsActor.UnSubscribeEvents();
987 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate; 1082 PhysicsActor.OnCollisionUpdate -= PhysicsCollisionUpdate;
1083 PhysicsActor.UnSubscribeEvents();
1084 m_scene.PhysicsScene.RemoveAvatar(PhysicsActor);
988 PhysicsActor = null; 1085 PhysicsActor = null;
989 } 1086 }
990// else 1087// else
@@ -1001,7 +1098,7 @@ namespace OpenSim.Region.Framework.Scenes
1001 /// <param name="pos"></param> 1098 /// <param name="pos"></param>
1002 public void Teleport(Vector3 pos) 1099 public void Teleport(Vector3 pos)
1003 { 1100 {
1004 TeleportWithMomentum(pos, null); 1101 TeleportWithMomentum(pos, Vector3.Zero);
1005 } 1102 }
1006 1103
1007 public void TeleportWithMomentum(Vector3 pos, Vector3? v) 1104 public void TeleportWithMomentum(Vector3 pos, Vector3? v)
@@ -1025,6 +1122,41 @@ namespace OpenSim.Region.Framework.Scenes
1025 SendTerseUpdateToAllClients(); 1122 SendTerseUpdateToAllClients();
1026 } 1123 }
1027 1124
1125 public void avnLocalTeleport(Vector3 newpos, Vector3? newvel, bool rotateToVelXY)
1126 {
1127 CheckLandingPoint(ref newpos);
1128 AbsolutePosition = newpos;
1129
1130 if (newvel.HasValue)
1131 {
1132 if ((Vector3)newvel == Vector3.Zero)
1133 {
1134 if (PhysicsActor != null)
1135 PhysicsActor.SetMomentum(Vector3.Zero);
1136 m_velocity = Vector3.Zero;
1137 }
1138 else
1139 {
1140 if (PhysicsActor != null)
1141 PhysicsActor.SetMomentum((Vector3)newvel);
1142 m_velocity = (Vector3)newvel;
1143
1144 if (rotateToVelXY)
1145 {
1146 Vector3 lookAt = (Vector3)newvel;
1147 lookAt.Z = 0;
1148 lookAt.Normalize();
1149 ControllingClient.SendLocalTeleport(newpos, lookAt, (uint)TeleportFlags.ViaLocation);
1150 return;
1151 }
1152 }
1153 }
1154
1155 SendTerseUpdateToAllClients();
1156 }
1157
1158
1159
1028 public void StopFlying() 1160 public void StopFlying()
1029 { 1161 {
1030 ControllingClient.StopFlying(this); 1162 ControllingClient.StopFlying(this);
@@ -1340,8 +1472,18 @@ namespace OpenSim.Region.Framework.Scenes
1340 { 1472 {
1341 if (m_followCamAuto) 1473 if (m_followCamAuto)
1342 { 1474 {
1343 Vector3 posAdjusted = m_pos + HEAD_ADJUSTMENT; 1475 // Vector3 posAdjusted = m_pos + HEAD_ADJUSTMENT;
1344 m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(CameraPosition - posAdjusted), Vector3.Distance(CameraPosition, posAdjusted) + 0.3f, RayCastCameraCallback); 1476 // m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(CameraPosition - posAdjusted), Vector3.Distance(CameraPosition, posAdjusted) + 0.3f, RayCastCameraCallback);
1477
1478 Vector3 posAdjusted = AbsolutePosition + HEAD_ADJUSTMENT;
1479 Vector3 distTocam = CameraPosition - posAdjusted;
1480 float distTocamlen = distTocam.Length();
1481 if (distTocamlen > 0)
1482 {
1483 distTocam *= 1.0f / distTocamlen;
1484 m_scene.PhysicsScene.RaycastWorld(posAdjusted, distTocam, distTocamlen + 0.3f, RayCastCameraCallback);
1485 }
1486
1345 } 1487 }
1346 } 1488 }
1347 1489
@@ -1780,12 +1922,17 @@ namespace OpenSim.Region.Framework.Scenes
1780// m_log.DebugFormat("[SCENE PRESENCE]: StandUp() for {0}", Name); 1922// m_log.DebugFormat("[SCENE PRESENCE]: StandUp() for {0}", Name);
1781 1923
1782 SitGround = false; 1924 SitGround = false;
1925
1926/* move this down so avatar gets physical in the new position and not where it is siting
1783 if (PhysicsActor == null) 1927 if (PhysicsActor == null)
1784 AddToPhysicalScene(false); 1928 AddToPhysicalScene(false);
1929 */
1785 1930
1786 if (ParentID != 0) 1931 if (ParentID != 0)
1787 { 1932 {
1788 SceneObjectPart part = ParentPart; 1933 SceneObjectPart part = ParentPart;
1934 UnRegisterSeatControls(part.ParentGroup.UUID);
1935
1789 TaskInventoryDictionary taskIDict = part.TaskInventory; 1936 TaskInventoryDictionary taskIDict = part.TaskInventory;
1790 if (taskIDict != null) 1937 if (taskIDict != null)
1791 { 1938 {
@@ -1801,14 +1948,22 @@ namespace OpenSim.Region.Framework.Scenes
1801 } 1948 }
1802 } 1949 }
1803 1950
1804 ParentPosition = part.GetWorldPosition(); 1951 part.ParentGroup.DeleteAvatar(UUID);
1952// ParentPosition = part.GetWorldPosition();
1805 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 1953 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
1806 1954
1807 m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight); 1955// m_pos += ParentPosition + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
1808 ParentPosition = Vector3.Zero; 1956// ParentPosition = Vector3.Zero;
1957 m_pos = part.AbsolutePosition + (m_pos * part.GetWorldRotation()) + new Vector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
1958 if (part.SitTargetAvatar == UUID)
1959 m_bodyRot = part.GetWorldRotation() * part.SitTargetOrientation;
1809 1960
1810 ParentID = 0; 1961 ParentID = 0;
1811 ParentPart = null; 1962 ParentPart = null;
1963
1964 if (PhysicsActor == null)
1965 AddToPhysicalScene(false);
1966
1812 SendAvatarDataToAllAgents(); 1967 SendAvatarDataToAllAgents();
1813 m_requestedSitTargetID = 0; 1968 m_requestedSitTargetID = 0;
1814 1969
@@ -1818,6 +1973,9 @@ namespace OpenSim.Region.Framework.Scenes
1818 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK); 1973 part.ParentGroup.TriggerScriptChangedEvent(Changed.LINK);
1819 } 1974 }
1820 1975
1976 else if (PhysicsActor == null)
1977 AddToPhysicalScene(false);
1978
1821 Animator.TrySetMovementAnimation("STAND"); 1979 Animator.TrySetMovementAnimation("STAND");
1822 } 1980 }
1823 1981
@@ -1869,7 +2027,7 @@ namespace OpenSim.Region.Framework.Scenes
1869 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it 2027 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
1870 2028
1871 if (PhysicsActor != null) 2029 if (PhysicsActor != null)
1872 m_sitAvatarHeight = PhysicsActor.Size.Z; 2030 m_sitAvatarHeight = PhysicsActor.Size.Z * 0.5f;
1873 2031
1874 bool canSit = false; 2032 bool canSit = false;
1875 Vector3 pos = part.AbsolutePosition + offset; 2033 Vector3 pos = part.AbsolutePosition + offset;
@@ -1918,7 +2076,7 @@ namespace OpenSim.Region.Framework.Scenes
1918 forceMouselook = part.GetForceMouselook(); 2076 forceMouselook = part.GetForceMouselook();
1919 2077
1920 ControllingClient.SendSitResponse( 2078 ControllingClient.SendSitResponse(
1921 targetID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); 2079 part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
1922 2080
1923 m_requestedSitTargetUUID = targetID; 2081 m_requestedSitTargetUUID = targetID;
1924 2082
@@ -1932,6 +2090,9 @@ namespace OpenSim.Region.Framework.Scenes
1932 2090
1933 public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset) 2091 public void HandleAgentRequestSit(IClientAPI remoteClient, UUID agentID, UUID targetID, Vector3 offset)
1934 { 2092 {
2093 if (IsChildAgent)
2094 return;
2095
1935 if (ParentID != 0) 2096 if (ParentID != 0)
1936 { 2097 {
1937 StandUp(); 2098 StandUp();
@@ -2209,14 +2370,39 @@ namespace OpenSim.Region.Framework.Scenes
2209 2370
2210 //Quaternion result = (sitTargetOrient * vq) * nq; 2371 //Quaternion result = (sitTargetOrient * vq) * nq;
2211 2372
2212 m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT; 2373 double x, y, z, m;
2374
2375 Quaternion r = sitTargetOrient;
2376 m = r.X * r.X + r.Y * r.Y + r.Z * r.Z + r.W * r.W;
2377
2378 if (Math.Abs(1.0 - m) > 0.000001)
2379 {
2380 m = 1.0 / Math.Sqrt(m);
2381 r.X *= (float)m;
2382 r.Y *= (float)m;
2383 r.Z *= (float)m;
2384 r.W *= (float)m;
2385 }
2386
2387 x = 2 * (r.X * r.Z + r.Y * r.W);
2388 y = 2 * (-r.X * r.W + r.Y * r.Z);
2389 z = -r.X * r.X - r.Y * r.Y + r.Z * r.Z + r.W * r.W;
2390
2391 Vector3 up = new Vector3((float)x, (float)y, (float)z);
2392 Vector3 sitOffset = up * Appearance.AvatarHeight * 0.02638f;
2393
2394 m_pos = sitTargetPos + sitOffset + SIT_TARGET_ADJUSTMENT;
2395
2396// m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT - sitOffset;
2213 Rotation = sitTargetOrient; 2397 Rotation = sitTargetOrient;
2214 ParentPosition = part.AbsolutePosition; 2398// ParentPosition = part.AbsolutePosition;
2399 part.ParentGroup.AddAvatar(UUID);
2215 } 2400 }
2216 else 2401 else
2217 { 2402 {
2218 m_pos -= part.AbsolutePosition; 2403 m_pos -= part.AbsolutePosition;
2219 ParentPosition = part.AbsolutePosition; 2404// ParentPosition = part.AbsolutePosition;
2405 part.ParentGroup.AddAvatar(UUID);
2220 2406
2221// m_log.DebugFormat( 2407// m_log.DebugFormat(
2222// "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target", 2408// "[SCENE PRESENCE]: Sitting {0} at position {1} ({2} + {3}) on part {4} {5} without sit target",
@@ -2261,6 +2447,13 @@ namespace OpenSim.Region.Framework.Scenes
2261 Animator.RemoveAnimation(animID); 2447 Animator.RemoveAnimation(animID);
2262 } 2448 }
2263 2449
2450 public void avnHandleChangeAnim(UUID animID, bool addRemove,bool sendPack)
2451 {
2452 Animator.avnChangeAnim(animID, addRemove, sendPack);
2453 }
2454
2455
2456
2264 /// <summary> 2457 /// <summary>
2265 /// Rotate the avatar to the given rotation and apply a movement in the given relative vector 2458 /// Rotate the avatar to the given rotation and apply a movement in the given relative vector
2266 /// </summary> 2459 /// </summary>
@@ -2314,14 +2507,15 @@ namespace OpenSim.Region.Framework.Scenes
2314 direc.Z *= 2.6f; 2507 direc.Z *= 2.6f;
2315 2508
2316 // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored. 2509 // TODO: PreJump and jump happen too quickly. Many times prejump gets ignored.
2317 Animator.TrySetMovementAnimation("PREJUMP"); 2510// Animator.TrySetMovementAnimation("PREJUMP");
2318 Animator.TrySetMovementAnimation("JUMP"); 2511// Animator.TrySetMovementAnimation("JUMP");
2319 } 2512 }
2320 } 2513 }
2321 } 2514 }
2322 2515
2323 // TODO: Add the force instead of only setting it to support multiple forces per frame? 2516 // TODO: Add the force instead of only setting it to support multiple forces per frame?
2324 m_forceToApply = direc; 2517 m_forceToApply = direc;
2518 Animator.UpdateMovementAnimations();
2325 } 2519 }
2326 2520
2327 #endregion 2521 #endregion
@@ -2713,8 +2907,9 @@ namespace OpenSim.Region.Framework.Scenes
2713 2907
2714 // If we don't have a PhysActor, we can't cross anyway 2908 // If we don't have a PhysActor, we can't cross anyway
2715 // Also don't do this while sat, sitting avatars cross with the 2909 // Also don't do this while sat, sitting avatars cross with the
2716 // object they sit on. 2910 // object they sit on. ParentUUID denoted a pending sit, don't
2717 if (ParentID != 0 || PhysicsActor == null) 2911 // interfere with it.
2912 if (ParentID != 0 || PhysicsActor == null || ParentUUID != UUID.Zero)
2718 return; 2913 return;
2719 2914
2720 if (!IsInTransit) 2915 if (!IsInTransit)
@@ -3055,6 +3250,9 @@ namespace OpenSim.Region.Framework.Scenes
3055 cAgent.AlwaysRun = SetAlwaysRun; 3250 cAgent.AlwaysRun = SetAlwaysRun;
3056 3251
3057 cAgent.Appearance = new AvatarAppearance(Appearance); 3252 cAgent.Appearance = new AvatarAppearance(Appearance);
3253
3254 cAgent.ParentPart = ParentUUID;
3255 cAgent.SitOffset = m_pos;
3058 3256
3059 lock (scriptedcontrols) 3257 lock (scriptedcontrols)
3060 { 3258 {
@@ -3063,7 +3261,7 @@ namespace OpenSim.Region.Framework.Scenes
3063 3261
3064 foreach (ScriptControllers c in scriptedcontrols.Values) 3262 foreach (ScriptControllers c in scriptedcontrols.Values)
3065 { 3263 {
3066 controls[i++] = new ControllerData(c.itemID, (uint)c.ignoreControls, (uint)c.eventControls); 3264 controls[i++] = new ControllerData(c.objectID, c.itemID, (uint)c.ignoreControls, (uint)c.eventControls);
3067 } 3265 }
3068 cAgent.Controllers = controls; 3266 cAgent.Controllers = controls;
3069 } 3267 }
@@ -3074,6 +3272,7 @@ namespace OpenSim.Region.Framework.Scenes
3074 cAgent.Anims = Animator.Animations.ToArray(); 3272 cAgent.Anims = Animator.Animations.ToArray();
3075 } 3273 }
3076 catch { } 3274 catch { }
3275 cAgent.DefaultAnim = Animator.Animations.DefaultAnimation;
3077 3276
3078 if (Scene.AttachmentsModule != null) 3277 if (Scene.AttachmentsModule != null)
3079 Scene.AttachmentsModule.CopyAttachments(this, cAgent); 3278 Scene.AttachmentsModule.CopyAttachments(this, cAgent);
@@ -3094,6 +3293,8 @@ namespace OpenSim.Region.Framework.Scenes
3094 CameraAtAxis = cAgent.AtAxis; 3293 CameraAtAxis = cAgent.AtAxis;
3095 CameraLeftAxis = cAgent.LeftAxis; 3294 CameraLeftAxis = cAgent.LeftAxis;
3096 CameraUpAxis = cAgent.UpAxis; 3295 CameraUpAxis = cAgent.UpAxis;
3296 ParentUUID = cAgent.ParentPart;
3297 m_prevSitOffset = cAgent.SitOffset;
3097 3298
3098 // When we get to the point of re-computing neighbors everytime this 3299 // When we get to the point of re-computing neighbors everytime this
3099 // changes, then start using the agent's drawdistance rather than the 3300 // changes, then start using the agent's drawdistance rather than the
@@ -3131,6 +3332,7 @@ namespace OpenSim.Region.Framework.Scenes
3131 foreach (ControllerData c in cAgent.Controllers) 3332 foreach (ControllerData c in cAgent.Controllers)
3132 { 3333 {
3133 ScriptControllers sc = new ScriptControllers(); 3334 ScriptControllers sc = new ScriptControllers();
3335 sc.objectID = c.ObjectID;
3134 sc.itemID = c.ItemID; 3336 sc.itemID = c.ItemID;
3135 sc.ignoreControls = (ScriptControlled)c.IgnoreControls; 3337 sc.ignoreControls = (ScriptControlled)c.IgnoreControls;
3136 sc.eventControls = (ScriptControlled)c.EventControls; 3338 sc.eventControls = (ScriptControlled)c.EventControls;
@@ -3145,6 +3347,8 @@ namespace OpenSim.Region.Framework.Scenes
3145 // FIXME: Why is this null check necessary? Where are the cases where we get a null Anims object? 3347 // FIXME: Why is this null check necessary? Where are the cases where we get a null Anims object?
3146 if (cAgent.Anims != null) 3348 if (cAgent.Anims != null)
3147 Animator.Animations.FromArray(cAgent.Anims); 3349 Animator.Animations.FromArray(cAgent.Anims);
3350 if (cAgent.DefaultAnim != null)
3351 Animator.Animations.SetDefaultAnimation(cAgent.DefaultAnim.AnimID, cAgent.DefaultAnim.SequenceNum, UUID.Zero);
3148 3352
3149 if (Scene.AttachmentsModule != null) 3353 if (Scene.AttachmentsModule != null)
3150 Scene.AttachmentsModule.CopyAttachments(cAgent, this); 3354 Scene.AttachmentsModule.CopyAttachments(cAgent, this);
@@ -3207,7 +3411,7 @@ namespace OpenSim.Region.Framework.Scenes
3207 //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; 3411 //PhysicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
3208 PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; 3412 PhysicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
3209 PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong 3413 PhysicsActor.OnOutOfBounds += OutOfBoundsCall; // Called for PhysicsActors when there's something wrong
3210 PhysicsActor.SubscribeEvents(500); 3414 PhysicsActor.SubscribeEvents(100);
3211 PhysicsActor.LocalID = LocalId; 3415 PhysicsActor.LocalID = LocalId;
3212 } 3416 }
3213 3417
@@ -3289,6 +3493,8 @@ namespace OpenSim.Region.Framework.Scenes
3289 } 3493 }
3290 } 3494 }
3291 3495
3496 RaiseCollisionScriptEvents(coldata);
3497
3292 // Gods do not take damage and Invulnerable is set depending on parcel/region flags 3498 // Gods do not take damage and Invulnerable is set depending on parcel/region flags
3293 if (Invulnerable || GodLevel > 0) 3499 if (Invulnerable || GodLevel > 0)
3294 return; 3500 return;
@@ -3386,6 +3592,13 @@ namespace OpenSim.Region.Framework.Scenes
3386 // m_reprioritizationTimer.Dispose(); 3592 // m_reprioritizationTimer.Dispose();
3387 3593
3388 RemoveFromPhysicalScene(); 3594 RemoveFromPhysicalScene();
3595
3596 m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
3597
3598// if (Animator != null)
3599// Animator.Close();
3600 Animator = null;
3601
3389 } 3602 }
3390 3603
3391 public void AddAttachment(SceneObjectGroup gobj) 3604 public void AddAttachment(SceneObjectGroup gobj)
@@ -3616,10 +3829,18 @@ namespace OpenSim.Region.Framework.Scenes
3616 3829
3617 public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, UUID Script_item_UUID) 3830 public void RegisterControlEventsToScript(int controls, int accept, int pass_on, uint Obj_localID, UUID Script_item_UUID)
3618 { 3831 {
3832 SceneObjectPart p = m_scene.GetSceneObjectPart(Obj_localID);
3833 if (p == null)
3834 return;
3835
3836 ControllingClient.SendTakeControls(controls, false, false);
3837 ControllingClient.SendTakeControls(controls, true, false);
3838
3619 ScriptControllers obj = new ScriptControllers(); 3839 ScriptControllers obj = new ScriptControllers();
3620 obj.ignoreControls = ScriptControlled.CONTROL_ZERO; 3840 obj.ignoreControls = ScriptControlled.CONTROL_ZERO;
3621 obj.eventControls = ScriptControlled.CONTROL_ZERO; 3841 obj.eventControls = ScriptControlled.CONTROL_ZERO;
3622 3842
3843 obj.objectID = p.ParentGroup.UUID;
3623 obj.itemID = Script_item_UUID; 3844 obj.itemID = Script_item_UUID;
3624 if (pass_on == 0 && accept == 0) 3845 if (pass_on == 0 && accept == 0)
3625 { 3846 {
@@ -3668,6 +3889,21 @@ namespace OpenSim.Region.Framework.Scenes
3668 ControllingClient.SendTakeControls(int.MaxValue, false, false); 3889 ControllingClient.SendTakeControls(int.MaxValue, false, false);
3669 } 3890 }
3670 3891
3892 private void UnRegisterSeatControls(UUID obj)
3893 {
3894 List<UUID> takers = new List<UUID>();
3895
3896 foreach (ScriptControllers c in scriptedcontrols.Values)
3897 {
3898 if (c.objectID == obj)
3899 takers.Add(c.itemID);
3900 }
3901 foreach (UUID t in takers)
3902 {
3903 UnRegisterControlEventsToScript(0, t);
3904 }
3905 }
3906
3671 public void UnRegisterControlEventsToScript(uint Obj_localID, UUID Script_item_UUID) 3907 public void UnRegisterControlEventsToScript(uint Obj_localID, UUID Script_item_UUID)
3672 { 3908 {
3673 ScriptControllers takecontrols; 3909 ScriptControllers takecontrols;
@@ -3986,6 +4222,12 @@ namespace OpenSim.Region.Framework.Scenes
3986 4222
3987 private void CheckAndAdjustLandingPoint(ref Vector3 pos) 4223 private void CheckAndAdjustLandingPoint(ref Vector3 pos)
3988 { 4224 {
4225 string reason;
4226
4227 // Honor bans
4228 if (!m_scene.TestLandRestrictions(UUID, out reason, ref pos.X, ref pos.Y))
4229 return;
4230
3989 SceneObjectGroup telehub = null; 4231 SceneObjectGroup telehub = null;
3990 if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject)) != null) 4232 if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject)) != null)
3991 { 4233 {
@@ -4025,11 +4267,206 @@ namespace OpenSim.Region.Framework.Scenes
4025 pos = land.LandData.UserLocation; 4267 pos = land.LandData.UserLocation;
4026 } 4268 }
4027 } 4269 }
4028 4270
4029 land.SendLandUpdateToClient(ControllingClient); 4271 land.SendLandUpdateToClient(ControllingClient);
4030 } 4272 }
4031 } 4273 }
4032 4274
4275 private DetectedObject CreateDetObject(SceneObjectPart obj)
4276 {
4277 DetectedObject detobj = new DetectedObject();
4278 detobj.keyUUID = obj.UUID;
4279 detobj.nameStr = obj.Name;
4280 detobj.ownerUUID = obj.OwnerID;
4281 detobj.posVector = obj.AbsolutePosition;
4282 detobj.rotQuat = obj.GetWorldRotation();
4283 detobj.velVector = obj.Velocity;
4284 detobj.colliderType = 0;
4285 detobj.groupUUID = obj.GroupID;
4286
4287 return detobj;
4288 }
4289
4290 private DetectedObject CreateDetObject(ScenePresence av)
4291 {
4292 DetectedObject detobj = new DetectedObject();
4293 detobj.keyUUID = av.UUID;
4294 detobj.nameStr = av.ControllingClient.Name;
4295 detobj.ownerUUID = av.UUID;
4296 detobj.posVector = av.AbsolutePosition;
4297 detobj.rotQuat = av.Rotation;
4298 detobj.velVector = av.Velocity;
4299 detobj.colliderType = 0;
4300 detobj.groupUUID = av.ControllingClient.ActiveGroupId;
4301
4302 return detobj;
4303 }
4304
4305 private DetectedObject CreateDetObjectForGround()
4306 {
4307 DetectedObject detobj = new DetectedObject();
4308 detobj.keyUUID = UUID.Zero;
4309 detobj.nameStr = "";
4310 detobj.ownerUUID = UUID.Zero;
4311 detobj.posVector = AbsolutePosition;
4312 detobj.rotQuat = Quaternion.Identity;
4313 detobj.velVector = Vector3.Zero;
4314 detobj.colliderType = 0;
4315 detobj.groupUUID = UUID.Zero;
4316
4317 return detobj;
4318 }
4319
4320 private ColliderArgs CreateColliderArgs(SceneObjectPart dest, List<uint> colliders)
4321 {
4322 ColliderArgs colliderArgs = new ColliderArgs();
4323 List<DetectedObject> colliding = new List<DetectedObject>();
4324 foreach (uint localId in colliders)
4325 {
4326 if (localId == 0)
4327 continue;
4328
4329 SceneObjectPart obj = m_scene.GetSceneObjectPart(localId);
4330 if (obj != null)
4331 {
4332 if (!dest.CollisionFilteredOut(obj.UUID, obj.Name))
4333 colliding.Add(CreateDetObject(obj));
4334 }
4335 else
4336 {
4337 ScenePresence av = m_scene.GetScenePresence(localId);
4338 if (av != null && (!av.IsChildAgent))
4339 {
4340 if (!dest.CollisionFilteredOut(av.UUID, av.Name))
4341 colliding.Add(CreateDetObject(av));
4342 }
4343 }
4344 }
4345
4346 colliderArgs.Colliders = colliding;
4347
4348 return colliderArgs;
4349 }
4350
4351 private delegate void ScriptCollidingNotification(uint localID, ColliderArgs message);
4352
4353 private void SendCollisionEvent(SceneObjectGroup dest, scriptEvents ev, List<uint> colliders, ScriptCollidingNotification notify)
4354 {
4355 ColliderArgs CollidingMessage;
4356
4357 if (colliders.Count > 0)
4358 {
4359 if ((dest.RootPart.ScriptEvents & ev) != 0)
4360 {
4361 CollidingMessage = CreateColliderArgs(dest.RootPart, colliders);
4362
4363 if (CollidingMessage.Colliders.Count > 0)
4364 notify(dest.RootPart.LocalId, CollidingMessage);
4365 }
4366 }
4367 }
4368
4369 private void SendLandCollisionEvent(SceneObjectGroup dest, scriptEvents ev, ScriptCollidingNotification notify)
4370 {
4371 if ((dest.RootPart.ScriptEvents & ev) != 0)
4372 {
4373 ColliderArgs LandCollidingMessage = new ColliderArgs();
4374 List<DetectedObject> colliding = new List<DetectedObject>();
4375
4376 colliding.Add(CreateDetObjectForGround());
4377 LandCollidingMessage.Colliders = colliding;
4378
4379 notify(dest.RootPart.LocalId, LandCollidingMessage);
4380 }
4381 }
4382
4383 private void RaiseCollisionScriptEvents(Dictionary<uint, ContactPoint> coldata)
4384 {
4385 try
4386 {
4387 List<uint> thisHitColliders = new List<uint>();
4388 List<uint> endedColliders = new List<uint>();
4389 List<uint> startedColliders = new List<uint>();
4390 List<CollisionForSoundInfo> soundinfolist = new List<CollisionForSoundInfo>();
4391 CollisionForSoundInfo soundinfo;
4392 ContactPoint curcontact;
4393
4394 if (coldata.Count == 0)
4395 {
4396 if (m_lastColliders.Count == 0)
4397 return; // nothing to do
4398
4399 foreach (uint localID in m_lastColliders)
4400 {
4401 endedColliders.Add(localID);
4402 }
4403 m_lastColliders.Clear();
4404 }
4405
4406 else
4407 {
4408 foreach (uint id in coldata.Keys)
4409 {
4410 thisHitColliders.Add(id);
4411 if (!m_lastColliders.Contains(id))
4412 {
4413 startedColliders.Add(id);
4414 curcontact = coldata[id];
4415 if (Math.Abs(curcontact.RelativeSpeed) > 0.2)
4416 {
4417 soundinfo = new CollisionForSoundInfo();
4418 soundinfo.colliderID = id;
4419 soundinfo.position = curcontact.Position;
4420 soundinfo.relativeVel = curcontact.RelativeSpeed;
4421 soundinfolist.Add(soundinfo);
4422 }
4423 }
4424 //m_log.Debug("[SCENE PRESENCE]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
4425 }
4426
4427 // calculate things that ended colliding
4428 foreach (uint localID in m_lastColliders)
4429 {
4430 if (!thisHitColliders.Contains(localID))
4431 {
4432 endedColliders.Add(localID);
4433 }
4434 }
4435 //add the items that started colliding this time to the last colliders list.
4436 foreach (uint localID in startedColliders)
4437 {
4438 m_lastColliders.Add(localID);
4439 }
4440 // remove things that ended colliding from the last colliders list
4441 foreach (uint localID in endedColliders)
4442 {
4443 m_lastColliders.Remove(localID);
4444 }
4445
4446 if (soundinfolist.Count > 0)
4447 CollisionSounds.AvatarCollisionSound(this, soundinfolist);
4448 }
4449
4450 foreach (SceneObjectGroup att in GetAttachments())
4451 {
4452 SendCollisionEvent(att, scriptEvents.collision_start, startedColliders, m_scene.EventManager.TriggerScriptCollidingStart);
4453 SendCollisionEvent(att, scriptEvents.collision , m_lastColliders , m_scene.EventManager.TriggerScriptColliding);
4454 SendCollisionEvent(att, scriptEvents.collision_end , endedColliders , m_scene.EventManager.TriggerScriptCollidingEnd);
4455
4456 if (startedColliders.Contains(0))
4457 SendLandCollisionEvent(att, scriptEvents.land_collision_start, m_scene.EventManager.TriggerScriptLandCollidingStart);
4458 if (m_lastColliders.Contains(0))
4459 SendLandCollisionEvent(att, scriptEvents.land_collision, m_scene.EventManager.TriggerScriptLandColliding);
4460 if (endedColliders.Contains(0))
4461 SendLandCollisionEvent(att, scriptEvents.land_collision_end, m_scene.EventManager.TriggerScriptLandCollidingEnd);
4462 }
4463 }
4464 finally
4465 {
4466 m_collisionEventFlag = false;
4467 }
4468 }
4469
4033 private void TeleportFlagsDebug() { 4470 private void TeleportFlagsDebug() {
4034 4471
4035 // Some temporary debugging help to show all the TeleportFlags we have... 4472 // Some temporary debugging help to show all the TeleportFlags we have...
@@ -4054,6 +4491,5 @@ namespace OpenSim.Region.Framework.Scenes
4054 m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************"); 4491 m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
4055 4492
4056 } 4493 }
4057
4058 } 4494 }
4059} 4495}
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 2d4c60a..134bd9d 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -262,6 +262,12 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
262 sr.Close(); 262 sr.Close();
263 } 263 }
264 264
265 XmlNodeList keymotion = doc.GetElementsByTagName("KeyframeMotion");
266 if (keymotion.Count > 0)
267 sceneObject.RootPart.KeyframeMotion = KeyframeMotion.FromData(sceneObject, Convert.FromBase64String(keymotion[0].InnerText));
268 else
269 sceneObject.RootPart.KeyframeMotion = null;
270
265 // Script state may, or may not, exist. Not having any, is NOT 271 // Script state may, or may not, exist. Not having any, is NOT
266 // ever a problem. 272 // ever a problem.
267 sceneObject.LoadScriptState(doc); 273 sceneObject.LoadScriptState(doc);
@@ -366,6 +372,23 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
366 m_SOPXmlProcessors.Add("PayPrice2", ProcessPayPrice2); 372 m_SOPXmlProcessors.Add("PayPrice2", ProcessPayPrice2);
367 m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3); 373 m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3);
368 m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4); 374 m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4);
375
376 m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy);
377 m_SOPXmlProcessors.Add("Force", ProcessForce);
378 m_SOPXmlProcessors.Add("Torque", ProcessTorque);
379 m_SOPXmlProcessors.Add("VolumeDetectActive", ProcessVolumeDetectActive);
380
381
382 m_SOPXmlProcessors.Add("Vehicle", ProcessVehicle);
383
384 m_SOPXmlProcessors.Add("PhysicsShapeType", ProcessPhysicsShapeType);
385 m_SOPXmlProcessors.Add("Density", ProcessDensity);
386 m_SOPXmlProcessors.Add("Friction", ProcessFriction);
387 m_SOPXmlProcessors.Add("Bounce", ProcessBounce);
388 m_SOPXmlProcessors.Add("GravityModifier", ProcessGravityModifier);
389 m_SOPXmlProcessors.Add("CameraEyeOffset", ProcessCameraEyeOffset);
390 m_SOPXmlProcessors.Add("CameraAtOffset", ProcessCameraAtOffset);
391
369 #endregion 392 #endregion
370 393
371 #region TaskInventoryXmlProcessors initialization 394 #region TaskInventoryXmlProcessors initialization
@@ -393,7 +416,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
393 m_TaskInventoryXmlProcessors.Add("PermsMask", ProcessTIPermsMask); 416 m_TaskInventoryXmlProcessors.Add("PermsMask", ProcessTIPermsMask);
394 m_TaskInventoryXmlProcessors.Add("Type", ProcessTIType); 417 m_TaskInventoryXmlProcessors.Add("Type", ProcessTIType);
395 m_TaskInventoryXmlProcessors.Add("OwnerChanged", ProcessTIOwnerChanged); 418 m_TaskInventoryXmlProcessors.Add("OwnerChanged", ProcessTIOwnerChanged);
396 419
397 #endregion 420 #endregion
398 421
399 #region ShapeXmlProcessors initialization 422 #region ShapeXmlProcessors initialization
@@ -593,6 +616,58 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
593 obj.ClickAction = (byte)reader.ReadElementContentAsInt("ClickAction", String.Empty); 616 obj.ClickAction = (byte)reader.ReadElementContentAsInt("ClickAction", String.Empty);
594 } 617 }
595 618
619 private static void ProcessPhysicsShapeType(SceneObjectPart obj, XmlTextReader reader)
620 {
621 obj.PhysicsShapeType = (byte)reader.ReadElementContentAsInt("PhysicsShapeType", String.Empty);
622 }
623
624 private static void ProcessDensity(SceneObjectPart obj, XmlTextReader reader)
625 {
626 obj.Density = reader.ReadElementContentAsFloat("Density", String.Empty);
627 }
628
629 private static void ProcessFriction(SceneObjectPart obj, XmlTextReader reader)
630 {
631 obj.Friction = reader.ReadElementContentAsFloat("Friction", String.Empty);
632 }
633
634 private static void ProcessBounce(SceneObjectPart obj, XmlTextReader reader)
635 {
636 obj.Bounciness = reader.ReadElementContentAsFloat("Bounce", String.Empty);
637 }
638
639 private static void ProcessGravityModifier(SceneObjectPart obj, XmlTextReader reader)
640 {
641 obj.GravityModifier = reader.ReadElementContentAsFloat("GravityModifier", String.Empty);
642 }
643
644 private static void ProcessCameraEyeOffset(SceneObjectPart obj, XmlTextReader reader)
645 {
646 obj.SetCameraEyeOffset(Util.ReadVector(reader, "CameraEyeOffset"));
647 }
648
649 private static void ProcessCameraAtOffset(SceneObjectPart obj, XmlTextReader reader)
650 {
651 obj.SetCameraAtOffset(Util.ReadVector(reader, "CameraAtOffset"));
652 }
653
654 private static void ProcessVehicle(SceneObjectPart obj, XmlTextReader reader)
655 {
656 SOPVehicle vehicle = SOPVehicle.FromXml2(reader);
657
658 if (vehicle == null)
659 {
660 obj.VehicleParams = null;
661 m_log.DebugFormat(
662 "[SceneObjectSerializer]: Parsing Vehicle for object part {0} {1} encountered errors. Please see earlier log entries.",
663 obj.Name, obj.UUID);
664 }
665 else
666 {
667 obj.VehicleParams = vehicle;
668 }
669 }
670
596 private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader) 671 private static void ProcessShape(SceneObjectPart obj, XmlTextReader reader)
597 { 672 {
598 List<string> errorNodeNames; 673 List<string> errorNodeNames;
@@ -757,6 +832,25 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
757 obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty); 832 obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty);
758 } 833 }
759 834
835 private static void ProcessBuoyancy(SceneObjectPart obj, XmlTextReader reader)
836 {
837 obj.Buoyancy = (float)reader.ReadElementContentAsFloat("Buoyancy", String.Empty);
838 }
839
840 private static void ProcessForce(SceneObjectPart obj, XmlTextReader reader)
841 {
842 obj.Force = Util.ReadVector(reader, "Force");
843 }
844 private static void ProcessTorque(SceneObjectPart obj, XmlTextReader reader)
845 {
846 obj.Torque = Util.ReadVector(reader, "Torque");
847 }
848
849 private static void ProcessVolumeDetectActive(SceneObjectPart obj, XmlTextReader reader)
850 {
851 obj.VolumeDetectActive = Util.ReadBoolean(reader);
852 }
853
760 #endregion 854 #endregion
761 855
762 #region TaskInventoryXmlProcessors 856 #region TaskInventoryXmlProcessors
@@ -1144,6 +1238,16 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1144 }); 1238 });
1145 1239
1146 writer.WriteEndElement(); 1240 writer.WriteEndElement();
1241
1242 if (sog.RootPart.KeyframeMotion != null)
1243 {
1244 Byte[] data = sog.RootPart.KeyframeMotion.Serialize();
1245
1246 writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty);
1247 writer.WriteBase64(data, 0, data.Length);
1248 writer.WriteEndElement();
1249 }
1250
1147 writer.WriteEndElement(); 1251 writer.WriteEndElement();
1148 } 1252 }
1149 1253
@@ -1243,6 +1347,29 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1243 writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString()); 1347 writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString());
1244 writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); 1348 writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString());
1245 1349
1350 writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString());
1351
1352 WriteVector(writer, "Force", sop.Force);
1353 WriteVector(writer, "Torque", sop.Torque);
1354
1355 writer.WriteElementString("VolumeDetectActive", sop.VolumeDetectActive.ToString().ToLower());
1356
1357 if (sop.VehicleParams != null)
1358 sop.VehicleParams.ToXml2(writer);
1359
1360 if(sop.PhysicsShapeType != sop.DefaultPhysicsShapeType())
1361 writer.WriteElementString("PhysicsShapeType", sop.PhysicsShapeType.ToString().ToLower());
1362 if (sop.Density != 1000.0f)
1363 writer.WriteElementString("Density", sop.Density.ToString().ToLower());
1364 if (sop.Friction != 0.6f)
1365 writer.WriteElementString("Friction", sop.Friction.ToString().ToLower());
1366 if (sop.Bounciness != 0.5f)
1367 writer.WriteElementString("Bounce", sop.Bounciness.ToString().ToLower());
1368 if (sop.GravityModifier != 1.0f)
1369 writer.WriteElementString("GravityModifier", sop.GravityModifier.ToString().ToLower());
1370 WriteVector(writer, "CameraEyeOffset", sop.GetCameraEyeOffset());
1371 WriteVector(writer, "CameraAtOffset", sop.GetCameraAtOffset());
1372
1246 writer.WriteEndElement(); 1373 writer.WriteEndElement();
1247 } 1374 }
1248 1375
@@ -1467,12 +1594,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1467 { 1594 {
1468 TaskInventoryDictionary tinv = new TaskInventoryDictionary(); 1595 TaskInventoryDictionary tinv = new TaskInventoryDictionary();
1469 1596
1470 if (reader.IsEmptyElement)
1471 {
1472 reader.Read();
1473 return tinv;
1474 }
1475
1476 reader.ReadStartElement(name, String.Empty); 1597 reader.ReadStartElement(name, String.Empty);
1477 1598
1478 while (reader.Name == "TaskInventoryItem") 1599 while (reader.Name == "TaskInventoryItem")
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 96317c3..20919a1 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -164,7 +164,7 @@ namespace OpenSim.Region.Framework.Scenes
164 164
165 // saved last reported value so there is something available for llGetRegionFPS 165 // saved last reported value so there is something available for llGetRegionFPS
166 private float lastReportedSimFPS; 166 private float lastReportedSimFPS;
167 private float[] lastReportedSimStats = new float[22]; 167 private float[] lastReportedSimStats = new float[23];
168 private float m_pfps; 168 private float m_pfps;
169 169
170 /// <summary> 170 /// <summary>
@@ -178,12 +178,13 @@ namespace OpenSim.Region.Framework.Scenes
178 private int m_objectUpdates; 178 private int m_objectUpdates;
179 179
180 private int m_frameMS; 180 private int m_frameMS;
181 private int m_spareMS; 181
182 private int m_netMS; 182 private int m_netMS;
183 private int m_agentMS; 183 private int m_agentMS;
184 private int m_physicsMS; 184 private int m_physicsMS;
185 private int m_imageMS; 185 private int m_imageMS;
186 private int m_otherMS; 186 private int m_otherMS;
187 private int m_sleeptimeMS;
187 188
188//Ckrinke: (3-21-08) Comment out to remove a compiler warning. Bring back into play when needed. 189//Ckrinke: (3-21-08) Comment out to remove a compiler warning. Bring back into play when needed.
189//Ckrinke private int m_scriptMS = 0; 190//Ckrinke private int m_scriptMS = 0;
@@ -260,7 +261,7 @@ namespace OpenSim.Region.Framework.Scenes
260 261
261 private void statsHeartBeat(object sender, EventArgs e) 262 private void statsHeartBeat(object sender, EventArgs e)
262 { 263 {
263 SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[22]; 264 SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[23];
264 SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock(); 265 SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock();
265 266
266 // Know what's not thread safe in Mono... modifying timers. 267 // Know what's not thread safe in Mono... modifying timers.
@@ -298,6 +299,35 @@ namespace OpenSim.Region.Framework.Scenes
298 physfps = 0; 299 physfps = 0;
299 300
300#endregion 301#endregion
302 float factor = 1 / m_statsUpdateFactor;
303
304 if (reportedFPS <= 0)
305 reportedFPS = 1;
306
307 float perframe = 1.0f / (float)reportedFPS;
308
309 float TotalFrameTime = m_frameMS * perframe;
310
311 float targetframetime = 1100.0f / (float)m_nominalReportedFps;
312
313 float sparetime;
314 float sleeptime;
315
316 if (TotalFrameTime > targetframetime)
317 {
318 sparetime = 0;
319 sleeptime = 0;
320 }
321 else
322 {
323 sparetime = m_frameMS - m_physicsMS - m_agentMS;
324 sparetime *= perframe;
325 if (sparetime < 0)
326 sparetime = 0;
327 else if (sparetime > TotalFrameTime)
328 sparetime = TotalFrameTime;
329 sleeptime = m_sleeptimeMS * perframe;
330 }
301 331
302 m_rootAgents = m_scene.SceneGraph.GetRootAgentCount(); 332 m_rootAgents = m_scene.SceneGraph.GetRootAgentCount();
303 m_childAgents = m_scene.SceneGraph.GetChildAgentCount(); 333 m_childAgents = m_scene.SceneGraph.GetChildAgentCount();
@@ -309,25 +339,15 @@ namespace OpenSim.Region.Framework.Scenes
309 // so that stat numbers are always consistent. 339 // so that stat numbers are always consistent.
310 CheckStatSanity(); 340 CheckStatSanity();
311 341
312 //Our time dilation is 0.91 when we're running a full speed, 342 // other MS is actually simulation time
313 // therefore to make sure we get an appropriate range, 343 // m_otherMS = m_frameMS - m_physicsMS - m_imageMS - m_netMS - m_agentMS;
314 // we have to factor in our error. (0.10f * statsUpdateFactor) 344 // m_imageMS m_netMS are not included in m_frameMS
315 // multiplies the fix for the error times the amount of times it'll occur a second
316 // / 10 divides the value by the number of times the sim heartbeat runs (10fps)
317 // Then we divide the whole amount by the amount of seconds pass in between stats updates.
318 345
319 // 'statsUpdateFactor' is how often stats packets are sent in seconds. Used below to change 346 m_otherMS = m_frameMS - m_physicsMS - m_agentMS - m_sleeptimeMS;
320 // values to X-per-second values. 347 if (m_otherMS < 0)
348 m_otherMS = 0;
321 349
322 uint thisFrame = m_scene.Frame; 350 for (int i = 0; i < 23; i++)
323 float framesUpdated = (float)(thisFrame - m_lastUpdateFrame) * m_reportedFpsCorrectionFactor;
324 m_lastUpdateFrame = thisFrame;
325
326 // Avoid div-by-zero if somehow we've not updated any frames.
327 if (framesUpdated == 0)
328 framesUpdated = 1;
329
330 for (int i = 0; i < 22; i++)
331 { 351 {
332 sb[i] = new SimStatsPacket.StatBlock(); 352 sb[i] = new SimStatsPacket.StatBlock();
333 } 353 }
@@ -357,19 +377,19 @@ namespace OpenSim.Region.Framework.Scenes
357 sb[7].StatValue = m_activePrim; 377 sb[7].StatValue = m_activePrim;
358 378
359 sb[8].StatID = (uint)Stats.FrameMS; 379 sb[8].StatID = (uint)Stats.FrameMS;
360 sb[8].StatValue = m_frameMS / framesUpdated; 380 sb[8].StatValue = TotalFrameTime;
361 381
362 sb[9].StatID = (uint)Stats.NetMS; 382 sb[9].StatID = (uint)Stats.NetMS;
363 sb[9].StatValue = m_netMS / framesUpdated; 383 sb[9].StatValue = m_netMS * perframe;
364 384
365 sb[10].StatID = (uint)Stats.PhysicsMS; 385 sb[10].StatID = (uint)Stats.PhysicsMS;
366 sb[10].StatValue = m_physicsMS / framesUpdated; 386 sb[10].StatValue = m_physicsMS * perframe;
367 387
368 sb[11].StatID = (uint)Stats.ImageMS ; 388 sb[11].StatID = (uint)Stats.ImageMS ;
369 sb[11].StatValue = m_imageMS / framesUpdated; 389 sb[11].StatValue = m_imageMS * perframe;
370 390
371 sb[12].StatID = (uint)Stats.OtherMS; 391 sb[12].StatID = (uint)Stats.OtherMS;
372 sb[12].StatValue = m_otherMS / framesUpdated; 392 sb[12].StatValue = m_otherMS * perframe;
373 393
374 sb[13].StatID = (uint)Stats.InPacketsPerSecond; 394 sb[13].StatID = (uint)Stats.InPacketsPerSecond;
375 sb[13].StatValue = (m_inPacketsPerSecond / m_statsUpdateFactor); 395 sb[13].StatValue = (m_inPacketsPerSecond / m_statsUpdateFactor);
@@ -381,7 +401,7 @@ namespace OpenSim.Region.Framework.Scenes
381 sb[15].StatValue = m_unAckedBytes; 401 sb[15].StatValue = m_unAckedBytes;
382 402
383 sb[16].StatID = (uint)Stats.AgentMS; 403 sb[16].StatID = (uint)Stats.AgentMS;
384 sb[16].StatValue = m_agentMS / framesUpdated; 404 sb[16].StatValue = m_agentMS * perframe;
385 405
386 sb[17].StatID = (uint)Stats.PendingDownloads; 406 sb[17].StatID = (uint)Stats.PendingDownloads;
387 sb[17].StatValue = m_pendingDownloads; 407 sb[17].StatValue = m_pendingDownloads;
@@ -396,7 +416,10 @@ namespace OpenSim.Region.Framework.Scenes
396 sb[20].StatValue = m_scriptLinesPerSecond / m_statsUpdateFactor; 416 sb[20].StatValue = m_scriptLinesPerSecond / m_statsUpdateFactor;
397 417
398 sb[21].StatID = (uint)Stats.SimSpareMs; 418 sb[21].StatID = (uint)Stats.SimSpareMs;
399 sb[21].StatValue = m_spareMS / framesUpdated; 419 sb[21].StatValue = sparetime;
420
421 sb[22].StatID = (uint)Stats.SimSleepMs;
422 sb[22].StatValue = sleeptime;
400 423
401 for (int i = 0; i < 22; i++) 424 for (int i = 0; i < 22; i++)
402 { 425 {
@@ -429,13 +452,14 @@ namespace OpenSim.Region.Framework.Scenes
429 // Need to change things so that stats source can indicate whether they are per second or 452 // Need to change things so that stats source can indicate whether they are per second or
430 // per frame. 453 // per frame.
431 if (tuple.Key.EndsWith("MS")) 454 if (tuple.Key.EndsWith("MS"))
432 m_lastReportedExtraSimStats[tuple.Key] = tuple.Value / framesUpdated; 455 m_lastReportedExtraSimStats[tuple.Key] = tuple.Value * perframe;
433 else 456 else
434 m_lastReportedExtraSimStats[tuple.Key] = tuple.Value / m_statsUpdateFactor; 457 m_lastReportedExtraSimStats[tuple.Key] = tuple.Value / m_statsUpdateFactor;
435 } 458 }
436 } 459 }
437 } 460 }
438 461
462// LastReportedObjectUpdates = m_objectUpdates / m_statsUpdateFactor;
439 ResetValues(); 463 ResetValues();
440 } 464 }
441 } 465 }
@@ -458,7 +482,8 @@ namespace OpenSim.Region.Framework.Scenes
458 m_physicsMS = 0; 482 m_physicsMS = 0;
459 m_imageMS = 0; 483 m_imageMS = 0;
460 m_otherMS = 0; 484 m_otherMS = 0;
461 m_spareMS = 0; 485// m_spareMS = 0;
486 m_sleeptimeMS = 0;
462 487
463//Ckrinke This variable is not used, so comment to remove compiler warning until it is used. 488//Ckrinke This variable is not used, so comment to remove compiler warning until it is used.
464//Ckrinke m_scriptMS = 0; 489//Ckrinke m_scriptMS = 0;
@@ -537,11 +562,6 @@ namespace OpenSim.Region.Framework.Scenes
537 m_frameMS += ms; 562 m_frameMS += ms;
538 } 563 }
539 564
540 public void AddSpareMS(int ms)
541 {
542 m_spareMS += ms;
543 }
544
545 public void addNetMS(int ms) 565 public void addNetMS(int ms)
546 { 566 {
547 m_netMS += ms; 567 m_netMS += ms;
@@ -567,6 +587,11 @@ namespace OpenSim.Region.Framework.Scenes
567 m_otherMS += ms; 587 m_otherMS += ms;
568 } 588 }
569 589
590 public void addSleepMS(int ms)
591 {
592 m_sleeptimeMS += ms;
593 }
594
570 public void AddPendingDownloads(int count) 595 public void AddPendingDownloads(int count)
571 { 596 {
572 m_pendingDownloads += count; 597 m_pendingDownloads += count;
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 860172c..7bbf1bd 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -27,202 +27,307 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Collections.Generic;
30using log4net; 31using log4net;
31using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework;
32using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
33 35
34namespace OpenSim.Region.Framework.Scenes 36namespace OpenSim.Region.Framework.Scenes
35{ 37{
36 public class UndoState 38 public class UndoState
37 { 39 {
38// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40 const int UNDOEXPIRESECONDS = 300; // undo expire time (nice to have it came from a ini later)
39
40 public Vector3 Position = Vector3.Zero;
41 public Vector3 Scale = Vector3.Zero;
42 public Quaternion Rotation = Quaternion.Identity;
43
44 /// <summary>
45 /// Is this undo state for an entire group?
46 /// </summary>
47 public bool ForGroup;
48 41
42 public ObjectChangeData data;
43 public DateTime creationtime;
49 /// <summary> 44 /// <summary>
50 /// Constructor. 45 /// Constructor.
51 /// </summary> 46 /// </summary>
52 /// <param name="part"></param> 47 /// <param name="part"></param>
53 /// <param name="forGroup">True if the undo is for an entire group</param> 48 /// <param name="change">bit field with what is changed</param>
54 public UndoState(SceneObjectPart part, bool forGroup) 49 ///
50 public UndoState(SceneObjectPart part, ObjectChangeType change)
55 { 51 {
56 if (part.ParentID == 0) 52 data = new ObjectChangeData();
57 { 53 data.change = change;
58 ForGroup = forGroup; 54 creationtime = DateTime.UtcNow;
59
60// if (ForGroup)
61 Position = part.ParentGroup.AbsolutePosition;
62// else
63// Position = part.OffsetPosition;
64
65// m_log.DebugFormat(
66// "[UNDO STATE]: Storing undo position {0} for root part", Position);
67 55
68 Rotation = part.RotationOffset; 56 if (part.ParentGroup.RootPart == part)
69 57 {
70// m_log.DebugFormat( 58 if ((change & ObjectChangeType.Position) != 0)
71// "[UNDO STATE]: Storing undo rotation {0} for root part", Rotation); 59 data.position = part.ParentGroup.AbsolutePosition;
72 60 if ((change & ObjectChangeType.Rotation) != 0)
73 Scale = part.Shape.Scale; 61 data.rotation = part.RotationOffset;
74 62 if ((change & ObjectChangeType.Scale) != 0)
75// m_log.DebugFormat( 63 data.scale = part.Shape.Scale;
76// "[UNDO STATE]: Storing undo scale {0} for root part", Scale);
77 } 64 }
78 else 65 else
79 { 66 {
80 Position = part.OffsetPosition; 67 if ((change & ObjectChangeType.Position) != 0)
81// m_log.DebugFormat( 68 data.position = part.OffsetPosition;
82// "[UNDO STATE]: Storing undo position {0} for child part", Position); 69 if ((change & ObjectChangeType.Rotation) != 0)
70 data.rotation = part.RotationOffset;
71 if ((change & ObjectChangeType.Scale) != 0)
72 data.scale = part.Shape.Scale;
73 }
74 }
75 /// <summary>
76 /// check if undo or redo is too old
77 /// </summary>
83 78
84 Rotation = part.RotationOffset; 79 public bool checkExpire()
85// m_log.DebugFormat( 80 {
86// "[UNDO STATE]: Storing undo rotation {0} for child part", Rotation); 81 TimeSpan t = DateTime.UtcNow - creationtime;
82 if (t.Seconds > UNDOEXPIRESECONDS)
83 return true;
84 return false;
85 }
87 86
88 Scale = part.Shape.Scale; 87 /// <summary>
89// m_log.DebugFormat( 88 /// updates undo or redo creation time to now
90// "[UNDO STATE]: Storing undo scale {0} for child part", Scale); 89 /// </summary>
91 } 90 public void updateExpire()
91 {
92 creationtime = DateTime.UtcNow;
92 } 93 }
93 94
94 /// <summary> 95 /// <summary>
95 /// Compare the relevant state in the given part to this state. 96 /// Compare the relevant state in the given part to this state.
96 /// </summary> 97 /// </summary>
97 /// <param name="part"></param> 98 /// <param name="part"></param>
98 /// <returns>true if both the part's position, rotation and scale match those in this undo state. False otherwise.</returns> 99 /// <returns>true what fiels and related data are equal, False otherwise.</returns>
99 public bool Compare(SceneObjectPart part) 100 ///
101 public bool Compare(SceneObjectPart part, ObjectChangeType change)
100 { 102 {
103 if (data.change != change) // if diferent targets, then they are diferent
104 return false;
105
101 if (part != null) 106 if (part != null)
102 { 107 {
103 if (part.ParentID == 0) 108 if (part.ParentID == 0)
104 return 109 {
105 Position == part.ParentGroup.AbsolutePosition 110 if ((change & ObjectChangeType.Position) != 0 && data.position != part.ParentGroup.AbsolutePosition)
106 && Rotation == part.RotationOffset 111 return false;
107 && Scale == part.Shape.Scale; 112 }
108 else 113 else
109 return 114 {
110 Position == part.OffsetPosition 115 if ((change & ObjectChangeType.Position) != 0 && data.position != part.OffsetPosition)
111 && Rotation == part.RotationOffset 116 return false;
112 && Scale == part.Shape.Scale; 117 }
113 } 118
119 if ((change & ObjectChangeType.Rotation) != 0 && data.rotation != part.RotationOffset)
120 return false;
121 if ((change & ObjectChangeType.Rotation) != 0 && data.scale == part.Shape.Scale)
122 return false;
123 return true;
114 124
125 }
115 return false; 126 return false;
116 } 127 }
117 128
118 public void PlaybackState(SceneObjectPart part) 129 /// <summary>
130 /// executes the undo or redo to a part or its group
131 /// </summary>
132 /// <param name="part"></param>
133 ///
134
135 public void PlayState(SceneObjectPart part)
119 { 136 {
120 part.Undoing = true; 137 part.Undoing = true;
121 138
122 if (part.ParentID == 0) 139 SceneObjectGroup grp = part.ParentGroup;
123 {
124// m_log.DebugFormat(
125// "[UNDO STATE]: Undoing position to {0} for root part {1} {2}",
126// Position, part.Name, part.LocalId);
127 140
128 if (Position != Vector3.Zero) 141 if (grp != null)
129 { 142 {
130 if (ForGroup) 143 grp.doChangeObject(part, data);
131 part.ParentGroup.AbsolutePosition = Position; 144 }
132 else 145 part.Undoing = false;
133 part.ParentGroup.UpdateRootPosition(Position); 146 }
134 } 147 }
135 148
136// m_log.DebugFormat( 149 public class UndoRedoState
137// "[UNDO STATE]: Undoing rotation {0} to {1} for root part {2} {3}", 150 {
138// part.RotationOffset, Rotation, part.Name, part.LocalId); 151 int size;
152 public LinkedList<UndoState> m_redo = new LinkedList<UndoState>();
153 public LinkedList<UndoState> m_undo = new LinkedList<UndoState>();
139 154
140 if (ForGroup) 155 /// <summary>
141 part.UpdateRotation(Rotation); 156 /// creates a new UndoRedoState with default states memory size
142 else 157 /// </summary>
143 part.ParentGroup.UpdateRootRotation(Rotation);
144 158
145 if (Scale != Vector3.Zero) 159 public UndoRedoState()
146 { 160 {
147// m_log.DebugFormat( 161 size = 5;
148// "[UNDO STATE]: Undoing scale {0} to {1} for root part {2} {3}", 162 }
149// part.Shape.Scale, Scale, part.Name, part.LocalId);
150 163
151 if (ForGroup) 164 /// <summary>
152 part.ParentGroup.GroupResize(Scale); 165 /// creates a new UndoRedoState with states memory having indicated size
153 else 166 /// </summary>
154 part.Resize(Scale); 167 /// <param name="size"></param>
155 }
156 168
157 part.ParentGroup.ScheduleGroupForTerseUpdate(); 169 public UndoRedoState(int _size)
158 } 170 {
171 if (_size < 3)
172 size = 3;
159 else 173 else
160 { 174 size = _size;
161 // Note: Updating these properties on sop automatically schedules an update if needed 175 }
162 if (Position != Vector3.Zero)
163 {
164// m_log.DebugFormat(
165// "[UNDO STATE]: Undoing position {0} to {1} for child part {2} {3}",
166// part.OffsetPosition, Position, part.Name, part.LocalId);
167 176
168 part.OffsetPosition = Position; 177 /// <summary>
169 } 178 /// returns number of undo entries in memory
179 /// </summary>
170 180
171// m_log.DebugFormat( 181 public int Count
172// "[UNDO STATE]: Undoing rotation {0} to {1} for child part {2} {3}", 182 {
173// part.RotationOffset, Rotation, part.Name, part.LocalId); 183 get { return m_undo.Count; }
184 }
174 185
175 part.UpdateRotation(Rotation); 186 /// <summary>
187 /// clears all undo and redo entries
188 /// </summary>
176 189
177 if (Scale != Vector3.Zero) 190 public void Clear()
191 {
192 m_undo.Clear();
193 m_redo.Clear();
194 }
195
196 /// <summary>
197 /// adds a new state undo to part or its group, with changes indicated by what bits
198 /// </summary>
199 /// <param name="part"></param>
200 /// <param name="change">bit field with what is changed</param>
201
202 public void StoreUndo(SceneObjectPart part, ObjectChangeType change)
203 {
204 lock (m_undo)
205 {
206 UndoState last;
207
208 if (m_redo.Count > 0) // last code seems to clear redo on every new undo
178 { 209 {
179// m_log.DebugFormat( 210 m_redo.Clear();
180// "[UNDO STATE]: Undoing scale {0} to {1} for child part {2} {3}", 211 }
181// part.Shape.Scale, Scale, part.Name, part.LocalId);
182 212
183 part.Resize(Scale); 213 if (m_undo.Count > 0)
214 {
215 // check expired entry
216 last = m_undo.First.Value;
217 if (last != null && last.checkExpire())
218 m_undo.Clear();
219 else
220 {
221 // see if we actually have a change
222 if (last != null)
223 {
224 if (last.Compare(part, change))
225 return;
226 }
227 }
184 } 228 }
185 }
186 229
187 part.Undoing = false; 230 // limite size
231 while (m_undo.Count >= size)
232 m_undo.RemoveLast();
233
234 UndoState nUndo = new UndoState(part, change);
235 m_undo.AddFirst(nUndo);
236 }
188 } 237 }
189 238
190 public void PlayfwdState(SceneObjectPart part) 239 /// <summary>
191 { 240 /// executes last state undo to part or its group
192 part.Undoing = true; 241 /// current state is pushed into redo
242 /// </summary>
243 /// <param name="part"></param>
193 244
194 if (part.ParentID == 0) 245 public void Undo(SceneObjectPart part)
246 {
247 lock (m_undo)
195 { 248 {
196 if (Position != Vector3.Zero) 249 UndoState nUndo;
197 part.ParentGroup.AbsolutePosition = Position;
198
199 if (Rotation != Quaternion.Identity)
200 part.UpdateRotation(Rotation);
201 250
202 if (Scale != Vector3.Zero) 251 // expire redo
252 if (m_redo.Count > 0)
203 { 253 {
204 if (ForGroup) 254 nUndo = m_redo.First.Value;
205 part.ParentGroup.GroupResize(Scale); 255 if (nUndo != null && nUndo.checkExpire())
206 else 256 m_redo.Clear();
207 part.Resize(Scale);
208 } 257 }
209 258
210 part.ParentGroup.ScheduleGroupForTerseUpdate(); 259 if (m_undo.Count > 0)
260 {
261 UndoState goback = m_undo.First.Value;
262 // check expired
263 if (goback != null && goback.checkExpire())
264 {
265 m_undo.Clear();
266 return;
267 }
268
269 if (goback != null)
270 {
271 m_undo.RemoveFirst();
272
273 // redo limite size
274 while (m_redo.Count >= size)
275 m_redo.RemoveLast();
276
277 nUndo = new UndoState(part, goback.data.change); // new value in part should it be full goback copy?
278 m_redo.AddFirst(nUndo);
279
280 goback.PlayState(part);
281 }
282 }
211 } 283 }
212 else 284 }
285
286 /// <summary>
287 /// executes last state redo to part or its group
288 /// current state is pushed into undo
289 /// </summary>
290 /// <param name="part"></param>
291
292 public void Redo(SceneObjectPart part)
293 {
294 lock (m_undo)
213 { 295 {
214 // Note: Updating these properties on sop automatically schedules an update if needed 296 UndoState nUndo;
215 if (Position != Vector3.Zero)
216 part.OffsetPosition = Position;
217 297
218 if (Rotation != Quaternion.Identity) 298 // expire undo
219 part.UpdateRotation(Rotation); 299 if (m_undo.Count > 0)
300 {
301 nUndo = m_undo.First.Value;
302 if (nUndo != null && nUndo.checkExpire())
303 m_undo.Clear();
304 }
220 305
221 if (Scale != Vector3.Zero) 306 if (m_redo.Count > 0)
222 part.Resize(Scale); 307 {
308 UndoState gofwd = m_redo.First.Value;
309 // check expired
310 if (gofwd != null && gofwd.checkExpire())
311 {
312 m_redo.Clear();
313 return;
314 }
315
316 if (gofwd != null)
317 {
318 m_redo.RemoveFirst();
319
320 // limite undo size
321 while (m_undo.Count >= size)
322 m_undo.RemoveLast();
323
324 nUndo = new UndoState(part, gofwd.data.change); // new value in part should it be full gofwd copy?
325 m_undo.AddFirst(nUndo);
326
327 gofwd.PlayState(part);
328 }
329 }
223 } 330 }
224
225 part.Undoing = false;
226 } 331 }
227 } 332 }
228 333
@@ -247,4 +352,4 @@ namespace OpenSim.Region.Framework.Scenes
247 m_terrainModule.UndoTerrain(m_terrainChannel); 352 m_terrainModule.UndoTerrain(m_terrainChannel);
248 } 353 }
249 } 354 }
250} \ No newline at end of file 355}
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index efb68a2..411e421 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -87,10 +87,6 @@ namespace OpenSim.Region.Framework.Scenes
87 /// <param name="assetUuids">The assets gathered</param> 87 /// <param name="assetUuids">The assets gathered</param>
88 public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids) 88 public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, AssetType> assetUuids)
89 { 89 {
90 // avoid infinite loops
91 if (assetUuids.ContainsKey(assetUuid))
92 return;
93
94 try 90 try
95 { 91 {
96 assetUuids[assetUuid] = assetType; 92 assetUuids[assetUuid] = assetType;
generated by cgit v1.1 at 2024-09-12 22:43:10 +0000