From 2b4edd659f59a0db4e8d81924de0312799d4f744 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 5 Jan 2012 17:53:03 -0500
Subject: Adding empty ISearchModule interface
---
OpenSim/Framework/ISearchModule.cs | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 OpenSim/Framework/ISearchModule.cs
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/ISearchModule.cs b/OpenSim/Framework/ISearchModule.cs
new file mode 100644
index 0000000..64bf72c
--- /dev/null
+++ b/OpenSim/Framework/ISearchModule.cs
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+ public interface ISearchModule
+ {
+
+ }
+}
--
cgit v1.1
From 8bdd80abfa3830142b16615d97d555dad417e08d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 12 Jan 2012 09:56:35 -0800
Subject: HG: normalize all externalized user ULRs to be the Home URL, i.e. the
location of the user's UAS. This corrects an earlier design which had some
cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both
the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check
diff of the example files, but basically all vars that were pointing to
profile should point to the UAS instead and should be called HomeURI.
---
.../Serialization/External/ExternalRepresentationUtils.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index 6e8c2ee..7447ac2 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -44,13 +44,13 @@ namespace OpenSim.Framework.Serialization.External
/// with creator data added to it.
///
/// The SceneObjectPart represented in XML2
- /// The URL of the profile service for the creator
+ /// The URL of the user agents service (home) for the creator
/// The service for retrieving user account information
/// The scope of the user account information (Grid ID)
/// The SceneObjectPart represented in XML2
- public static string RewriteSOP(string xml, string profileURL, IUserAccountService userService, UUID scopeID)
+ public static string RewriteSOP(string xml, string homeURL, IUserAccountService userService, UUID scopeID)
{
- if (xml == string.Empty || profileURL == string.Empty || userService == null)
+ if (xml == string.Empty || homeURL == string.Empty || userService == null)
return xml;
XmlDocument doc = new XmlDocument();
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Serialization.External
if (!hasCreatorData && creator != null)
{
XmlElement creatorData = doc.CreateElement("CreatorData");
- creatorData.InnerText = profileURL + "/" + creator.PrincipalID + ";" + creator.FirstName + " " + creator.LastName;
+ creatorData.InnerText = homeURL + ";" + creator.FirstName + " " + creator.LastName;
sop.AppendChild(creatorData);
}
}
--
cgit v1.1
From d40ec1c346d4b5f5999218bf1cbffe9cee1ea992 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 12 Jan 2012 20:49:50 -0500
Subject: Move some interfaces to a more apropriate place
---
OpenSim/Framework/IProfileModule.cs | 37 -------------------------------------
OpenSim/Framework/ISearchModule.cs | 36 ------------------------------------
2 files changed, 73 deletions(-)
delete mode 100644 OpenSim/Framework/IProfileModule.cs
delete mode 100644 OpenSim/Framework/ISearchModule.cs
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/IProfileModule.cs b/OpenSim/Framework/IProfileModule.cs
deleted file mode 100644
index ef03d4a..0000000
--- a/OpenSim/Framework/IProfileModule.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-
-namespace OpenSim.Framework
-{
- public interface IProfileModule
- {
- void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID);
-
- }
-}
diff --git a/OpenSim/Framework/ISearchModule.cs b/OpenSim/Framework/ISearchModule.cs
deleted file mode 100644
index 64bf72c..0000000
--- a/OpenSim/Framework/ISearchModule.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-
-namespace OpenSim.Framework
-{
- public interface ISearchModule
- {
-
- }
-}
--
cgit v1.1
From 82ad9d4e04867b23b4c824c4eca7402bf476f0b7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 16 Jan 2012 22:58:58 +0000
Subject: Remove monocov and other obsolete nant build targets.
monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
---
OpenSim/Framework/IClientAPI.cs | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 258b3eb..29a69c3 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1074,7 +1074,15 @@ namespace OpenSim.Framework
void SendWindData(Vector2[] windSpeeds);
void SendCloudData(float[] cloudCover);
+ ///
+ /// Sent when an agent completes its movement into a region.
+ ///
+ ///
+ /// This packet marks completion of the arrival of a root avatar in a region, whether through login, region
+ /// crossing or direct teleport.
+ ///
void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
+
void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
///
--
cgit v1.1
From b6f3de5028ab9a288f60b020a0dffda079dc550d Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 20 Jan 2012 23:50:37 -0500
Subject: Telehub Support:
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
---
OpenSim/Framework/IClientAPI.cs | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 29a69c3..1326fe9 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -358,6 +358,8 @@ namespace OpenSim.Framework
public delegate void EstateChangeInfo(IClientAPI client, UUID invoice, UUID senderID, UInt32 param1, UInt32 param2);
+ public delegate void EstateManageTelehub(IClientAPI client, UUID invoice, UUID senderID, string cmd, UInt32 param1);
+
public delegate void RequestTerrain(IClientAPI remoteClient, string clientFileName);
public delegate void BakeTerrain(IClientAPI remoteClient);
@@ -769,6 +771,7 @@ namespace OpenSim.Framework
event ModifyTerrain OnModifyTerrain;
event BakeTerrain OnBakeTerrain;
event EstateChangeInfo OnEstateChangeInfo;
+ event EstateManageTelehub OnEstateManageTelehub;
// [Obsolete("LLClientView Specific.")]
event SetAppearance OnSetAppearance;
// [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")]
@@ -1141,6 +1144,8 @@ namespace OpenSim.Framework
void SendTaskInventory(UUID taskID, short serial, byte[] fileName);
+ void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List SpawnPoint);
+
///
/// Used by the server to inform the client of new inventory items and folders.
///
--
cgit v1.1
From 32d58d6e3e9a0ea1bfa808567d0f64c0652f8a85 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sat, 21 Jan 2012 23:26:27 -0500
Subject: Telehub Support:
Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
---
OpenSim/Framework/EstateSettings.cs | 150 ++++++++++++++++++++++++++++++++++++
1 file changed, 150 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 2a495b0..9bdeab8 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -373,5 +373,155 @@ namespace OpenSim.Framework
return l_EstateAccess.Contains(user);
}
+
+ // Telehub support
+ private bool m_TelehubEnabled = false;
+ public bool HasTelehub
+ {
+ get { return m_TelehubEnabled; }
+ set { m_TelehubEnabled = value; }
+ }
+
+ // Connected Telehub object
+ private UUID m_TelehubObject;
+ public UUID TelehubObject
+ {
+ get
+ {
+ if (HasTelehub)
+ {
+ return m_TelehubObject;
+ }
+ else
+ {
+ return UUID.Zero;
+ }
+ }
+ set
+ {
+ m_TelehubObject = value;
+ }
+ }
+
+ // Connected Telehub name
+ private string m_TelehubName;
+ public string TelehubName
+ {
+ get
+ {
+ if (HasTelehub)
+ {
+ return m_TelehubName;
+ }
+ else
+ {
+ return String.Empty;
+ }
+ }
+ set
+ {
+ m_TelehubName = value;
+ }
+ }
+
+ // Connected Telehub position
+ private float m_TelehubPosX;
+ private float m_TelehubPosY;
+ private float m_TelehubPosZ;
+ public Vector3 TelehubPos
+ {
+ get
+ {
+ if (HasTelehub)
+ {
+ Vector3 Pos = new Vector3(m_TelehubPosX, m_TelehubPosY, m_TelehubPosZ);
+ return Pos;
+ }
+ else
+ {
+ return Vector3.Zero;
+ }
+ }
+ set
+ {
+
+ m_TelehubPosX = value.X;
+ m_TelehubPosY = value.Y;
+ m_TelehubPosZ = value.Z;
+ }
+ }
+
+ // Connected Telehub rotation
+ private float m_TelehubRotX;
+ private float m_TelehubRotY;
+ private float m_TelehubRotZ;
+ private float m_TelehubRotW;
+ public Quaternion TelehubRot
+ {
+ get
+ {
+ if (HasTelehub)
+ {
+ Quaternion quat = new Quaternion();
+
+ quat.X = m_TelehubRotX;
+ quat.Y = m_TelehubRotY;
+ quat.Z = m_TelehubRotZ;
+ quat.W = m_TelehubRotW;
+
+ return quat;
+ }
+ else
+ {
+ // What else to do??
+ Quaternion quat = new Quaternion();
+
+ quat.X = m_TelehubRotX;
+ quat.X = m_TelehubRotY;
+ quat.X = m_TelehubRotZ;
+ quat.X = m_TelehubRotW;
+
+ return quat;
+ }
+ }
+ set
+ {
+ m_TelehubRotX = value.X;
+ m_TelehubRotY = value.Y;
+ m_TelehubRotZ = value.Z;
+ m_TelehubRotW = value.W;
+ }
+ }
+
+ // Our Connected Telehub's SpawnPoints
+ public List l_SpawnPoints = new List();
+
+ // Add a SpawnPoint
+ // ** These are not region coordinates **
+ // They are relative to the Telehub coordinates
+ //
+ public void AddSpawnPoint(Vector3 point)
+ {
+ l_SpawnPoints.Add(point);
+ }
+
+ // Remove a SpawnPoint
+ public void RemoveSpawnPoint(int point_index)
+ {
+ l_SpawnPoints.RemoveAt(point_index);
+ }
+
+ // Return the List of SpawnPoints
+ public List SpawnPoints()
+ {
+ return l_SpawnPoints;
+
+ }
+
+ // Clear the SpawnPoints List of all entries
+ public void ClearSpawnPoints()
+ {
+ l_SpawnPoints.Clear();
+ }
}
}
--
cgit v1.1
From 68365c20c0b3a3164881398f3bc3710f7960c52d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 22 Jan 2012 11:36:04 +0000
Subject: Move Telehub tables and data from EstateSettings to RegionSettings.
This is damage control es EstateSettings is not the place this can be put.
EstateSettings is nt unique to a region and therefore would introduce a hard
limit of one telehub per estate, completely shutting off the option of having
SL style telehubs, e.g. one per region. Whole estate teleport routing can
still be implemented id desiresd, this way all options are open while the
other way most options get closed off.
---
OpenSim/Framework/EstateSettings.cs | 150 ------------------------------------
OpenSim/Framework/RegionSettings.cs | 150 ++++++++++++++++++++++++++++++++++++
2 files changed, 150 insertions(+), 150 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 9bdeab8..2a495b0 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -373,155 +373,5 @@ namespace OpenSim.Framework
return l_EstateAccess.Contains(user);
}
-
- // Telehub support
- private bool m_TelehubEnabled = false;
- public bool HasTelehub
- {
- get { return m_TelehubEnabled; }
- set { m_TelehubEnabled = value; }
- }
-
- // Connected Telehub object
- private UUID m_TelehubObject;
- public UUID TelehubObject
- {
- get
- {
- if (HasTelehub)
- {
- return m_TelehubObject;
- }
- else
- {
- return UUID.Zero;
- }
- }
- set
- {
- m_TelehubObject = value;
- }
- }
-
- // Connected Telehub name
- private string m_TelehubName;
- public string TelehubName
- {
- get
- {
- if (HasTelehub)
- {
- return m_TelehubName;
- }
- else
- {
- return String.Empty;
- }
- }
- set
- {
- m_TelehubName = value;
- }
- }
-
- // Connected Telehub position
- private float m_TelehubPosX;
- private float m_TelehubPosY;
- private float m_TelehubPosZ;
- public Vector3 TelehubPos
- {
- get
- {
- if (HasTelehub)
- {
- Vector3 Pos = new Vector3(m_TelehubPosX, m_TelehubPosY, m_TelehubPosZ);
- return Pos;
- }
- else
- {
- return Vector3.Zero;
- }
- }
- set
- {
-
- m_TelehubPosX = value.X;
- m_TelehubPosY = value.Y;
- m_TelehubPosZ = value.Z;
- }
- }
-
- // Connected Telehub rotation
- private float m_TelehubRotX;
- private float m_TelehubRotY;
- private float m_TelehubRotZ;
- private float m_TelehubRotW;
- public Quaternion TelehubRot
- {
- get
- {
- if (HasTelehub)
- {
- Quaternion quat = new Quaternion();
-
- quat.X = m_TelehubRotX;
- quat.Y = m_TelehubRotY;
- quat.Z = m_TelehubRotZ;
- quat.W = m_TelehubRotW;
-
- return quat;
- }
- else
- {
- // What else to do??
- Quaternion quat = new Quaternion();
-
- quat.X = m_TelehubRotX;
- quat.X = m_TelehubRotY;
- quat.X = m_TelehubRotZ;
- quat.X = m_TelehubRotW;
-
- return quat;
- }
- }
- set
- {
- m_TelehubRotX = value.X;
- m_TelehubRotY = value.Y;
- m_TelehubRotZ = value.Z;
- m_TelehubRotW = value.W;
- }
- }
-
- // Our Connected Telehub's SpawnPoints
- public List l_SpawnPoints = new List();
-
- // Add a SpawnPoint
- // ** These are not region coordinates **
- // They are relative to the Telehub coordinates
- //
- public void AddSpawnPoint(Vector3 point)
- {
- l_SpawnPoints.Add(point);
- }
-
- // Remove a SpawnPoint
- public void RemoveSpawnPoint(int point_index)
- {
- l_SpawnPoints.RemoveAt(point_index);
- }
-
- // Return the List of SpawnPoints
- public List SpawnPoints()
- {
- return l_SpawnPoints;
-
- }
-
- // Clear the SpawnPoints List of all entries
- public void ClearSpawnPoints()
- {
- l_SpawnPoints.Clear();
- }
}
}
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 673cf20..a2dd64f 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -26,6 +26,7 @@
*/
using System;
+using System.Collections.Generic;
using System.IO;
using OpenMetaverse;
@@ -397,5 +398,154 @@ namespace OpenSim.Framework
set { m_LoadedCreationID = value; }
}
+ // Telehub support
+ private bool m_TelehubEnabled = false;
+ public bool HasTelehub
+ {
+ get { return m_TelehubEnabled; }
+ set { m_TelehubEnabled = value; }
+ }
+
+ // Connected Telehub object
+ private UUID m_TelehubObject;
+ public UUID TelehubObject
+ {
+ get
+ {
+ if (HasTelehub)
+ {
+ return m_TelehubObject;
+ }
+ else
+ {
+ return UUID.Zero;
+ }
+ }
+ set
+ {
+ m_TelehubObject = value;
+ }
+ }
+
+ // Connected Telehub name
+ private string m_TelehubName;
+ public string TelehubName
+ {
+ get
+ {
+ if (HasTelehub)
+ {
+ return m_TelehubName;
+ }
+ else
+ {
+ return String.Empty;
+ }
+ }
+ set
+ {
+ m_TelehubName = value;
+ }
+ }
+
+ // Connected Telehub position
+ private float m_TelehubPosX;
+ private float m_TelehubPosY;
+ private float m_TelehubPosZ;
+ public Vector3 TelehubPos
+ {
+ get
+ {
+ if (HasTelehub)
+ {
+ Vector3 Pos = new Vector3(m_TelehubPosX, m_TelehubPosY, m_TelehubPosZ);
+ return Pos;
+ }
+ else
+ {
+ return Vector3.Zero;
+ }
+ }
+ set
+ {
+
+ m_TelehubPosX = value.X;
+ m_TelehubPosY = value.Y;
+ m_TelehubPosZ = value.Z;
+ }
+ }
+
+ // Connected Telehub rotation
+ private float m_TelehubRotX;
+ private float m_TelehubRotY;
+ private float m_TelehubRotZ;
+ private float m_TelehubRotW;
+ public Quaternion TelehubRot
+ {
+ get
+ {
+ if (HasTelehub)
+ {
+ Quaternion quat = new Quaternion();
+
+ quat.X = m_TelehubRotX;
+ quat.Y = m_TelehubRotY;
+ quat.Z = m_TelehubRotZ;
+ quat.W = m_TelehubRotW;
+
+ return quat;
+ }
+ else
+ {
+ // What else to do??
+ Quaternion quat = new Quaternion();
+
+ quat.X = m_TelehubRotX;
+ quat.X = m_TelehubRotY;
+ quat.X = m_TelehubRotZ;
+ quat.X = m_TelehubRotW;
+
+ return quat;
+ }
+ }
+ set
+ {
+ m_TelehubRotX = value.X;
+ m_TelehubRotY = value.Y;
+ m_TelehubRotZ = value.Z;
+ m_TelehubRotW = value.W;
+ }
+ }
+
+ // Our Connected Telehub's SpawnPoints
+ public List l_SpawnPoints = new List();
+
+ // Add a SpawnPoint
+ // ** These are not region coordinates **
+ // They are relative to the Telehub coordinates
+ //
+ public void AddSpawnPoint(Vector3 point)
+ {
+ l_SpawnPoints.Add(point);
+ }
+
+ // Remove a SpawnPoint
+ public void RemoveSpawnPoint(int point_index)
+ {
+ l_SpawnPoints.RemoveAt(point_index);
+ }
+
+ // Return the List of SpawnPoints
+ public List SpawnPoints()
+ {
+ return l_SpawnPoints;
+
+ }
+
+ // Clear the SpawnPoints List of all entries
+ public void ClearSpawnPoints()
+ {
+ l_SpawnPoints.Clear();
+ }
}
}
--
cgit v1.1
From 74c1ed77a44c96aed5c0b2c0eb828e6383792bfc Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Sun, 22 Jan 2012 14:51:15 -0500
Subject: Finish connecting Telehub to database
---
OpenSim/Framework/RegionSettings.cs | 50 +++++--------------------------------
1 file changed, 6 insertions(+), 44 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index a2dd64f..9b5bbf2 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -449,17 +449,14 @@ namespace OpenSim.Framework
}
// Connected Telehub position
- private float m_TelehubPosX;
- private float m_TelehubPosY;
- private float m_TelehubPosZ;
+ private Vector3 m_TelehubPos;
public Vector3 TelehubPos
{
get
{
if (HasTelehub)
{
- Vector3 Pos = new Vector3(m_TelehubPosX, m_TelehubPosY, m_TelehubPosZ);
- return Pos;
+ return m_TelehubPos;
}
else
{
@@ -468,53 +465,18 @@ namespace OpenSim.Framework
}
set
{
-
- m_TelehubPosX = value.X;
- m_TelehubPosY = value.Y;
- m_TelehubPosZ = value.Z;
+ m_TelehubPos = value;
}
}
// Connected Telehub rotation
- private float m_TelehubRotX;
- private float m_TelehubRotY;
- private float m_TelehubRotZ;
- private float m_TelehubRotW;
+ private Quaternion m_TelehubRot;
public Quaternion TelehubRot
{
get
- {
- if (HasTelehub)
- {
- Quaternion quat = new Quaternion();
-
- quat.X = m_TelehubRotX;
- quat.Y = m_TelehubRotY;
- quat.Z = m_TelehubRotZ;
- quat.W = m_TelehubRotW;
-
- return quat;
- }
- else
- {
- // What else to do??
- Quaternion quat = new Quaternion();
-
- quat.X = m_TelehubRotX;
- quat.X = m_TelehubRotY;
- quat.X = m_TelehubRotZ;
- quat.X = m_TelehubRotW;
-
- return quat;
- }
- }
+ { return m_TelehubRot; }
set
- {
- m_TelehubRotX = value.X;
- m_TelehubRotY = value.Y;
- m_TelehubRotZ = value.Z;
- m_TelehubRotW = value.W;
- }
+ { m_TelehubRot = value; }
}
// Our Connected Telehub's SpawnPoints
--
cgit v1.1
From 87799c1f3ddfbc4b0994cac4e54498520899e4d4 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 24 Jan 2012 00:32:10 +0000
Subject: Change Telehubs to store only the data that is really needed and not
additional redundant information.
---
OpenSim/Framework/RegionSettings.cs | 116 ++++++++++++++----------------------
1 file changed, 45 insertions(+), 71 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 9b5bbf2..0a59f43 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -32,6 +32,47 @@ using OpenMetaverse;
namespace OpenSim.Framework
{
+ public struct SpawnPoint
+ {
+ public float Yaw;
+ public float Pitch;
+ public float Distance;
+
+ public void SetLocation(Vector3 pos, Quaternion rot, Vector3 point)
+ {
+ // The point is an absolute position, so we need the relative
+ // location to the spawn point
+ Vector3 offset = pos - point;
+ Distance = Vector3.Mag(offset);
+
+ // Next we need to rotate this vector into the spawn point's
+ // coordinate system
+ offset = offset * rot;
+
+ Vector3 dir = Vector3.Normalize(offset);
+
+ // Get the bearing (yaw)
+ Yaw = (float)Math.Atan2(dir.Y, dir.X);
+
+ // Get the elevation (pitch)
+ Pitch = (float)-Math.Atan2(dir.Z, Math.Sqrt(dir.X * dir.X + dir.Y * dir.Y));
+ }
+
+ public Vector3 GetLocation(Vector3 pos, Quaternion rot)
+ {
+ Quaternion y = Quaternion.CreateFromEulers(0, 0, Yaw);
+ Quaternion p = Quaternion.CreateFromEulers(0, Pitch, 0);
+
+ Vector3 dir = new Vector3(1, 0, 0) * p * y;
+ Vector3 offset = dir * (float)Distance;
+
+ rot.W = -rot.W;
+ offset *= rot;
+
+ return pos + offset;
+ }
+ }
+
public class RegionSettings
{
public delegate void SaveDelegate(RegionSettings rs);
@@ -398,28 +439,13 @@ namespace OpenSim.Framework
set { m_LoadedCreationID = value; }
}
- // Telehub support
- private bool m_TelehubEnabled = false;
- public bool HasTelehub
- {
- get { return m_TelehubEnabled; }
- set { m_TelehubEnabled = value; }
- }
-
// Connected Telehub object
private UUID m_TelehubObject;
public UUID TelehubObject
{
get
{
- if (HasTelehub)
- {
- return m_TelehubObject;
- }
- else
- {
- return UUID.Zero;
- }
+ return m_TelehubObject;
}
set
{
@@ -427,66 +453,14 @@ namespace OpenSim.Framework
}
}
- // Connected Telehub name
- private string m_TelehubName;
- public string TelehubName
- {
- get
- {
- if (HasTelehub)
- {
- return m_TelehubName;
- }
- else
- {
- return String.Empty;
- }
- }
- set
- {
- m_TelehubName = value;
- }
- }
-
- // Connected Telehub position
- private Vector3 m_TelehubPos;
- public Vector3 TelehubPos
- {
- get
- {
- if (HasTelehub)
- {
- return m_TelehubPos;
- }
- else
- {
- return Vector3.Zero;
- }
- }
- set
- {
- m_TelehubPos = value;
- }
- }
-
- // Connected Telehub rotation
- private Quaternion m_TelehubRot;
- public Quaternion TelehubRot
- {
- get
- { return m_TelehubRot; }
- set
- { m_TelehubRot = value; }
- }
-
// Our Connected Telehub's SpawnPoints
- public List l_SpawnPoints = new List();
+ public List l_SpawnPoints = new List();
// Add a SpawnPoint
// ** These are not region coordinates **
// They are relative to the Telehub coordinates
//
- public void AddSpawnPoint(Vector3 point)
+ public void AddSpawnPoint(SpawnPoint point)
{
l_SpawnPoints.Add(point);
}
@@ -498,7 +472,7 @@ namespace OpenSim.Framework
}
// Return the List of SpawnPoints
- public List SpawnPoints()
+ public List SpawnPoints()
{
return l_SpawnPoints;
--
cgit v1.1
From c0e1784e86f3539656f4bc71aaddfc1df3d12d20 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 24 Jan 2012 01:17:41 +0000
Subject: Correct a coordinate to make the viewer like it
---
OpenSim/Framework/RegionSettings.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 0a59f43..399c795 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
Pitch = (float)-Math.Atan2(dir.Z, Math.Sqrt(dir.X * dir.X + dir.Y * dir.Y));
}
- public Vector3 GetLocation(Vector3 pos, Quaternion rot)
+ public Vector3 GetLocation(Quaternion rot)
{
Quaternion y = Quaternion.CreateFromEulers(0, 0, Yaw);
Quaternion p = Quaternion.CreateFromEulers(0, Pitch, 0);
@@ -69,7 +69,7 @@ namespace OpenSim.Framework
rot.W = -rot.W;
offset *= rot;
- return pos + offset;
+ return offset;
}
}
--
cgit v1.1
From 0d2e02efb1da5cba09a8cf306b83e5789529601c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 24 Jan 2012 01:29:50 +0000
Subject: Reverse the spawn point distance vector
---
OpenSim/Framework/RegionSettings.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 399c795..9ffde03 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Framework
{
// The point is an absolute position, so we need the relative
// location to the spawn point
- Vector3 offset = pos - point;
+ Vector3 offset = point - pos;
Distance = Vector3.Mag(offset);
// Next we need to rotate this vector into the spawn point's
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
Pitch = (float)-Math.Atan2(dir.Z, Math.Sqrt(dir.X * dir.X + dir.Y * dir.Y));
}
- public Vector3 GetLocation(Quaternion rot)
+ public Vector3 GetLocation(Vector3 pos, Quaternion rot)
{
Quaternion y = Quaternion.CreateFromEulers(0, 0, Yaw);
Quaternion p = Quaternion.CreateFromEulers(0, Pitch, 0);
@@ -69,7 +69,7 @@ namespace OpenSim.Framework
rot.W = -rot.W;
offset *= rot;
- return offset;
+ return pos + offset;
}
}
--
cgit v1.1
From a4977bbe190fb6c1eb5c45247b9222c719118fd4 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 24 Jan 2012 01:48:38 +0100
Subject: Simplify and streamline telehub editing code. Verify rotations and
fix spwan point positioning on rotated telehubs.
---
OpenSim/Framework/RegionSettings.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 9ffde03..e115432 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -47,6 +47,7 @@ namespace OpenSim.Framework
// Next we need to rotate this vector into the spawn point's
// coordinate system
+ rot.W = -rot.W;
offset = offset * rot;
Vector3 dir = Vector3.Normalize(offset);
@@ -66,7 +67,6 @@ namespace OpenSim.Framework
Vector3 dir = new Vector3(1, 0, 0) * p * y;
Vector3 offset = dir * (float)Distance;
- rot.W = -rot.W;
offset *= rot;
return pos + offset;
--
cgit v1.1
From e8f1e7e96e59ede55dbeb949b28980c4be1dd456 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 24 Jan 2012 22:03:30 +0000
Subject: Comment out inventory statistics section from periodic stats, since
this only contained the now uncollected and irrelevant inventory cache
number.
---
.../Framework/Statistics/SimExtraStatsCollector.cs | 29 +++++++++++-----------
1 file changed, 15 insertions(+), 14 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 5449757..3035a62 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -148,7 +148,8 @@ namespace OpenSim.Framework.Statistics
/// cover situations where the inventory service accepts the request but never returns any data, since
/// we do not yet timeout this situation.
///
- public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } }
+ /// Commented out because we do not cache inventory at this point
+// public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } }
///
/// Retrieve the total frame time (in ms) of the last frame
@@ -219,10 +220,10 @@ namespace OpenSim.Framework.Statistics
assetServiceRequestFailures++;
}
- public void AddInventoryServiceRetrievalFailure()
- {
- inventoryServiceRetrievalFailures++;
- }
+// public void AddInventoryServiceRetrievalFailure()
+// {
+// inventoryServiceRetrievalFailures++;
+// }
///
/// Register as a packet queue stats provider
@@ -328,13 +329,13 @@ Asset service request failures: {3}" + Environment.NewLine,
"Abnormal client thread terminations: {0}" + Environment.NewLine,
abnormalClientThreadTerminations));
- sb.Append(Environment.NewLine);
- sb.Append("INVENTORY STATISTICS");
- sb.Append(Environment.NewLine);
- sb.Append(
- string.Format(
- "Initial inventory caching failures: {0}" + Environment.NewLine,
- InventoryServiceRetrievalFailures));
+// sb.Append(Environment.NewLine);
+// sb.Append("INVENTORY STATISTICS");
+// sb.Append(Environment.NewLine);
+// sb.Append(
+// string.Format(
+// "Initial inventory caching failures: {0}" + Environment.NewLine,
+// InventoryServiceRetrievalFailures));
sb.Append(Environment.NewLine);
sb.Append("FRAME STATISTICS");
@@ -399,8 +400,8 @@ Asset service request failures: {3}" + Environment.NewLine,
AssetServiceRequestFailures));
args["abnormalClientThreadTerminations"] = OSD.FromString (String.Format ("{0:0.##}",
abnormalClientThreadTerminations));
- args["InventoryServiceRetrievalFailures"] = OSD.FromString (String.Format ("{0:0.##}",
- InventoryServiceRetrievalFailures));
+// args["InventoryServiceRetrievalFailures"] = OSD.FromString (String.Format ("{0:0.##}",
+// InventoryServiceRetrievalFailures));
args["Dilatn"] = OSD.FromString (String.Format ("{0:0.##}", timeDilation));
args["SimFPS"] = OSD.FromString (String.Format ("{0:0.##}", simFps));
args["PhyFPS"] = OSD.FromString (String.Format ("{0:0.##}", physicsFps));
--
cgit v1.1
From 09baa3e679e9f3719a7fa533a31ebe2a2e75743a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 24 Jan 2012 22:14:21 +0000
Subject: Comment out asset statistics section from periodic stats as these
have not been recorded for a very long time.
Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness.
Some data is available via other means (e.g. "fcache status").
---
.../Framework/Statistics/SimExtraStatsCollector.cs | 217 +++++++++++----------
1 file changed, 109 insertions(+), 108 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
index 3035a62..a506e3b 100644
--- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs
@@ -42,15 +42,15 @@ namespace OpenSim.Framework.Statistics
{
private long abnormalClientThreadTerminations;
- private long assetsInCache;
- private long texturesInCache;
- private long assetCacheMemoryUsage;
- private long textureCacheMemoryUsage;
- private TimeSpan assetRequestTimeAfterCacheMiss;
- private long blockedMissingTextureRequests;
+// private long assetsInCache;
+// private long texturesInCache;
+// private long assetCacheMemoryUsage;
+// private long textureCacheMemoryUsage;
+// private TimeSpan assetRequestTimeAfterCacheMiss;
+// private long blockedMissingTextureRequests;
- private long assetServiceRequestFailures;
- private long inventoryServiceRetrievalFailures;
+// private long assetServiceRequestFailures;
+// private long inventoryServiceRetrievalFailures;
private volatile float timeDilation;
private volatile float simFps;
@@ -79,27 +79,27 @@ namespace OpenSim.Framework.Statistics
///
public long AbnormalClientThreadTerminations { get { return abnormalClientThreadTerminations; } }
- ///
- /// These statistics are being collected by push rather than pull. Pull would be simpler, but I had the
- /// notion of providing some flow statistics (which pull wouldn't give us). Though admittedly these
- /// haven't yet been implemented...
- ///
- public long AssetsInCache { get { return assetsInCache; } }
-
- ///
- /// Currently unused
- ///
- public long TexturesInCache { get { return texturesInCache; } }
-
- ///
- /// Currently misleading since we can't currently subtract removed asset memory usage without a performance hit
- ///
- public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } }
-
- ///
- /// Currently unused
- ///
- public long TextureCacheMemoryUsage { get { return textureCacheMemoryUsage; } }
+// ///
+// /// These statistics are being collected by push rather than pull. Pull would be simpler, but I had the
+// /// notion of providing some flow statistics (which pull wouldn't give us). Though admittedly these
+// /// haven't yet been implemented...
+// ///
+// public long AssetsInCache { get { return assetsInCache; } }
+//
+// ///
+// /// Currently unused
+// ///
+// public long TexturesInCache { get { return texturesInCache; } }
+//
+// ///
+// /// Currently misleading since we can't currently subtract removed asset memory usage without a performance hit
+// ///
+// public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } }
+//
+// ///
+// /// Currently unused
+// ///
+// public long TextureCacheMemoryUsage { get { return textureCacheMemoryUsage; } }
public float TimeDilation { get { return timeDilation; } }
public float SimFps { get { return simFps; } }
@@ -123,25 +123,25 @@ namespace OpenSim.Framework.Statistics
public float ActiveScripts { get { return activeScripts; } }
public float ScriptLinesPerSecond { get { return scriptLinesPerSecond; } }
- ///
- /// This is the time it took for the last asset request made in response to a cache miss.
- ///
- public TimeSpan AssetRequestTimeAfterCacheMiss { get { return assetRequestTimeAfterCacheMiss; } }
-
- ///
- /// Number of persistent requests for missing textures we have started blocking from clients. To some extent
- /// this is just a temporary statistic to keep this problem in view - the root cause of this lies either
- /// in a mishandling of the reply protocol, related to avatar appearance or may even originate in graphics
- /// driver bugs on clients (though this seems less likely).
- ///
- public long BlockedMissingTextureRequests { get { return blockedMissingTextureRequests; } }
-
- ///
- /// Record the number of times that an asset request has failed. Failures are effectively exceptions, such as
- /// request timeouts. If an asset service replies that a particular asset cannot be found, this is not counted
- /// as a failure
- ///
- public long AssetServiceRequestFailures { get { return assetServiceRequestFailures; } }
+// ///
+// /// This is the time it took for the last asset request made in response to a cache miss.
+// ///
+// public TimeSpan AssetRequestTimeAfterCacheMiss { get { return assetRequestTimeAfterCacheMiss; } }
+//
+// ///
+// /// Number of persistent requests for missing textures we have started blocking from clients. To some extent
+// /// this is just a temporary statistic to keep this problem in view - the root cause of this lies either
+// /// in a mishandling of the reply protocol, related to avatar appearance or may even originate in graphics
+// /// driver bugs on clients (though this seems less likely).
+// ///
+// public long BlockedMissingTextureRequests { get { return blockedMissingTextureRequests; } }
+//
+// ///
+// /// Record the number of times that an asset request has failed. Failures are effectively exceptions, such as
+// /// request timeouts. If an asset service replies that a particular asset cannot be found, this is not counted
+// /// as a failure
+// ///
+// public long AssetServiceRequestFailures { get { return assetServiceRequestFailures; } }
///
/// Number of known failures to retrieve avatar inventory from the inventory service. This does not
@@ -172,53 +172,53 @@ namespace OpenSim.Framework.Statistics
abnormalClientThreadTerminations++;
}
- public void AddAsset(AssetBase asset)
- {
- assetsInCache++;
- //assetCacheMemoryUsage += asset.Data.Length;
- }
-
- public void RemoveAsset(UUID uuid)
- {
- assetsInCache--;
- }
-
- public void AddTexture(AssetBase image)
- {
- if (image.Data != null)
- {
- texturesInCache++;
-
- // This could have been a pull stat, though there was originally a nebulous idea to measure flow rates
- textureCacheMemoryUsage += image.Data.Length;
- }
- }
-
- ///
- /// Signal that the asset cache has been cleared.
- ///
- public void ClearAssetCacheStatistics()
- {
- assetsInCache = 0;
- assetCacheMemoryUsage = 0;
- texturesInCache = 0;
- textureCacheMemoryUsage = 0;
- }
-
- public void AddAssetRequestTimeAfterCacheMiss(TimeSpan ts)
- {
- assetRequestTimeAfterCacheMiss = ts;
- }
-
- public void AddBlockedMissingTextureRequest()
- {
- blockedMissingTextureRequests++;
- }
-
- public void AddAssetServiceRequestFailure()
- {
- assetServiceRequestFailures++;
- }
+// public void AddAsset(AssetBase asset)
+// {
+// assetsInCache++;
+// //assetCacheMemoryUsage += asset.Data.Length;
+// }
+//
+// public void RemoveAsset(UUID uuid)
+// {
+// assetsInCache--;
+// }
+//
+// public void AddTexture(AssetBase image)
+// {
+// if (image.Data != null)
+// {
+// texturesInCache++;
+//
+// // This could have been a pull stat, though there was originally a nebulous idea to measure flow rates
+// textureCacheMemoryUsage += image.Data.Length;
+// }
+// }
+//
+// ///
+// /// Signal that the asset cache has been cleared.
+// ///
+// public void ClearAssetCacheStatistics()
+// {
+// assetsInCache = 0;
+// assetCacheMemoryUsage = 0;
+// texturesInCache = 0;
+// textureCacheMemoryUsage = 0;
+// }
+//
+// public void AddAssetRequestTimeAfterCacheMiss(TimeSpan ts)
+// {
+// assetRequestTimeAfterCacheMiss = ts;
+// }
+//
+// public void AddBlockedMissingTextureRequest()
+// {
+// blockedMissingTextureRequests++;
+// }
+//
+// public void AddAssetServiceRequestFailure()
+// {
+// assetServiceRequestFailures++;
+// }
// public void AddInventoryServiceRetrievalFailure()
// {
@@ -291,8 +291,8 @@ namespace OpenSim.Framework.Statistics
public override string Report()
{
StringBuilder sb = new StringBuilder(Environment.NewLine);
- sb.Append("ASSET STATISTICS");
- sb.Append(Environment.NewLine);
+// sb.Append("ASSET STATISTICS");
+// sb.Append(Environment.NewLine);
/*
sb.Append(
@@ -308,7 +308,8 @@ Asset service request failures: {6}"+ Environment.NewLine,
BlockedMissingTextureRequests,
AssetServiceRequestFailures));
*/
-
+
+ /*
sb.Append(
string.Format(
@"Asset cache contains {0,6} assets
@@ -319,7 +320,7 @@ Asset service request failures: {3}" + Environment.NewLine,
assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0,
BlockedMissingTextureRequests,
AssetServiceRequestFailures));
-
+ */
sb.Append(Environment.NewLine);
sb.Append("CONNECTION STATISTICS");
@@ -391,15 +392,15 @@ Asset service request failures: {3}" + Environment.NewLine,
public override string XReport(string uptime, string version)
{
OSDMap args = new OSDMap(30);
- args["AssetsInCache"] = OSD.FromString (String.Format ("{0:0.##}", AssetsInCache));
- args["TimeAfterCacheMiss"] = OSD.FromString (String.Format ("{0:0.##}",
- assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0));
- args["BlockedMissingTextureRequests"] = OSD.FromString (String.Format ("{0:0.##}",
- BlockedMissingTextureRequests));
- args["AssetServiceRequestFailures"] = OSD.FromString (String.Format ("{0:0.##}",
- AssetServiceRequestFailures));
- args["abnormalClientThreadTerminations"] = OSD.FromString (String.Format ("{0:0.##}",
- abnormalClientThreadTerminations));
+// args["AssetsInCache"] = OSD.FromString (String.Format ("{0:0.##}", AssetsInCache));
+// args["TimeAfterCacheMiss"] = OSD.FromString (String.Format ("{0:0.##}",
+// assetRequestTimeAfterCacheMiss.Milliseconds / 1000.0));
+// args["BlockedMissingTextureRequests"] = OSD.FromString (String.Format ("{0:0.##}",
+// BlockedMissingTextureRequests));
+// args["AssetServiceRequestFailures"] = OSD.FromString (String.Format ("{0:0.##}",
+// AssetServiceRequestFailures));
+// args["abnormalClientThreadTerminations"] = OSD.FromString (String.Format ("{0:0.##}",
+// abnormalClientThreadTerminations));
// args["InventoryServiceRetrievalFailures"] = OSD.FromString (String.Format ("{0:0.##}",
// InventoryServiceRetrievalFailures));
args["Dilatn"] = OSD.FromString (String.Format ("{0:0.##}", timeDilation));
--
cgit v1.1
From 8f53c768f53478ff3e0c27198b257bb27be16259 Mon Sep 17 00:00:00 2001
From: Pixel Tomsen
Date: Wed, 25 Jan 2012 21:31:18 +0100
Subject: llGetParcelMusicURL implementation
http://wiki.secondlife.com/wiki/LlGetParcelMusicURL
Signed-off-by: BlueWall
---
OpenSim/Framework/ILandObject.cs | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 0316944..f75a990 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -130,5 +130,11 @@ namespace OpenSim.Framework
///
///
void SetMusicUrl(string url);
+
+ ///
+ /// Get the music url for this land parcel
+ ///
+ /// The music url.
+ string GetMusicUrl();
}
}
--
cgit v1.1
From 616373db169fbfc06652fb3f2d40b531426f6dd3 Mon Sep 17 00:00:00 2001
From: PixelTomsen
Date: Thu, 26 Jan 2012 21:53:42 +0100
Subject: llManageEstateAccess implementation
http://wiki.secondlife.com/wiki/LlManageEstateAccess
Signed-off-by: BlueWall
---
OpenSim/Framework/EstateSettings.cs | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 2a495b0..98604f2 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -373,5 +373,11 @@ namespace OpenSim.Framework
return l_EstateAccess.Contains(user);
}
+
+ public bool GroupAccess(UUID groupID)
+ {
+ return l_EstateGroups.Contains(groupID);
+ }
+
}
}
--
cgit v1.1
From 7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 28 Jan 2012 00:18:12 +0000
Subject: Remove IClientAPI from the money module. It was only used to pass in
the agent id anyway
---
OpenSim/Framework/IMoneyModule.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 3d4873d..1e09728 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -36,8 +36,8 @@ namespace OpenSim.Framework
int amount);
int GetBalance(UUID agentID);
- bool UploadCovered(IClientAPI client, int amount);
- bool AmountCovered(IClientAPI client, int amount);
+ bool UploadCovered(UUID agentID, int amount);
+ bool AmountCovered(UUID agentID, int amount);
void ApplyCharge(UUID agentID, int amount, string text);
void ApplyUploadCharge(UUID agentID, int amount, string text);
--
cgit v1.1
From 3de534896efe4014f50b03624d3b9db82cd92cae Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 30 Jan 2012 16:22:21 +0000
Subject: Add ParcelImageID to RegionSettings so we can have that overlay.
Warning: Contains a Migration. Warning: May contain nuts.
---
OpenSim/Framework/RegionSettings.cs | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index e115432..91e07df 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -373,6 +373,14 @@ namespace OpenSim.Framework
set { m_SunVector = value; }
}
+ private UUID m_ParcelImageID;
+
+ public UUID ParcelImageID
+ {
+ get { return m_ParcelImageID; }
+ set { m_ParcelImageID = value; }
+ }
+
private UUID m_TerrainImageID;
public UUID TerrainImageID
--
cgit v1.1
From 1505c22995e411af0c7e29d0331cdf244d69fd4c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 31 Jan 2012 21:09:26 +0000
Subject: Use Environment.TickCount & Int32.MaxValue; instead of
Util.EnvironmentTickCount(); when producing the threads report to reduce
wraparound.
This matches the tickcount masking in the thread watchdog.
For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
---
OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 4c381d0..545e76c 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Framework.Servers
sb.Append(threads.Length + " threads are being tracked:" + Environment.NewLine);
- int timeNow = Util.EnvironmentTickCount();
+ int timeNow = Environment.TickCount & Int32.MaxValue;
sb.AppendFormat(reportFormat, "ID", "NAME", "LAST UPDATE (MS)", "LIFETIME (MS)", "PRIORITY", "STATE");
sb.Append(Environment.NewLine);
--
cgit v1.1