aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs16
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs1
4 files changed, 7 insertions, 19 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 8760c84..0d9682e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -218,8 +218,7 @@ namespace OpenSim.Region.Framework.Scenes
218 218
219 // Update item with new asset 219 // Update item with new asset
220 item.AssetID = asset.FullID; 220 item.AssetID = asset.FullID;
221 if (group.UpdateInventoryItem(item)) 221 group.UpdateInventoryItem(item);
222 remoteClient.SendAgentAlertMessage("Script saved", false);
223 222
224 part.GetProperties(remoteClient); 223 part.GetProperties(remoteClient);
225 224
@@ -232,10 +231,6 @@ namespace OpenSim.Region.Framework.Scenes
232 // 231 //
233 errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0); 232 errors = part.Inventory.CreateScriptInstanceEr(item.ItemID, 0, false, DefaultScriptEngine, 0);
234 } 233 }
235 else
236 {
237 remoteClient.SendAgentAlertMessage("Script saved", false);
238 }
239 part.ParentGroup.ResumeScripts(); 234 part.ParentGroup.ResumeScripts();
240 return errors; 235 return errors;
241 } 236 }
@@ -1401,13 +1396,6 @@ namespace OpenSim.Region.Framework.Scenes
1401 { 1396 {
1402 agentTransactions.HandleTaskItemUpdateFromTransaction( 1397 agentTransactions.HandleTaskItemUpdateFromTransaction(
1403 remoteClient, part, transactionID, currentItem); 1398 remoteClient, part, transactionID, currentItem);
1404
1405 if ((InventoryType)itemInfo.InvType == InventoryType.Notecard)
1406 remoteClient.SendAgentAlertMessage("Notecard saved", false);
1407 else if ((InventoryType)itemInfo.InvType == InventoryType.LSL)
1408 remoteClient.SendAgentAlertMessage("Script saved", false);
1409 else
1410 remoteClient.SendAgentAlertMessage("Item saved", false);
1411 } 1399 }
1412 1400
1413 // Base ALWAYS has move 1401 // Base ALWAYS has move
@@ -1993,7 +1981,7 @@ namespace OpenSim.Region.Framework.Scenes
1993 1981
1994 // We can only call this after adding the scene object, since the scene object references the scene 1982 // We can only call this after adding the scene object, since the scene object references the scene
1995 // to find out if scripts should be activated at all. 1983 // to find out if scripts should be activated at all.
1996 group.CreateScriptInstances(param, true, DefaultScriptEngine, 2); 1984 group.CreateScriptInstances(param, true, DefaultScriptEngine, 3);
1997 1985
1998 group.ScheduleGroupForFullUpdate(); 1986 group.ScheduleGroupForFullUpdate();
1999 1987
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9fea2a0..400f4c0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1160,6 +1160,7 @@ namespace OpenSim.Region.Framework.Scenes
1160 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat); 1160 //m_heartbeatTimer.Elapsed += new ElapsedEventHandler(Heartbeat);
1161 if (HeartbeatThread != null) 1161 if (HeartbeatThread != null)
1162 { 1162 {
1163 m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName);
1163 HeartbeatThread.Abort(); 1164 HeartbeatThread.Abort();
1164 HeartbeatThread = null; 1165 HeartbeatThread = null;
1165 } 1166 }
@@ -2442,7 +2443,7 @@ namespace OpenSim.Region.Framework.Scenes
2442 return false; 2443 return false;
2443 } 2444 }
2444 2445
2445 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, 1); 2446 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, 2);
2446 2447
2447 newObject.ResumeScripts(); 2448 newObject.ResumeScripts();
2448 2449
@@ -4555,7 +4556,7 @@ namespace OpenSim.Region.Framework.Scenes
4555 // 4556 //
4556 int health=1; // Start at 1, means we're up 4557 int health=1; // Start at 1, means we're up
4557 4558
4558 if ((Util.EnvironmentTickCountSubtract(m_lastUpdate)) < 1000) 4559 if (m_firstHeartbeat || ((Util.EnvironmentTickCountSubtract(m_lastUpdate)) < 1000))
4559 health+=1; 4560 health+=1;
4560 else 4561 else
4561 return health; 4562 return health;
@@ -5067,7 +5068,7 @@ namespace OpenSim.Region.Framework.Scenes
5067 { 5068 {
5068 ForEachSOG(delegate (SceneObjectGroup grp) 5069 ForEachSOG(delegate (SceneObjectGroup grp)
5069 { 5070 {
5070 if (grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp))) 5071 if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp)))
5071 { 5072 {
5072 UUID agentID = grp.OwnerID; 5073 UUID agentID = grp.OwnerID;
5073 if (agentID == UUID.Zero) 5074 if (agentID == UUID.Zero)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index b86a564..8823df1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.Framework.Scenes
1928 copy.UpdateGroupRotationR(rot); 1928 copy.UpdateGroupRotationR(rot);
1929 } 1929 }
1930 1930
1931 copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 0); 1931 copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 1);
1932 copy.HasGroupChanged = true; 1932 copy.HasGroupChanged = true;
1933 copy.ScheduleGroupForFullUpdate(); 1933 copy.ScheduleGroupForFullUpdate();
1934 copy.ResumeScripts(); 1934 copy.ResumeScripts();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f682ee5..2ed00a0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2810,7 +2810,6 @@ namespace OpenSim.Region.Framework.Scenes
2810 m_controllingClient.SendAvatarDataImmediate(this); 2810 m_controllingClient.SendAvatarDataImmediate(this);
2811 2811
2812 SendInitialFullUpdateToAllClients(); 2812 SendInitialFullUpdateToAllClients();
2813 SendAppearanceToAllOtherAgents();
2814 } 2813 }
2815 2814
2816 /// <summary> 2815 /// <summary>