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(-)
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(-)
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 ++++++++++++++--------
.../FreeswitchService/FreeswitchService.cs | 8 +++----
2 files changed, 21 insertions(+), 14 deletions(-)
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;
}
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
index 1ec89da..c3f1056 100644
--- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs
+++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Services.FreeswitchService
foreach (DictionaryEntry item in request)
{
- m_log.InfoFormat("[FreeSwitchDirectory]: requestBody item {0} {1}",item.Key, item.Value);
+// m_log.InfoFormat("[FreeSwitchDirectory]: requestBody item {0} {1}",item.Key, item.Value);
}
string requestcontext = (string) request["Hunt-Context"];
@@ -146,10 +146,8 @@ namespace OpenSim.Services.FreeswitchService
//domain=9.20.151.43
//ip=9.167.220.137 // this is the correct IP rather than sip_contact_host above when through a vpn or NAT setup
- foreach (DictionaryEntry item in request)
- {
- m_log.DebugFormat("[FreeSwitchDirectory]: requestBody item {0} {1}", item.Key, item.Value);
- }
+// foreach (DictionaryEntry item in request)
+// m_log.DebugFormat("[FreeSwitchDirectory]: requestBody item {0} {1}", item.Key, item.Value);
string eventCallingFunction = (string) request["Event-Calling-Function"];
if (eventCallingFunction == null)
--
cgit v1.1
From 223c90c7510e9dcf0bbf15535dbd6e9e9d2cfa96 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 21 Apr 2011 19:31:37 +0100
Subject: Remove duplicated freeswitch settings.
---
bin/Robust.HG.ini.example | 4 ----
1 file changed, 4 deletions(-)
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index ced2857..e2e9624 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -117,10 +117,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
; EchoPort = 50505
; AttemptSTUN = false
- LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"
- ;; IP of your FS server
- ; ServerAddress = 127.0.0.1
-
; * This is the new style authentication service. Currently, only MySQL
; * is implemented.
; *
--
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 ++-
bin/OpenSimDefaults.ini | 12 ++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
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
{
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index e72e851..b134b7e 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -149,12 +149,6 @@
; to false if you have compatibility problems.
;CacheSculptMaps = true
- ; if you use Meshmerizer and want collisions for meshies, setting this to true
- ; will cause OpenSim to attempt to decode meshies assets, extract the physics
- ; mesh, and use it for collisions. This is currently experimental code and enabling
- ; it may cause unexpected physics problems.
- ;UseMeshiesPhysicsMesh = false
-
; Choose one of the physics engines below
; OpenDynamicsEngine is by some distance the most developed physics engine
; basicphysics effectively does not model physics at all, making all objects phantom
@@ -461,6 +455,12 @@
; default is true
; ColladaMesh = true
+ ; if you use Meshmerizer and want collisions for meshies, setting this to true
+ ; will cause OpenSim to attempt to decode meshies assets, extract the physics
+ ; mesh, and use it for collisions. This is currently experimental code and enabling
+ ; it may cause unexpected physics problems.
+ ;UseMeshiesPhysicsMesh = false
+
[ODEPhysicsSettings]
;##
--
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(+)
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 +-
bin/OpenSimDefaults.ini | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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)
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index b134b7e..7ea98d4 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -453,7 +453,7 @@
[Mesh]
; enable / disable Collada mesh support
; default is true
- ; ColladaMesh = true
+ ; AllowMeshUpload = true
; if you use Meshmerizer and want collisions for meshies, setting this to true
; will cause OpenSim to attempt to decode meshies assets, extract the physics
--
cgit v1.1
From d5256094d975583876766b630bcf0ede1d3dd3e4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Apr 2011 00:16:55 +0100
Subject: print invalid command message to the console, not the log
---
OpenSim/Framework/Console/CommandConsole.cs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 52bcd55..be36cf2 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -592,9 +592,7 @@ namespace OpenSim.Framework.Console
string line = ReadLine(m_defaultPrompt + "# ", true, true);
if (line != String.Empty)
- {
- m_log.Info("[CONSOLE] Invalid command");
- }
+ Output("Invalid command");
}
public void RunCommand(string cmd)
--
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/Framework/RegionInfo.cs | 17 +++++++++++++++++
.../CoreModules/World/Estate/EstateManagementModule.cs | 5 ++++-
bin/RegionConfig.ini.example | 1 +
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index daf0a25..239ce3d 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -369,6 +369,7 @@ namespace OpenSim.Framework
private int m_physPrimMax = 0;
private bool m_clampPrimSize = false;
private int m_objectCapacity = 0;
+ private int m_agentCapacity = 0;
private string m_regionType = String.Empty;
private RegionLightShareData m_windlight = new RegionLightShareData();
protected uint m_httpPort;
@@ -547,6 +548,11 @@ namespace OpenSim.Framework
get { return m_objectCapacity; }
}
+ public int AgentCapacity
+ {
+ get { return m_agentCapacity; }
+ }
+
public byte AccessLevel
{
get { return (byte)Util.ConvertMaturityToAccessLevel((uint)RegionSettings.Maturity); }
@@ -821,6 +827,8 @@ namespace OpenSim.Framework
m_objectCapacity = config.GetInt("MaxPrims", 15000);
+ m_agentCapacity = config.GetInt("MaxAgents", 100);
+
// Multi-tenancy
//
@@ -857,6 +865,9 @@ namespace OpenSim.Framework
if (m_objectCapacity != 0)
config.Set("MaxPrims", m_objectCapacity);
+ if (m_agentCapacity != 0)
+ config.Set("MaxAgents", m_agentCapacity);
+
if (ScopeID != UUID.Zero)
config.Set("ScopeID", ScopeID.ToString());
@@ -943,6 +954,9 @@ namespace OpenSim.Framework
configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
"Max objects this sim will hold", m_objectCapacity.ToString(), true);
+ configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+ "Max avatars this sim will hold", m_agentCapacity.ToString(), true);
+
configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
"Scope ID for this region", ScopeID.ToString(), true);
@@ -1055,6 +1069,9 @@ namespace OpenSim.Framework
case "object_capacity":
m_objectCapacity = (int)configuration_result;
break;
+ case "agent_capacity":
+ m_agentCapacity = (int)configuration_result;
+ break;
case "scope_id":
ScopeID = (UUID)configuration_result;
break;
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;
diff --git a/bin/RegionConfig.ini.example b/bin/RegionConfig.ini.example
index d45fe9d..ff00ddf 100644
--- a/bin/RegionConfig.ini.example
+++ b/bin/RegionConfig.ini.example
@@ -28,6 +28,7 @@ ExternalHostName = "SYSTEMIP"
; PhysicalPrimMax = 10
; ClampPrimSize = False
; MaxPrims = 15000
+; MaxAgents = 100
; *
; * Multi-Tenancy. Only set if needed
--
cgit v1.1
From e3c3d626fb00fbc85dfc10755be0ee140f0b5a6f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 24 Apr 2011 16:14:24 -0700
Subject: Commented verbose debug message.
---
OpenSim/Services/InventoryService/XInventoryService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index e602412..0af35c8 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -244,7 +244,7 @@ namespace OpenSim.Services.InventoryService
// connector. So we disregard the principal and look
// by ID.
//
- m_log.DebugFormat("[XINVENTORY SERVICE]: Fetch contents for folder {0}", folderID.ToString());
+ //m_log.DebugFormat("[XINVENTORY SERVICE]: Fetch contents for folder {0}", folderID.ToString());
InventoryCollection inventory = new InventoryCollection();
inventory.UserID = principalID;
inventory.Folders = new List();
--
cgit v1.1
From 507f0e9ffdeae9c8941171f9128f2948873f6e38 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 24 Apr 2011 16:21:01 -0700
Subject: Upped VERSION_NUMBER in master to 0.7.2.
---
OpenSim/Framework/Servers/VersionInfo.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index c9d4c93..53a3f17 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,7 +29,7 @@ namespace OpenSim
{
public class VersionInfo
{
- private const string VERSION_NUMBER = "0.7.1";
+ private const string VERSION_NUMBER = "0.7.2";
private const Flavour VERSION_FLAVOUR = Flavour.Dev;
public enum Flavour
--
cgit v1.1
From 35c09cae8c572c3b0dcc4b680dfe908d1253e8a9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 24 Apr 2011 19:06:48 -0700
Subject: Removed unused libraries Castle.*
---
bin/Castle.Core.dll | Bin 73728 -> 0 bytes
bin/Castle.DynamicProxy.dll | Bin 63488 -> 0 bytes
bin/Castle.DynamicProxy2.dll | Bin 106496 -> 0 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 bin/Castle.Core.dll
delete mode 100644 bin/Castle.DynamicProxy.dll
delete mode 100644 bin/Castle.DynamicProxy2.dll
diff --git a/bin/Castle.Core.dll b/bin/Castle.Core.dll
deleted file mode 100644
index 2464e66..0000000
Binary files a/bin/Castle.Core.dll and /dev/null differ
diff --git a/bin/Castle.DynamicProxy.dll b/bin/Castle.DynamicProxy.dll
deleted file mode 100644
index 8540495..0000000
Binary files a/bin/Castle.DynamicProxy.dll and /dev/null differ
diff --git a/bin/Castle.DynamicProxy2.dll b/bin/Castle.DynamicProxy2.dll
deleted file mode 100644
index 83e192e..0000000
Binary files a/bin/Castle.DynamicProxy2.dll and /dev/null differ
--
cgit v1.1
From 0d5a80ad784993a4c737590cafa0303930d00a86 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 24 Apr 2011 19:14:39 -0700
Subject: Removed unused libraries: RAILS.dll and dependencies.
---
bin/DotSets.dll | Bin 24576 -> 0 bytes
bin/Mono.PEToolkit.dll | Bin 131072 -> 0 bytes
bin/RAIL.dll | Bin 200704 -> 0 bytes
prebuild.xml | 10 ----------
4 files changed, 10 deletions(-)
delete mode 100644 bin/DotSets.dll
delete mode 100644 bin/Mono.PEToolkit.dll
delete mode 100644 bin/RAIL.dll
diff --git a/bin/DotSets.dll b/bin/DotSets.dll
deleted file mode 100644
index 5225651..0000000
Binary files a/bin/DotSets.dll and /dev/null differ
diff --git a/bin/Mono.PEToolkit.dll b/bin/Mono.PEToolkit.dll
deleted file mode 100644
index b4c3e70..0000000
Binary files a/bin/Mono.PEToolkit.dll and /dev/null differ
diff --git a/bin/RAIL.dll b/bin/RAIL.dll
deleted file mode 100644
index f2632d7..0000000
Binary files a/bin/RAIL.dll and /dev/null differ
diff --git a/prebuild.xml b/prebuild.xml
index 49063da..33a6b50 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2163,7 +2163,6 @@
-
@@ -2201,8 +2200,6 @@
-
-
@@ -2235,8 +2232,6 @@
-
-
@@ -2274,8 +2269,6 @@
-
-
@@ -2304,7 +2297,6 @@
-
@@ -2346,7 +2338,6 @@
-
@@ -2385,7 +2376,6 @@
-
--
cgit v1.1