diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 1a6a70b..f0acc38 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -563,7 +563,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
563 | m_regInfo = regInfo; | 563 | m_regInfo = regInfo; |
564 | m_regionHandle = m_regInfo.RegionHandle; | 564 | m_regionHandle = m_regInfo.RegionHandle; |
565 | m_regionName = m_regInfo.RegionName; | 565 | m_regionName = m_regInfo.RegionName; |
566 | m_datastore = m_regInfo.DataStore; | ||
567 | m_lastUpdate = Util.EnvironmentTickCount(); | 566 | m_lastUpdate = Util.EnvironmentTickCount(); |
568 | 567 | ||
569 | m_physicalPrim = physicalPrim; | 568 | m_physicalPrim = physicalPrim; |
@@ -1109,7 +1108,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1109 | // | 1108 | // |
1110 | while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null) | 1109 | while (m_regInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null) |
1111 | { | 1110 | { |
1112 | MainConsole.Instance.Output("The current estate has no owner set."); | 1111 | MainConsole.Instance.OutputFormat("Estate {0} has no owner set.", m_regInfo.EstateSettings.EstateName); |
1113 | List<char> excluded = new List<char>(new char[1]{' '}); | 1112 | List<char> excluded = new List<char>(new char[1]{' '}); |
1114 | string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test", excluded); | 1113 | string first = MainConsole.Instance.CmdPrompt("Estate owner first name", "Test", excluded); |
1115 | string last = MainConsole.Instance.CmdPrompt("Estate owner last name", "User", excluded); | 1114 | string last = MainConsole.Instance.CmdPrompt("Estate owner last name", "User", excluded); |
@@ -1429,20 +1428,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1429 | } | 1428 | } |
1430 | 1429 | ||
1431 | /// <summary> | 1430 | /// <summary> |
1432 | /// Recount SceneObjectPart in parcel aabb | ||
1433 | /// </summary> | ||
1434 | private void UpdateLand() | ||
1435 | { | ||
1436 | if (LandChannel != null) | ||
1437 | { | ||
1438 | if (LandChannel.IsLandPrimCountTainted()) | ||
1439 | { | ||
1440 | EventManager.TriggerParcelPrimCountUpdate(); | ||
1441 | } | ||
1442 | } | ||
1443 | } | ||
1444 | |||
1445 | /// <summary> | ||
1446 | /// Update the terrain if it needs to be updated. | 1431 | /// Update the terrain if it needs to be updated. |
1447 | /// </summary> | 1432 | /// </summary> |
1448 | private void UpdateTerrain() | 1433 | private void UpdateTerrain() |
@@ -1536,8 +1521,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1536 | } | 1521 | } |
1537 | 1522 | ||
1538 | /// <summary> | 1523 | /// <summary> |
1539 | /// Return object to avatar Message | 1524 | /// Tell an agent that their object has been returned. |
1540 | /// </summary> | 1525 | /// </summary> |
1526 | /// <remarks> | ||
1527 | /// The actual return is handled by the caller. | ||
1528 | /// </remarks> | ||
1541 | /// <param name="agentID">Avatar Unique Id</param> | 1529 | /// <param name="agentID">Avatar Unique Id</param> |
1542 | /// <param name="objectName">Name of object returned</param> | 1530 | /// <param name="objectName">Name of object returned</param> |
1543 | /// <param name="location">Location of object returned</param> | 1531 | /// <param name="location">Location of object returned</param> |
@@ -1956,8 +1944,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
1956 | /// If false, it is left to the caller to schedule the update | 1944 | /// If false, it is left to the caller to schedule the update |
1957 | /// </param> | 1945 | /// </param> |
1958 | public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) | 1946 | public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) |
1959 | { | 1947 | { |
1960 | return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates); | 1948 | if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates)) |
1949 | { | ||
1950 | EventManager.TriggerObjectAddedToScene(sceneObject); | ||
1951 | return true; | ||
1952 | } | ||
1953 | |||
1954 | return false; | ||
1961 | } | 1955 | } |
1962 | 1956 | ||
1963 | /// <summary> | 1957 | /// <summary> |
@@ -1974,7 +1968,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
1974 | public bool AddNewSceneObject( | 1968 | public bool AddNewSceneObject( |
1975 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel) | 1969 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel) |
1976 | { | 1970 | { |
1977 | return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel); | 1971 | if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel)) |
1972 | { | ||
1973 | EventManager.TriggerObjectAddedToScene(sceneObject); | ||
1974 | return true; | ||
1975 | } | ||
1976 | |||
1977 | return false; | ||
1978 | } | 1978 | } |
1979 | 1979 | ||
1980 | /// <summary> | 1980 | /// <summary> |
@@ -4854,8 +4854,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
4854 | { | 4854 | { |
4855 | float ominX, ominY, ominZ, omaxX, omaxY, omaxZ; | 4855 | float ominX, ominY, ominZ, omaxX, omaxY, omaxZ; |
4856 | 4856 | ||
4857 | Vector3 vec = g.AbsolutePosition; | ||
4858 | |||
4857 | g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ); | 4859 | g.GetAxisAlignedBoundingBoxRaw(out ominX, out omaxX, out ominY, out omaxY, out ominZ, out omaxZ); |
4858 | 4860 | ||
4861 | ominX += vec.X; | ||
4862 | omaxX += vec.X; | ||
4863 | ominY += vec.Y; | ||
4864 | omaxY += vec.Y; | ||
4865 | ominZ += vec.Z; | ||
4866 | omaxZ += vec.Z; | ||
4867 | |||
4859 | if (minX > ominX) | 4868 | if (minX > ominX) |
4860 | minX = ominX; | 4869 | minX = ominX; |
4861 | if (minY > ominY) | 4870 | if (minY > ominY) |