From 63c1b7e4754271ec898592ba6209dbc776469370 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 21 Apr 2011 18:12:29 +0100
Subject: Alter uuid gather so that it properly analyzes coalesced objects.
This should correct save all the assets required for the items within the coalesced objects in an IAR. This should also correctly gather the items on hypergrid takes.
---
.../CoalescedSceneObjectsSerializer.cs | 47 +++++++++++++---------
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 18 +++++++--
2 files changed, 43 insertions(+), 22 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index babcb54..55455cc 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -117,29 +117,40 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
{
using (XmlTextReader reader = new XmlTextReader(sr))
{
- reader.Read();
- if (reader.Name != "CoalescedObject")
+ try
{
-// m_log.DebugFormat(
-// "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false",
-// reader.Name);
+ reader.Read();
+ if (reader.Name != "CoalescedObject")
+ {
+ // m_log.DebugFormat(
+ // "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false",
+ // reader.Name);
+
+ return false;
+ }
- return false;
- }
-
- coa = new CoalescedSceneObjects(UUID.Zero);
- reader.Read();
-
- while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
- {
- if (reader.Name == "SceneObjectGroup")
+ coa = new CoalescedSceneObjects(UUID.Zero);
+ reader.Read();
+
+ while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
{
- string soXml = reader.ReadOuterXml();
- coa.Add(SceneObjectSerializer.FromOriginalXmlFormat(soXml));
+ if (reader.Name == "SceneObjectGroup")
+ {
+ string soXml = reader.ReadOuterXml();
+ coa.Add(SceneObjectSerializer.FromOriginalXmlFormat(soXml));
+ }
}
+
+ reader.ReadEndElement(); // CoalescedObject
}
-
- reader.ReadEndElement(); // CoalescedObject
+ catch (Exception e)
+ {
+ m_log.ErrorFormat(
+ "[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed with {0} {1}",
+ e.Message, e.StackTrace);
+
+ return false;
+ }
}
}
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 83906d7..77b1535 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -298,10 +298,20 @@ namespace OpenSim.Region.Framework.Scenes
if (null != objectAsset)
{
string xml = Utils.BytesToString(objectAsset.Data);
- SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
-
- if (null != sog)
- GatherAssetUuids(sog, assetUuids);
+
+ CoalescedSceneObjects coa;
+ if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
+ {
+ foreach (SceneObjectGroup sog in coa.Objects)
+ GatherAssetUuids(sog, assetUuids);
+ }
+ else
+ {
+ SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
+
+ if (null != sog)
+ GatherAssetUuids(sog, assetUuids);
+ }
}
}
--
cgit v1.1
From e36cab99fddc4dca338386101d5c204e6de5d2c5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 21 Apr 2011 18:45:05 +0100
Subject: minor: small amount of method doc and some commented out odds and
ends
---
.../Framework/Scenes/SceneObjectGroup.Inventory.cs | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index e8095c0..4bca3d0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -81,16 +81,20 @@ namespace OpenSim.Region.Framework.Scenes
}
///
- /// Add an inventory item to a prim in this group.
+ /// Add an inventory item from a user's inventory to a prim in this scene object.
///
- ///
- ///
- ///
+ /// The client adding the item.
+ /// The local ID of the part receiving the add.
+ /// The user inventory item being added.
/// The item UUID that should be used by the new item.
///
public bool AddInventoryItem(IClientAPI remoteClient, uint localID,
InventoryItemBase item, UUID copyItemID)
{
+// m_log.DebugFormat(
+// "[PRIM INVENTORY]: Adding inventory item {0} from {1} to part with local ID {2}",
+// item.Name, remoteClient.Name, localID);
+
UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID;
SceneObjectPart part = GetChildPart(localID);
@@ -132,15 +136,20 @@ namespace OpenSim.Region.Framework.Scenes
taskItem.GroupPermissions = item.GroupPermissions;
taskItem.NextPermissions = item.NextPermissions;
}
-
+
taskItem.Flags = item.Flags;
+
+// m_log.DebugFormat(
+// "[PRIM INVENTORY]: Flags are 0x{0:X} for item {1} added to part {2} by {3}",
+// taskItem.Flags, taskItem.Name, localID, remoteClient.Name);
+
// TODO: These are pending addition of those fields to TaskInventoryItem
// taskItem.SalePrice = item.SalePrice;
// taskItem.SaleType = item.SaleType;
taskItem.CreationDate = (uint)item.CreationDate;
bool addFromAllowedDrop = false;
- if (remoteClient!=null)
+ if (remoteClient != null)
{
addFromAllowedDrop = remoteClient.AgentId != part.OwnerID;
}
--
cgit v1.1
From 60685c35179c74c5714abdb0c17611fb59d52c10 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 21 Apr 2011 19:17:38 +0100
Subject: Adjust freeswitch logging to be somewhat less noisy. However, there
is still quite a large amount of logging present for debug purposes.
---
.../Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 27 ++++++++++++++--------
1 file changed, 18 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 373ffeb..42efd67 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -391,7 +391,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
string r = LLSDHelpers.SerialiseLLSDReply(voiceAccountResponse);
- m_log.DebugFormat("[FreeSwitchVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r);
+// m_log.DebugFormat("[FreeSwitchVoice][PROVISIONVOICE]: avatar \"{0}\": {1}", avatarName, r);
return r;
}
@@ -458,8 +458,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
if ((land.Flags & (uint)ParcelFlags.AllowVoiceChat) == 0)
{
- m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel",
- scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName);
+// m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": voice not enabled for parcel",
+// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName);
channelUri = String.Empty;
}
else
@@ -474,8 +474,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
parcelVoiceInfo = new LLSDParcelVoiceInfoResponse(scene.RegionInfo.RegionName, land.LocalID, creds);
string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo);
- m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}",
- scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r);
+// m_log.DebugFormat("[FreeSwitchVoice][PARCELVOICE]: region \"{0}\": Parcel \"{1}\" ({2}): avatar \"{3}\": {4}",
+// scene.RegionInfo.RegionName, land.Name, land.LocalID, avatarName, r);
return r;
}
catch (Exception e)
@@ -850,16 +850,25 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
Hashtable requestBody = ParseRequestBody((string)request["body"]);
- string section = (string) requestBody["section"];
-
- m_log.DebugFormat("[FreeSwitchVoice]: Received request for config section {0}", section);
+ string section = (string) requestBody["section"];
if (section == "directory")
+ {
+ string eventCallingFunction = (string)requestBody["Event-Calling-Function"];
+ m_log.DebugFormat(
+ "[FreeSwitchVoice]: Received request for config section directory, event calling function '{0}'",
+ eventCallingFunction);
+
response = m_FreeswitchService.HandleDirectoryRequest(requestBody);
+ }
else if (section == "dialplan")
+ {
+ m_log.DebugFormat("[FreeSwitchVoice]: Received request for config section dialplan");
+
response = m_FreeswitchService.HandleDialplanRequest(requestBody);
+ }
else
- m_log.WarnFormat("[FreeSwitchVoice]: Unknown section {0} was requested.", section);
+ m_log.WarnFormat("[FreeSwitchVoice]: Unknown section {0} was requested from config.", section);
return response;
}
--
cgit v1.1
From d9055c8dc3f5a768b300aa72318c813bbc024e09 Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 21 Apr 2011 15:12:52 -0400
Subject: Group collada meshies settings under [Mesh] in OpensimDefaults.ini
---
OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 211a0a7..64774d8 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -84,10 +84,11 @@ namespace OpenSim.Region.Physics.Meshing
public Meshmerizer(IConfigSource config)
{
IConfig start_config = config.Configs["Startup"];
+ IConfig mesh_config = config.Configs["Mesh"];
decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
- useMeshiesPhysicsMesh = start_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
+ useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
try
{
--
cgit v1.1
From 13d6e05d5a346dcb9dbaec29af37ee63be790acb Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 21 Apr 2011 23:03:38 +0100
Subject: Implement agent limits
---
OpenSim/Region/Framework/Scenes/Scene.cs | 20 ++++++++++++++++++++
OpenSim/Region/Framework/Scenes/SceneGraph.cs | 5 +++++
2 files changed, 25 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fdd5205..01de824 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3665,6 +3665,15 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
+ int num = m_sceneGraph.GetNumberOfScenePresences();
+
+ if (num >= RegionInfo.RegionSettings.AgentLimit)
+ {
+ if (!Permissions.IsAdministrator(cAgentData.AgentID))
+ return false;
+ }
+
+
ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
if (childAgentUpdate != null)
@@ -4966,6 +4975,17 @@ namespace OpenSim.Region.Framework.Scenes
// child agent creation, thereby emulating the SL behavior.
public bool QueryAccess(UUID agentID, Vector3 position, out string reason)
{
+ int num = m_sceneGraph.GetNumberOfScenePresences();
+
+ if (num >= RegionInfo.RegionSettings.AgentLimit)
+ {
+ if (!Permissions.IsAdministrator(agentID))
+ {
+ reason = "The region is full";
+ return false;
+ }
+ }
+
reason = String.Empty;
return true;
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 72f0402..fc31b65 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -800,6 +800,11 @@ namespace OpenSim.Region.Framework.Scenes
return m_scenePresenceArray;
}
+ public int GetNumberOfScenePresences()
+ {
+ return m_scenePresenceArray.Count;
+ }
+
///
/// Request a scene presence by UUID. Fast, indexed lookup.
///
--
cgit v1.1
From e0002f6b64e7aeb29de9f1db92ed39d3d1df578c Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 21 Apr 2011 19:04:41 -0400
Subject: some mesh config asthetics
---
OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | 2 +-
.../Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
index deec444..fc1ddef 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
if (meshConfig == null)
return;
- m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
+ m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
}
public void AddRegion(Scene pScene)
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
index d651cb2..3d4c7b7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
if (meshConfig == null)
return;
- m_enabled = meshConfig.GetBoolean("ColladaMesh", true);
+ m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
}
public void AddRegion(Scene pScene)
--
cgit v1.1
From 44e43d9d240735695668849fbd7aaafd339f262d Mon Sep 17 00:00:00 2001
From: E. Allen Soard
Date: Fri, 15 Apr 2011 06:17:26 -0700
Subject: Added MaxAgents configuration option to RegionConfig.ini allowing
region hosters to setup regions maintaining more control over system
resources.
---
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index ab90e90..3aed6ba 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -125,7 +125,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
else
Scene.RegionInfo.RegionSettings.AllowLandResell = true;
- Scene.RegionInfo.RegionSettings.AgentLimit = (byte) maxAgents;
+ if((byte)maxAgents <= Scene.RegionInfo.AgentCapacity)
+ Scene.RegionInfo.RegionSettings.AgentLimit = (byte) maxAgents;
+ else
+ Scene.RegionInfo.RegionSettings.AgentLimit = Scene.RegionInfo.AgentCapacity;
Scene.RegionInfo.RegionSettings.ObjectBonus = objectBonusFactor;
--
cgit v1.1