as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace.

Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway.

1 files changed, 64 insertions, 64 deletions

diff --git a/OpenSim/Framework/General/Configuration/ConfigurationOption.cs b/OpenSim/Framework/General/ConfigurationOption.cs
index fcba35e..792e697 100644
--- a/OpenSim/Framework/General/Configuration/ConfigurationOption.cs
+++ b/OpenSim/Framework/General/ConfigurationOption.cs
@@ -1,64 +1,64 @@
-/*
-* 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 OpenSim 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;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Framework.Configuration
-{
-    public class ConfigurationOption
-    {
-        public enum ConfigurationTypes
-        {
-            TYPE_STRING,
-            TYPE_STRING_NOT_EMPTY,
-            TYPE_UINT16,
-            TYPE_UINT32,
-            TYPE_UINT64, 
-            TYPE_INT16,
-            TYPE_INT32,
-            TYPE_INT64,
-            TYPE_IP_ADDRESS,
-            TYPE_CHARACTER,
-            TYPE_BOOLEAN,
-            TYPE_BYTE,
-            TYPE_LLUUID,
-            TYPE_LLVECTOR3,
-            TYPE_FLOAT,
-            TYPE_DOUBLE
-        };
-
-        public string configurationKey = "";
-        public string configurationQuestion = "";
-        public string configurationDefault = "";
-
-        public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING;
-        public bool configurationUseDefaultNoPrompt = false;
-    }
-}
+/*

+* 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 OpenSim 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;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Framework

+{

+    public class ConfigurationOption

+    {

+        public enum ConfigurationTypes

+        {

+            TYPE_STRING,

+            TYPE_STRING_NOT_EMPTY,

+            TYPE_UINT16,

+            TYPE_UINT32,

+            TYPE_UINT64, 

+            TYPE_INT16,

+            TYPE_INT32,

+            TYPE_INT64,

+            TYPE_IP_ADDRESS,

+            TYPE_CHARACTER,

+            TYPE_BOOLEAN,

+            TYPE_BYTE,

+            TYPE_LLUUID,

+            TYPE_LLVECTOR3,

+            TYPE_FLOAT,

+            TYPE_DOUBLE

+        };

+

+        public string configurationKey = "";

+        public string configurationQuestion = "";

+        public string configurationDefault = "";

+

+        public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING;

+        public bool configurationUseDefaultNoPrompt = false;

+    }

+}