From 9f85ee29ac9f5e0aa8c1976944f9af12da3514db Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 5 Mar 2011 02:18:03 +0000
Subject: Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags
back to false
Implement test for ClearMediaEntry()
---
OpenSim/Framework/PrimitiveBaseShape.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 927415e..7b5fb2e 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -250,7 +250,7 @@ namespace OpenSim.Framework
{
get
{
- //m_log.DebugFormat("[SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
+// m_log.DebugFormat("[SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length);
try { return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); }
catch { }
--
cgit v1.1
From 8a2360bf815d4d78fcff34a69dec24782494bd2e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 Mar 2011 01:21:31 +0000
Subject: Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup.
Make static dictionaries on NullUserAccountData instance instead to stop user
accounts being carried over between tests
---
.../Framework/Serialization/External/OspResolver.cs | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Serialization/External/OspResolver.cs b/OpenSim/Framework/Serialization/External/OspResolver.cs
index 7e3dd1b..d31d27c 100644
--- a/OpenSim/Framework/Serialization/External/OspResolver.cs
+++ b/OpenSim/Framework/Serialization/External/OspResolver.cs
@@ -66,6 +66,8 @@ namespace OpenSim.Framework.Serialization
UserAccount account = userService.GetUserAccount(UUID.Zero, userId);
if (account != null)
return MakeOspa(account.FirstName, account.LastName);
+// else
+// m_log.WarnFormat("[OSP RESOLVER]: No user account for {0}", userId);
return null;
}
@@ -77,6 +79,8 @@ namespace OpenSim.Framework.Serialization
///
public static string MakeOspa(string firstName, string lastName)
{
+// m_log.DebugFormat("[OSP RESOLVER]: Making OSPA for {0} {1}", firstName, lastName);
+
return
OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName;
}
@@ -97,7 +101,10 @@ namespace OpenSim.Framework.Serialization
public static UUID ResolveOspa(string ospa, IUserAccountService userService)
{
if (!ospa.StartsWith(OSPA_PREFIX))
- return UUID.Zero;
+ {
+// m_log.DebugFormat("[OSP RESOLVER]: ResolveOspa() got unrecognized format [{0}]", ospa);
+ return UUID.Zero;
+ }
// m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
@@ -161,7 +168,17 @@ namespace OpenSim.Framework.Serialization
UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName);
if (account != null)
+ {
+// m_log.DebugFormat(
+// "[OSP RESOLVER]: Found user account with uuid {0} for {1} {2}",
+// account.PrincipalID, firstName, lastName);
+
return account.PrincipalID;
+ }
+// else
+// {
+// m_log.DebugFormat("[OSP RESOLVER]: No resolved OSPA user account for {0}", name);
+// }
// XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc
/*
--
cgit v1.1
From 9456bb77fbf794bb6fc2808e6cfd69c9bb1d1326 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 9 Mar 2011 23:25:24 +0000
Subject: Upgrade nunit.framework.dll to version 2.5.9. Fix up tests
appropriately.
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
---
OpenSim/Framework/Servers/Tests/OSHttpTests.cs | 1 -
OpenSim/Framework/Tests/AnimationTests.cs | 1 -
OpenSim/Framework/Tests/PrimeNumberHelperTests.cs | 3 ---
OpenSim/Framework/Tests/UtilTest.cs | 1 -
4 files changed, 6 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
index e62407a..dc4eb8f 100644
--- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
+++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
@@ -34,7 +34,6 @@ using System.Text;
using HttpServer;
using HttpServer.FormDecoders;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Framework.Servers.Tests
diff --git a/OpenSim/Framework/Tests/AnimationTests.cs b/OpenSim/Framework/Tests/AnimationTests.cs
index 719ddce..9aa95af 100644
--- a/OpenSim/Framework/Tests/AnimationTests.cs
+++ b/OpenSim/Framework/Tests/AnimationTests.cs
@@ -28,7 +28,6 @@
using System;
using System.Reflection;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
diff --git a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
index d741f91..36bc6e7 100644
--- a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
+++ b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
@@ -28,7 +28,6 @@
using System;
using System.Reflection;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
@@ -38,8 +37,6 @@ namespace OpenSim.Framework.Tests
[TestFixture]
public class PrimeNumberHelperTests
{
-
-
[Test]
public void TestGetPrime()
{
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index 89f5c0c..5eac411 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -27,7 +27,6 @@
using System;
using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenSim.Tests.Common;
--
cgit v1.1
From cee5e3e264a71861dd018ee9bad47e6ea2ac0338 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 14 Mar 2011 12:56:50 +0100
Subject: Up the timeout on slow requests to 3000 to stop console spam. Make
sure request method and target are reported correctly and drop the txn id as
it's empty 99% of the time.
---
.../Framework/Servers/HttpServer/BaseHttpServer.cs | 26 +++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 1d05b02..953ed85 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -378,6 +378,22 @@ namespace OpenSim.Framework.Servers.HttpServer
///
public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response)
{
+ if (request.HttpMethod == String.Empty) // Can't handle empty requests, not wasting a thread
+ {
+ try
+ {
+ SendHTML500(response);
+ }
+ catch
+ {
+ }
+
+ return;
+ }
+
+ string requestMethod = request.HttpMethod;
+ string uriString = request.RawUrl;
+
string reqnum = "unknown";
int tickstart = Environment.TickCount;
@@ -495,7 +511,7 @@ namespace OpenSim.Framework.Servers.HttpServer
request.InputStream.Close();
- // HTTP IN support. The script engine taes it from here
+ // HTTP IN support. The script engine takes it from here
// Nothing to worry about for us.
//
if (buffer == null)
@@ -609,9 +625,9 @@ namespace OpenSim.Framework.Servers.HttpServer
{
m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw ", e);
}
- catch (InvalidOperationException e)
+ catch (Exception e)
{
- m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}", e);
+ m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw " + e.ToString());
SendHTML500(response);
}
finally
@@ -619,9 +635,9 @@ namespace OpenSim.Framework.Servers.HttpServer
// Every month or so this will wrap and give bad numbers, not really a problem
// since its just for reporting, 200ms limit can be adjusted
int tickdiff = Environment.TickCount - tickstart;
- if (tickdiff > 500)
+ if (tickdiff > 3000)
m_log.InfoFormat(
- "[BASE HTTP SERVER]: slow request <{0}> for {1} took {2} ms", reqnum, request.RawUrl, tickdiff);
+ "[BASE HTTP SERVER]: slow {0} request for {1} from {2} took {3} ms", requestMethod, uriString, request.RemoteIPEndPoint.ToString(), tickdiff);
}
}
--
cgit v1.1
From aadd0e8d42b0a5b401cde9d4d3a56ce2e527201a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 16 Mar 2011 00:14:58 +0000
Subject: minor: bring comment into line with code reality
---
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 953ed85..ccec9b7 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -633,7 +633,7 @@ namespace OpenSim.Framework.Servers.HttpServer
finally
{
// Every month or so this will wrap and give bad numbers, not really a problem
- // since its just for reporting, 200ms limit can be adjusted
+ // since its just for reporting, tickdiff limit can be adjusted
int tickdiff = Environment.TickCount - tickstart;
if (tickdiff > 3000)
m_log.InfoFormat(
--
cgit v1.1
From a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Thu, 17 Mar 2011 05:48:42 -0400
Subject: Thanks Kevin Cozens for a patch that:
Fixes several spelling mistakes
---
OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs | 2 +-
OpenSim/Framework/UndoStack.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs
index 129a544..2c2b47d 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpHandler.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Servers.HttpServer
///
/// Regular expression used to match against path of the
/// incoming HTTP request. If you want to match any string
- /// either use '.*' or null. To match on the emtpy string use
+ /// either use '.*' or null. To match on the empty string use
/// '^$'.
///
public virtual Regex Path
diff --git a/OpenSim/Framework/UndoStack.cs b/OpenSim/Framework/UndoStack.cs
index 4d800ae..fde63b1 100644
--- a/OpenSim/Framework/UndoStack.cs
+++ b/OpenSim/Framework/UndoStack.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework
return deleted;
}
else
- throw new InvalidOperationException("Cannot pop from emtpy stack");
+ throw new InvalidOperationException("Cannot pop from empty stack");
}
public T Peek()
--
cgit v1.1
From 6ae04448f73afdca791ea185fdc0e9c062dea87b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Mar 2011 23:05:51 +0000
Subject: Start using IPrimCounts populated by PrimCountModule instead of
LandData counts populated by LandManagementModule.
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
---
OpenSim/Framework/IClientAPI.cs | 12 +++++-
OpenSim/Framework/ILandChannel.cs | 91 +++++++++++++++++++++++++++++++++++++++
OpenSim/Framework/IPrimCounts.cs | 45 +++++++++++++++++++
3 files changed, 147 insertions(+), 1 deletion(-)
create mode 100644 OpenSim/Framework/ILandChannel.cs
create mode 100644 OpenSim/Framework/IPrimCounts.cs
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index a6be157..5bf0b7b 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1143,7 +1143,17 @@ namespace OpenSim.Framework
void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags,
uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner);
- void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData,
+ ///
+ /// Send land properties to the client.
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// /param>
+ ///
+ ///
+ void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo,
float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity,
uint regionFlags);
diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs
new file mode 100644
index 0000000..30bae16
--- /dev/null
+++ b/OpenSim/Framework/ILandChannel.cs
@@ -0,0 +1,91 @@
+/*
+ * 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 System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+ public interface ILandChannel
+ {
+ ///
+ /// Get all parcels
+ ///
+ ///
+ List AllParcels();
+
+ ///
+ /// Get the parcel at the specified point
+ ///
+ /// Value between 0 - 256 on the x axis of the point
+ /// Value between 0 - 256 on the y axis of the point
+ /// Land object at the point supplied
+ ILandObject GetLandObject(int x, int y);
+
+ ///
+ /// Get the parcel at the specified point
+ ///
+ /// Value between 0 - 256 on the x axis of the point
+ /// Value between 0 - 256 on the y axis of the point
+ /// Land object at the point supplied
+ ILandObject GetLandObject(float x, float y);
+
+ ///
+ /// Get the parcels near the specified point
+ ///
+ ///
+ ///
+ List ParcelsNearPoint(Vector3 position);
+
+ ///
+ /// Get the parcel given the land's local id.
+ ///
+ ///
+ ///
+ ILandObject GetLandObject(int localID);
+
+ ///
+ /// Clear the land channel of all parcels.
+ ///
+ ///
+ /// If true, set up a default parcel covering the whole region owned by the estate owner.
+ ///
+ void Clear(bool setupDefaultParcel);
+
+ bool IsLandPrimCountTainted();
+ bool IsForcefulBansAllowed();
+ void UpdateLandObject(int localID, LandData data);
+ void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient);
+ void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel);
+ void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel);
+ void SetParcelOtherCleanTime(IClientAPI remoteClient, int localID, int otherCleanTime);
+
+ void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
+ void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
+ }
+}
diff --git a/OpenSim/Framework/IPrimCounts.cs b/OpenSim/Framework/IPrimCounts.cs
new file mode 100644
index 0000000..7d362c5
--- /dev/null
+++ b/OpenSim/Framework/IPrimCounts.cs
@@ -0,0 +1,45 @@
+/*
+ * 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 IPrimCounts
+ {
+ int Owner { get; }
+ int Group { get; }
+ int Others { get; }
+ int Simulator { get; }
+ IUserPrimCounts Users { get; }
+ }
+
+ public interface IUserPrimCounts
+ {
+ int this[UUID agentID] { get; }
+ }
+}
\ No newline at end of file
--
cgit v1.1
From ea72745d43c2c6eced8329801ff8765746be7ddd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Mar 2011 23:18:47 +0000
Subject: Log the xml/ini regions config files that opensim loads from, and the
regions that it loaded from them
This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
---
.../Filesystem/RegionLoaderFileSystem.cs | 24 ++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index 63e09ae..7cbd5ed 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -25,15 +25,19 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+using log4net;
using System;
using System.Collections.Generic;
using System.IO;
+using System.Reflection;
using Nini.Config;
namespace OpenSim.Framework.RegionLoader.Filesystem
{
public class RegionLoaderFileSystem : IRegionLoader
{
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
private IConfigSource m_configSource;
public void SetIniConfigSource(IConfigSource configSource)
@@ -63,36 +67,48 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
string[] iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
+ // Create an empty Regions.ini if there are no existing config files.
if (configFiles.Length == 0 && iniFiles.Length == 0)
- {
+ {
new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "Regions.ini"), false, m_configSource);
iniFiles = Directory.GetFiles(regionConfigPath, "*.ini");
}
+
+ m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config files from {0}", regionConfigPath);
List regionInfos = new List();
int i = 0;
foreach (string file in iniFiles)
{
+ m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
+
IConfigSource source = new IniConfigSource(file);
foreach (IConfig config in source.Configs)
- {
- //m_log.Info("[REGIONLOADERFILESYSTEM]: Creating RegionInfo for " + config.Name);
+ {
RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name);
regionInfos.Add(regionInfo);
+
+ m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded region {0}", regionInfo.RegionName);
+
i++;
}
}
foreach (string file in configFiles)
{
+ m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loading config file {0}", file);
+
RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource);
regionInfos.Add(regionInfo);
+
+ m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded region {0}", regionInfo.RegionName);
+
i++;
}
return regionInfos.ToArray();
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1
From 3a55d59b45dc0cbff938f0101bb6338bd8949e86 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Mar 2011 23:29:06 +0000
Subject: in region web loader, print out url that config is being loaded from
(this wasn't being done anywhere).
---
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index 0ec4af5..de4898a 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -66,9 +66,9 @@ namespace OpenSim.Framework.RegionLoader.Web
{
HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url);
webRequest.Timeout = 30000; //30 Second Timeout
- m_log.Debug("[WEBLOADER]: Sending Download Request...");
+ m_log.DebugFormat("[WEBLOADER]: Sending download request to {0}", url);
HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse();
- m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server...");
+ m_log.Debug("[WEBLOADER]: Downloading region information...");
StreamReader reader = new StreamReader(webResponse.GetResponseStream());
string xmlSource = String.Empty;
string tempStr = reader.ReadLine();
--
cgit v1.1
From d8e1c380e67512e0476b2a7b7441ae3acbb4606f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Mar 2011 23:36:58 +0000
Subject: minor: make it clearer in the log where we're loading region config
files and not the regions themselves
---
OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index 7cbd5ed..0aae4ff 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name);
regionInfos.Add(regionInfo);
- m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded region {0}", regionInfo.RegionName);
+ m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
i++;
}
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource);
regionInfos.Add(regionInfo);
- m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded region {0}", regionInfo.RegionName);
+ m_log.InfoFormat("[REGION LOADER FILE SYSTEM]: Loaded config for region {0}", regionInfo.RegionName);
i++;
}
--
cgit v1.1
From cc8897fcebdc9d3e875c9bf745ecb77678a776e9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 26 Mar 2011 00:34:49 +0000
Subject: Add test for PCM taint. This currently fails due to unexpected
behaviour of SceneGraph.ForEachSOG(). This will be corrected soon.
Also adds lots of temproarily debug logging
---
OpenSim/Framework/ILandObject.cs | 112 +++++++++++++++++++++++++++++++++++++++
1 file changed, 112 insertions(+)
create mode 100644 OpenSim/Framework/ILandObject.cs
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
new file mode 100644
index 0000000..931e24a
--- /dev/null
+++ b/OpenSim/Framework/ILandObject.cs
@@ -0,0 +1,112 @@
+/*
+ * 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 System.Collections.Generic;
+using OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+ public delegate int overrideParcelMaxPrimCountDelegate(ILandObject obj);
+ public delegate int overrideSimulatorMaxPrimCountDelegate(ILandObject obj);
+
+ public interface ILandObject
+ {
+ int GetParcelMaxPrimCount(ILandObject thisObject);
+ int GetSimulatorMaxPrimCount(ILandObject thisObject);
+ int GetPrimsFree();
+
+ LandData LandData { get; set; }
+ bool[,] LandBitmap { get; set; }
+ UUID RegionUUID { get; }
+
+ ///
+ /// Prim counts for this land object.
+ ///
+ IPrimCounts PrimCounts { get; set; }
+
+ ///
+ /// The start point for the land object. This is the western-most point as one scans land working from
+ /// north to south.
+ ///
+ Vector3 StartPoint { get; }
+
+ ///
+ /// The end point for the land object. This is the eastern-most point as one scans land working from
+ /// south to north.
+ ///
+ Vector3 EndPoint { get; }
+
+ bool ContainsPoint(int x, int y);
+
+ ILandObject Copy();
+
+ void SendLandUpdateToAvatarsOverMe();
+
+ void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client);
+ void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client);
+ bool IsEitherBannedOrRestricted(UUID avatar);
+ bool IsBannedFromLand(UUID avatar);
+ bool IsRestrictedFromLand(UUID avatar);
+ void SendLandUpdateToClient(IClientAPI remote_client);
+ void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client);
+ List CreateAccessListArrayByFlag(AccessList flag);
+ void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
+ void UpdateAccessList(uint flags, UUID transactionID, int sequenceID, int sections, List entries, IClientAPI remote_client);
+ void UpdateLandBitmapByteArray();
+ void SetLandBitmapFromByteArray();
+ bool[,] GetLandBitmap();
+ void ForceUpdateLandInfo();
+ void SetLandBitmap(bool[,] bitmap);
+
+ bool[,] BasicFullRegionLandBitmap();
+ bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y);
+ bool[,] ModifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value);
+ bool[,] MergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add);
+ void SendForceObjectSelect(int local_id, int request_type, List returnIDs, IClientAPI remote_client);
+ void SendLandObjectOwners(IClientAPI remote_client);
+ void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client);
+ void ResetLandPrimCounts();
+ void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area);
+
+ void DeedToGroup(UUID groupID);
+
+ void SetParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel);
+ void SetSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel);
+
+ ///
+ /// Set the media url for this land parcel
+ ///
+ ///
+ void SetMediaUrl(string url);
+
+ ///
+ /// Set the music url for this land parcel
+ ///
+ ///
+ void SetMusicUrl(string url);
+ }
+}
--
cgit v1.1
From 541cd3e8c84d3ccc13525206b1724ee931416a3c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 26 Mar 2011 02:19:28 +0000
Subject: move total parcel prim calculations into IPrimCounts instead of doing
this in LLClientView
need to move selected prim counts from LandData/LMM still
---
OpenSim/Framework/IPrimCounts.cs | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/IPrimCounts.cs b/OpenSim/Framework/IPrimCounts.cs
index 7d362c5..8ae57fc 100644
--- a/OpenSim/Framework/IPrimCounts.cs
+++ b/OpenSim/Framework/IPrimCounts.cs
@@ -31,10 +31,34 @@ namespace OpenSim.Framework
{
public interface IPrimCounts
{
+ ///
+ /// Parcel owner owned prims
+ ///
int Owner { get; }
+
+ ///
+ /// Parcel group owned prims
+ ///
int Group { get; }
+
+ ///
+ /// Prims owned by others (not parcel owner or parcel group).
+ ///
int Others { get; }
+
+ ///
+ /// Total prims on the parcel.
+ ///
+ int Total { get; }
+
+ ///
+ /// Prims on the simulator that are owned by the parcel owner, even if they are in other parcels.
+ ///
int Simulator { get; }
+
+ ///
+ /// Prims per individual users.
+ ///
IUserPrimCounts Users { get; }
}
--
cgit v1.1
From 8b16f7d976dc60b06f6d08e9d9d853ae69de5fc9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 30 Mar 2011 00:13:07 +0100
Subject: (re)implement selected prim count.
This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count)
---
OpenSim/Framework/IPrimCounts.cs | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/IPrimCounts.cs b/OpenSim/Framework/IPrimCounts.cs
index 8ae57fc..3e12348 100644
--- a/OpenSim/Framework/IPrimCounts.cs
+++ b/OpenSim/Framework/IPrimCounts.cs
@@ -45,6 +45,11 @@ namespace OpenSim.Framework
/// Prims owned by others (not parcel owner or parcel group).
///
int Others { get; }
+
+ ///
+ /// Selected prims
+ ///
+ int Selected { get; }
///
/// Total prims on the parcel.
--
cgit v1.1
From 8022400bd4c852c3faf0db61006a2c60f5200342 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 31 Mar 2011 22:16:09 +0100
Subject: Remove unused Datastore parameter from RegionInfo (legacy from early
2008)
---
OpenSim/Framework/RegionInfo.cs | 11 -----------
1 file changed, 11 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 680e702..afedcf5 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -347,7 +347,6 @@ namespace OpenSim.Framework
public bool commFailTF = false;
public ConfigurationMember configMember;
- public string DataStore = String.Empty;
public string RegionFile = String.Empty;
public bool isSandbox = false;
public bool Persistent = true;
@@ -746,10 +745,6 @@ namespace OpenSim.Framework
m_regionLocX = Convert.ToUInt32(locationElements[0]);
m_regionLocY = Convert.ToUInt32(locationElements[1]);
-
- // Datastore (is this implemented? Omitted from example!)
- DataStore = config.GetString("Datastore", String.Empty);
-
// Internal IP
IPAddress address;
@@ -846,9 +841,6 @@ namespace OpenSim.Framework
string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
config.Set("Location", location);
- if (DataStore != String.Empty)
- config.Set("Datastore", DataStore);
-
config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
config.Set("InternalPort", m_internalEndPoint.Port);
@@ -1025,9 +1017,6 @@ namespace OpenSim.Framework
case "sim_location_y":
m_regionLocY = (uint) configuration_result;
break;
- case "datastore":
- DataStore = (string) configuration_result;
- break;
case "internal_ip_address":
IPAddress address = (IPAddress) configuration_result;
m_internalEndPoint = new IPEndPoint(address, 0);
--
cgit v1.1
From 88bd38690a56f5e381f8038b971950c9f5842c51 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 31 Mar 2011 23:03:42 +0100
Subject: Remove unused RegionInfo.getInternalEndPointPort() in favour of
RegionInfo.InternalEndPoint.Port
---
OpenSim/Framework/RegionInfo.cs | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index afedcf5..daf0a25 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -1164,11 +1164,6 @@ namespace OpenSim.Framework
return regionInfo;
}
- public int getInternalEndPointPort()
- {
- return m_internalEndPoint.Port;
- }
-
public Dictionary ToKeyValuePairs()
{
Dictionary kvp = new Dictionary();
@@ -1187,4 +1182,4 @@ namespace OpenSim.Framework
return kvp;
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1
From 0e465da187c93e7ff21f91742f75ee9f3b76b04e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 5 Apr 2011 21:25:54 +0100
Subject: remove now unused individual LandData prim counts.
However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc.
This is probably why prim counts were being done there in the first place.
---
OpenSim/Framework/ILandChannel.cs | 1 -
OpenSim/Framework/ILandObject.cs | 2 +-
OpenSim/Framework/LandData.cs | 65 +---------------------
.../Serialization/Tests/LandDataSerializerTests.cs | 8 +--
4 files changed, 4 insertions(+), 72 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs
index 30bae16..869d4c8 100644
--- a/OpenSim/Framework/ILandChannel.cs
+++ b/OpenSim/Framework/ILandChannel.cs
@@ -77,7 +77,6 @@ namespace OpenSim.Region.Framework.Interfaces
///
void Clear(bool setupDefaultParcel);
- bool IsLandPrimCountTainted();
bool IsForcefulBansAllowed();
void UpdateLandObject(int localID, LandData data);
void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient);
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 931e24a..98ea01e 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Framework
void SendForceObjectSelect(int local_id, int request_type, List returnIDs, IClientAPI remote_client);
void SendLandObjectOwners(IClientAPI remote_client);
void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client);
- void ResetLandPrimCounts();
+ void ResetOverMeRecord();
void UpdateLandSold(UUID avatarID, UUID groupID, bool groupOwned, uint AuctionID, int claimprice, int area);
void DeedToGroup(UUID groupID);
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index a9a493d..145ccdd 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -54,12 +54,10 @@ namespace OpenSim.Framework
private int _claimPrice = 0; //Unemplemented
private UUID _globalID = UUID.Zero;
private UUID _groupID = UUID.Zero;
- private int _groupPrims = 0;
private bool _isGroupOwned = false;
private byte[] _bitmap = new byte[512];
private string _description = String.Empty;
-
private uint _flags = (uint) ParcelFlags.AllowFly | (uint) ParcelFlags.AllowLandmark |
(uint) ParcelFlags.AllowAPrimitiveEntry |
(uint) ParcelFlags.AllowDeedToGroup | (uint) ParcelFlags.AllowTerraform |
@@ -72,17 +70,13 @@ namespace OpenSim.Framework
private int _localID = 0;
private byte _mediaAutoScale = 0;
private UUID _mediaID = UUID.Zero;
-
private string _mediaURL = String.Empty;
private string _musicURL = String.Empty;
- private int _otherPrims = 0;
private UUID _ownerID = UUID.Zero;
- private int _ownerPrims = 0;
private List _parcelAccessList = new List();
private float _passHours = 0;
private int _passPrice = 0;
private int _salePrice = 0; //Unemeplemented. Parcels price.
- private int _selectedPrims = 0;
private int _simwideArea = 0;
private int _simwidePrims = 0;
private UUID _snapshotID = UUID.Zero;
@@ -284,19 +278,6 @@ namespace OpenSim.Framework
}
///
- /// Number of SceneObjectPart that are owned by a Group
- ///
- [XmlIgnore]
- public int GroupPrims {
- get {
- return _groupPrims;
- }
- set {
- _groupPrims = value;
- }
- }
-
- ///
/// Returns true if the Land Parcel is owned by a group
///
public bool IsGroupOwned {
@@ -454,20 +435,6 @@ namespace OpenSim.Framework
}
///
- /// Number of SceneObjectPart that are owned by users who do not own the parcel
- /// and don't have the 'group. These are elegable for AutoReturn collection
- ///
- [XmlIgnore]
- public int OtherPrims {
- get {
- return _otherPrims;
- }
- set {
- _otherPrims = value;
- }
- }
-
- ///
/// Owner Avatar or Group of the parcel. Naturally, all land masses must be
/// owned by someone
///
@@ -481,19 +448,6 @@ namespace OpenSim.Framework
}
///
- /// Number of SceneObjectPart that are owned by the owner of the parcel
- ///
- [XmlIgnore]
- public int OwnerPrims {
- get {
- return _ownerPrims;
- }
- set {
- _ownerPrims = value;
- }
- }
-
- ///
/// List of access data for the parcel. User data, some bitflags, and a time
///
public List ParcelAccessList {
@@ -542,19 +496,6 @@ namespace OpenSim.Framework
}
///
- /// Number of SceneObjectPart that are currently selected by avatar
- ///
- [XmlIgnore]
- public int SelectedPrims {
- get {
- return _selectedPrims;
- }
- set {
- _selectedPrims = value;
- }
- }
-
- ///
/// Number of meters^2 in the Simulator
///
[XmlIgnore]
@@ -666,10 +607,6 @@ namespace OpenSim.Framework
landData._claimPrice = _claimPrice;
landData._globalID = _globalID;
landData._groupID = _groupID;
- landData._groupPrims = _groupPrims;
- landData._otherPrims = _otherPrims;
- landData._ownerPrims = _ownerPrims;
- landData._selectedPrims = _selectedPrims;
landData._isGroupOwned = _isGroupOwned;
landData._localID = _localID;
landData._landingType = _landingType;
@@ -731,4 +668,4 @@ namespace OpenSim.Framework
return land;
}
}
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
index 70e87b3..c69c89d 100644
--- a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
+++ b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
@@ -42,10 +42,7 @@ namespace OpenSim.Framework.Serialization.Tests
private LandData landWithParcelAccessList;
private static string preSerialized = "\n\n 128\n 0\n 00000000-0000-0000-0000-000000000000\n 10\n 0\n 0\n 54ff9641-dd40-4a2c-b1f1-47dd3af24e50\n d740204e-bbbf-44aa-949d-02c7d739f6a5\n False\n AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\n land data to test LandDataSerializer\n 536870944\n 2\n LandDataSerializerTest Land\n 0\n 0\n 1\n d4452578-2f25-4b97-a81b-819af559cfd7\n http://videos.opensimulator.org/bumblebee.mp4\n \n 1b8eedf9-6d15-448b-8015-24286f1756bf\n \n 0\n 0\n 0\n 00000000-0000-0000-0000-000000000000\n <0, 0, 0>\n <0, 0, 0>\n 0\n 0\n";
- private static string preSerializedWithParcelAccessList = "\n\n 128\n 0\n 00000000-0000-0000-0000-000000000000\n 10\n 0\n 0\n 54ff9641-dd40-4a2c-b1f1-47dd3af24e50\n d740204e-bbbf-44aa-949d-02c7d739f6a5\n False\n AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\n land data to test LandDataSerializer\n 536870944\n 2\n LandDataSerializerTest Land\n 0\n 0\n 1\n d4452578-2f25-4b97-a81b-819af559cfd7\n http://videos.opensimulator.org/bumblebee.mp4\n \n 1b8eedf9-6d15-448b-8015-24286f1756bf\n \n \n 62d65d45-c91a-4f77-862c-46557d978b6c\n \n 2\n \n \n ec2a8d18-2378-4fe0-8b68-2a31b57c481e\n \n 1\n \n \n 0\n 0\n 0\n 00000000-0000-0000-0000-000000000000\n <0, 0, 0>\n <0, 0, 0>\n 0\n 0\n";
-
-
-
+ private static string preSerializedWithParcelAccessList = "\n\n 128\n 0\n 00000000-0000-0000-0000-000000000000\n 10\n 0\n 0\n 54ff9641-dd40-4a2c-b1f1-47dd3af24e50\n d740204e-bbbf-44aa-949d-02c7d739f6a5\n False\n AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\n land data to test LandDataSerializer\n 536870944\n 2\n LandDataSerializerTest Land\n 0\n 0\n 1\n d4452578-2f25-4b97-a81b-819af559cfd7\n http://videos.opensimulator.org/bumblebee.mp4\n \n 1b8eedf9-6d15-448b-8015-24286f1756bf\n \n \n 62d65d45-c91a-4f77-862c-46557d978b6c\n \n 2\n \n \n ec2a8d18-2378-4fe0-8b68-2a31b57c481e\n \n 1\n \n \n 0\n 0\n 0\n 00000000-0000-0000-0000-000000000000\n <0, 0, 0>\n <0, 0, 0>\n 0\n 0\n";
[SetUp]
public void setup()
@@ -62,7 +59,6 @@ namespace OpenSim.Framework.Serialization.Tests
this.land.ClaimPrice = 0;
this.land.GlobalID = new UUID("54ff9641-dd40-4a2c-b1f1-47dd3af24e50");
this.land.GroupID = new UUID("d740204e-bbbf-44aa-949d-02c7d739f6a5");
- this.land.GroupPrims = 0;
this.land.Description = "land data to test LandDataSerializer";
this.land.Flags = (uint)(ParcelFlags.AllowDamage | ParcelFlags.AllowVoiceChat);
this.land.LandingType = (byte)LandingType.Direct;
@@ -132,4 +128,4 @@ namespace OpenSim.Framework.Serialization.Tests
"Reified LandData.Name != original LandData.Name (pre-serialized with parcel access list)");
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1
From 2497962360258eb6cb1a78c7b4d5227d88eabb87 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 5 Apr 2011 22:25:00 +0100
Subject: Change some text to make the autoreturn mechanism more obvious, and
align with the fact that it's one word rather than two.
---
OpenSim/Framework/LandData.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 145ccdd..c107143 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -560,7 +560,7 @@ namespace OpenSim.Framework
}
///
- /// Number of minutes to return SceneObjectGroup that are owned by someone who doesn't own
+ /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own
/// the parcel and isn't set to the same 'group' as the parcel.
///
public int OtherCleanTime {
--
cgit v1.1
From fa202a05e914395d5a1facf8bdadb6a553516bfe Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 6 Apr 2011 17:19:31 +0100
Subject: Add method doc to some land bitmap methods in ILandObject.
Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage.
---
OpenSim/Framework/ILandObject.cs | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 98ea01e..02775e9 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -82,8 +82,26 @@ namespace OpenSim.Framework
void ForceUpdateLandInfo();
void SetLandBitmap(bool[,] bitmap);
+ ///
+ /// Get a land bitmap that would cover an entire region.
+ ///
+ /// The bitmap created.
bool[,] BasicFullRegionLandBitmap();
+
+ ///
+ /// Create a square land bitmap.
+ ///
+ ///
+ /// Land co-ordinates are zero indexed. At the moment, the smallest parcel of land is 4m x 4m, so if the
+ /// region is 256 x 256m (the SL size), the largest land parcel starts at (0,0) and ends at (63,63).
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// The bitmap created.
bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y);
+
bool[,] ModifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value);
bool[,] MergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add);
void SendForceObjectSelect(int local_id, int request_type, List returnIDs, IClientAPI remote_client);
--
cgit v1.1
From 63533412f882fd55c0c40989d97f8a8262bc4e3c Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 6 Apr 2011 18:57:50 +0100
Subject: Improve previous ILandObject method doc.
For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs
---
OpenSim/Framework/ILandObject.cs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 02775e9..5a55b02 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -92,8 +92,12 @@ namespace OpenSim.Framework
/// Create a square land bitmap.
///
///
- /// Land co-ordinates are zero indexed. At the moment, the smallest parcel of land is 4m x 4m, so if the
- /// region is 256 x 256m (the SL size), the largest land parcel starts at (0,0) and ends at (63,63).
+ /// Land co-ordinates are zero indexed. The inputs are treated as points. So if you want to create a bitmap
+ /// that covers an entire 256 x 256m region apart from a strip of land on the east, then you would need to
+ /// specify start_x = 0, start_y = 0, end_x = 252 (or anything up to 255), end_y = 256.
+ ///
+ /// At the moment, the smallest parcel of land is 4m x 4m, so if the
+ /// region is 256 x 256m (the SL size), the bitmap returned will start at (0,0) and end at (63,63).
///
///
///
--
cgit v1.1
From a6b1927cff19c72fe0c879ab41fcca8052737617 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 6 Apr 2011 22:05:07 +0100
Subject: bump main branch version number to 0.7.2. A separate
0.7.1-post-fixes branch now exists.
---
OpenSim/Framework/Servers/VersionInfo.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
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 0ced677510b0d270506dce4e80fa906f2a8ea649 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 7 Apr 2011 23:22:19 +0100
Subject: Revert master version number to 0.7.1 for now to make merging easier.
---
OpenSim/Framework/Servers/VersionInfo.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 53a3f17..c9d4c93 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.2";
+ private const string VERSION_NUMBER = "0.7.1";
private const Flavour VERSION_FLAVOUR = Flavour.Dev;
public enum Flavour
--
cgit v1.1