Prevent null entries being treated as URI's when DataSnapshot service splits service string. The new config format for services to notify in the DataSnapshot module appends entries to the existing single string and always leaves a deliminator on the end of the string. This is causing it to split with a null string in the resulting array, which is treated as another service to notify and throws a URI format exception on start up.

Change flavour to RC1
Disable display name cap config in RC branch for now until issues have been worked through.
2015-02-01 10:33:37 -08:00 · 2015-01-30 21:24:18 +00:00 · 2015-01-30 21:22:57 +00:00
4 changed files with 3 additions and 4 deletions
--- a/OpenSim/Framework/VersionInfo.cs
+++ b/OpenSim/Framework/VersionInfo.cs
@@ -30,7 +30,7 @@ namespace OpenSim
    public class VersionInfo
    {
        public const string VersionNumber = "0.8.1.0";
-        private const Flavour VERSION_FLAVOUR = Flavour.Dev;
+        private const Flavour VERSION_FLAVOUR = Flavour.RC1;

        public enum Flavour
        {
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -395,7 +395,7 @@ namespace OpenSim.Region.DataSnapshot
            string delimStr = ";";
            char [] delimiter = delimStr.ToCharArray();

-            string[] services = servicesStr.Split(delimiter);
+            string[] services = servicesStr.Split(delimiter, StringSplitOptions.RemoveEmptyEntries);

            for (int i = 0; i < services.Length; i++)
            {
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -567,7 +567,6 @@
    Cap_GetTexture = "localhost"
    Cap_GetMesh = "localhost"
    Cap_AvatarPickerSearch = "localhost"
-    Cap_GetDisplayNames = "localhost"


 [SimulatorFeatures]
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -645,7 +645,7 @@
    Cap_ObjectMediaNavigate = "localhost"
    Cap_FetchLib = ""
    Cap_FetchLibDescendents = ""
-    Cap_GetDisplayNames = "localhost"
+    Cap_GetDisplayNames = ""
    Cap_GetTexture = "localhost"
    Cap_GetMesh = "localhost"
    Cap_GetObjectCost = ""
Author	SHA1	Message	Date
AliciaRaven	14a3375bed	Prevent null entries being treated as URI's when DataSnapshot service splits service string. The new config format for services to notify in the DataSnapshot module appends entries to the existing single string and always leaves a deliminator on the end of the string. This is causing it to split with a null string in the resulting array, which is treated as another service to notify and throws a URI format exception on start up.	2015-02-01 10:33:37 -08:00
Justin Clark-Casey (justincc)	b8c7175d34	Change flavour to RC1	2015-01-30 21:24:18 +00:00
Justin Clark-Casey (justincc)	144f1400c5	Disable display name cap config in RC branch for now until issues have been worked through.	2015-01-30 21:22:57 +00:00