From 23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 2 Apr 2007 12:56:35 +0000
Subject: Added OpenSim.GenericConfig.Xml project, so we can swap to a more
 generic configuration method, so that it is easier to load configuration data
 from a ogs server

---
 Servers/LoginServer.cs            |  2 +-
 Servers/OpenSim.Servers.dll.build | 96 +++++++++++++++++++--------------------
 2 files changed, 49 insertions(+), 49 deletions(-)

(limited to 'Servers')

diff --git a/Servers/LoginServer.cs b/Servers/LoginServer.cs
index a36acd2..b814639 100644
--- a/Servers/LoginServer.cs
+++ b/Servers/LoginServer.cs
@@ -98,7 +98,7 @@ namespace OpenSim.UserServer
             this._mpasswd = EncodePassword("testpass");
 
             userManager = new LocalUserProfileManager(this.m_gridServer, m_simPort, m_simAddr);
-            userManager.InitUserProfiles();
+            //userManager.InitUserProfiles();
             userManager.SetKeys("", "", "", "Welcome to OpenSim");
         }
 
diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build
index 74d1072..1d4b496 100644
--- a/Servers/OpenSim.Servers.dll.build
+++ b/Servers/OpenSim.Servers.dll.build
@@ -1,48 +1,48 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Servers" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Servers" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="BaseHttpServer.cs" />
-                <include name="IRestHandler.cs" />
-                <include name="LocalUserProfileManager.cs" />
-                <include name="LoginResponse.cs" />
-                <include name="LoginServer.cs" />
-                <include name="XmlRpcMethod.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../bin/OpenSim.Framework.dll" />
-                <include name="../bin/OpenSim.Framework.Console.dll" />
-                <include name="../bin/libsecondlife.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
+<?xml version="1.0" ?>
+<project name="OpenSim.Servers" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Servers" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="BaseHttpServer.cs" />
+                <include name="IRestHandler.cs" />
+                <include name="LocalUserProfileManager.cs" />
+                <include name="LoginResponse.cs" />
+                <include name="LoginServer.cs" />
+                <include name="XmlRpcMethod.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
+                <include name="../bin/libsecondlife.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <copy todir="${project::get-base-directory()}/../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
-- 
cgit v1.1