From f41e5343c5568ba27893551716af9e578a81dfbe Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 15 May 2007 14:54:53 +0000
Subject: updated Build/project files to include the new projects and new
 files. Improved the enable neighbours code (Simclient thread should no longer
 sleep for 3 seconds for each neighbour).

---
 OpenSim.Framework/OpenSim.Framework.csproj    |   3 +
 OpenSim.Framework/OpenSim.Framework.dll.build | 147 +++++++++++++-------------
 OpenSim.Framework/Types/AssetStorage.cs       |  22 ++--
 3 files changed, 88 insertions(+), 84 deletions(-)

(limited to 'OpenSim.Framework')

diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index 046443e..c2f01d8 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -162,6 +162,9 @@
     <Compile Include="Types\AssetBase.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Types\AssetLandmark.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Types\AssetStorage.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index 69ea10a..77d5ce9 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -1,73 +1,74 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Framework" 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.Framework" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AgentInventory.cs" />
-                <include name="BlockingQueue.cs" />
-                <include name="HeightMapGenHills.cs" />
-                <include name="LoginService.cs" />
-                <include name="Remoting.cs" />
-                <include name="SimProfile.cs" />
-                <include name="SimProfileBase.cs" />
-                <include name="UserProfile.cs" />
-                <include name="UserProfileManager.cs" />
-                <include name="UserProfileManagerBase.cs" />
-                <include name="Util.cs" />
-                <include name="Interfaces/IAssetServer.cs" />
-                <include name="Interfaces/IConfig.cs" />
-                <include name="Interfaces/IGenericConfig.cs" />
-                <include name="Interfaces/IGridConfig.cs" />
-                <include name="Interfaces/IGridServer.cs" />
-                <include name="Interfaces/ILocalStorage.cs" />
-                <include name="Interfaces/IScriptAPI.cs" />
-                <include name="Interfaces/IScriptEngine.cs" />
-                <include name="Interfaces/IUserConfig.cs" />
-                <include name="Interfaces/IUserServer.cs" />
-                <include name="Interfaces/LocalGridBase.cs" />
-                <include name="Interfaces/RemoteGridBase.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/AgentCiruitData.cs" />
-                <include name="Types/AssetBase.cs" />
-                <include name="Types/AssetStorage.cs" />
-                <include name="Types/Login.cs" />
-                <include name="Types/NeighbourInfo.cs" />
-                <include name="Types/OSVector3.cs" />
-                <include name="Types/PrimData.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/libsecondlife.dll" />
-                <include name="../bin/Db4objects.Db4o.dll" />
-                <include name="../bin/XMLRPC.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.Framework" 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.Framework" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="AgentInventory.cs" />
+                <include name="BlockingQueue.cs" />
+                <include name="HeightMapGenHills.cs" />
+                <include name="LoginService.cs" />
+                <include name="Remoting.cs" />
+                <include name="SimProfile.cs" />
+                <include name="SimProfileBase.cs" />
+                <include name="UserProfile.cs" />
+                <include name="UserProfileManager.cs" />
+                <include name="UserProfileManagerBase.cs" />
+                <include name="Util.cs" />
+                <include name="Interfaces/IAssetServer.cs" />
+                <include name="Interfaces/IConfig.cs" />
+                <include name="Interfaces/IGenericConfig.cs" />
+                <include name="Interfaces/IGridConfig.cs" />
+                <include name="Interfaces/IGridServer.cs" />
+                <include name="Interfaces/ILocalStorage.cs" />
+                <include name="Interfaces/IScriptAPI.cs" />
+                <include name="Interfaces/IScriptEngine.cs" />
+                <include name="Interfaces/IUserConfig.cs" />
+                <include name="Interfaces/IUserServer.cs" />
+                <include name="Interfaces/LocalGridBase.cs" />
+                <include name="Interfaces/RemoteGridBase.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Types/AgentCiruitData.cs" />
+                <include name="Types/AssetBase.cs" />
+                <include name="Types/AssetLandmark.cs" />
+                <include name="Types/AssetStorage.cs" />
+                <include name="Types/Login.cs" />
+                <include name="Types/NeighbourInfo.cs" />
+                <include name="Types/OSVector3.cs" />
+                <include name="Types/PrimData.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/libsecondlife.dll" />
+                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../bin/XMLRPC.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>
diff --git a/OpenSim.Framework/Types/AssetStorage.cs b/OpenSim.Framework/Types/AssetStorage.cs
index 1d2660c..5b5b3b2 100644
--- a/OpenSim.Framework/Types/AssetStorage.cs
+++ b/OpenSim.Framework/Types/AssetStorage.cs
@@ -4,20 +4,20 @@ using System.Text;
 using libsecondlife;
 
 namespace OpenSim.Framework.Types
-{
+{
 	public class AssetStorage
 	{
-
-		public AssetStorage() {
-		}
-
-		public AssetStorage(LLUUID assetUUID) {
-			UUID=assetUUID;
-		}
-
+
+		public AssetStorage() {
+		}
+
+		public AssetStorage(LLUUID assetUUID) {
+			UUID=assetUUID;
+		}
+
 		public byte[] Data;
 		public sbyte Type;
 		public string Name;
 		public LLUUID UUID;
-	}
-}
+	}
+}
-- 
cgit v1.1