aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Framework
diff options
context:
space:
mode:
authorMW2007-05-15 14:54:53 +0000
committerMW2007-05-15 14:54:53 +0000
commitf41e5343c5568ba27893551716af9e578a81dfbe (patch)
treef25017fd937029c18099e01bff09aa57279ed4c7 /OpenSim.Framework
parentprovide ready-to-eat attributes parsed from byte array (diff)
downloadopensim-SC_OLD-f41e5343c5568ba27893551716af9e578a81dfbe.zip
opensim-SC_OLD-f41e5343c5568ba27893551716af9e578a81dfbe.tar.gz
opensim-SC_OLD-f41e5343c5568ba27893551716af9e578a81dfbe.tar.bz2
opensim-SC_OLD-f41e5343c5568ba27893551716af9e578a81dfbe.tar.xz
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).
Diffstat (limited to 'OpenSim.Framework')
-rw-r--r--OpenSim.Framework/OpenSim.Framework.csproj3
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build147
-rw-r--r--OpenSim.Framework/Types/AssetStorage.cs22
3 files changed, 88 insertions, 84 deletions
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 @@
162 <Compile Include="Types\AssetBase.cs"> 162 <Compile Include="Types\AssetBase.cs">
163 <SubType>Code</SubType> 163 <SubType>Code</SubType>
164 </Compile> 164 </Compile>
165 <Compile Include="Types\AssetLandmark.cs">
166 <SubType>Code</SubType>
167 </Compile>
165 <Compile Include="Types\AssetStorage.cs"> 168 <Compile Include="Types\AssetStorage.cs">
166 <SubType>Code</SubType> 169 <SubType>Code</SubType>
167 </Compile> 170 </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 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Framework" default="build"> 2<project name="OpenSim.Framework" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}"> 6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}"> 7 <fileset basedir="${project::get-base-directory()}">
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Framework" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AgentInventory.cs" /> 14 <include name="AgentInventory.cs" />
15 <include name="BlockingQueue.cs" /> 15 <include name="BlockingQueue.cs" />
16 <include name="HeightMapGenHills.cs" /> 16 <include name="HeightMapGenHills.cs" />
17 <include name="LoginService.cs" /> 17 <include name="LoginService.cs" />
18 <include name="Remoting.cs" /> 18 <include name="Remoting.cs" />
19 <include name="SimProfile.cs" /> 19 <include name="SimProfile.cs" />
20 <include name="SimProfileBase.cs" /> 20 <include name="SimProfileBase.cs" />
21 <include name="UserProfile.cs" /> 21 <include name="UserProfile.cs" />
22 <include name="UserProfileManager.cs" /> 22 <include name="UserProfileManager.cs" />
23 <include name="UserProfileManagerBase.cs" /> 23 <include name="UserProfileManagerBase.cs" />
24 <include name="Util.cs" /> 24 <include name="Util.cs" />
25 <include name="Interfaces/IAssetServer.cs" /> 25 <include name="Interfaces/IAssetServer.cs" />
26 <include name="Interfaces/IConfig.cs" /> 26 <include name="Interfaces/IConfig.cs" />
27 <include name="Interfaces/IGenericConfig.cs" /> 27 <include name="Interfaces/IGenericConfig.cs" />
28 <include name="Interfaces/IGridConfig.cs" /> 28 <include name="Interfaces/IGridConfig.cs" />
29 <include name="Interfaces/IGridServer.cs" /> 29 <include name="Interfaces/IGridServer.cs" />
30 <include name="Interfaces/ILocalStorage.cs" /> 30 <include name="Interfaces/ILocalStorage.cs" />
31 <include name="Interfaces/IScriptAPI.cs" /> 31 <include name="Interfaces/IScriptAPI.cs" />
32 <include name="Interfaces/IScriptEngine.cs" /> 32 <include name="Interfaces/IScriptEngine.cs" />
33 <include name="Interfaces/IUserConfig.cs" /> 33 <include name="Interfaces/IUserConfig.cs" />
34 <include name="Interfaces/IUserServer.cs" /> 34 <include name="Interfaces/IUserServer.cs" />
35 <include name="Interfaces/LocalGridBase.cs" /> 35 <include name="Interfaces/LocalGridBase.cs" />
36 <include name="Interfaces/RemoteGridBase.cs" /> 36 <include name="Interfaces/RemoteGridBase.cs" />
37 <include name="Properties/AssemblyInfo.cs" /> 37 <include name="Properties/AssemblyInfo.cs" />
38 <include name="Types/AgentCiruitData.cs" /> 38 <include name="Types/AgentCiruitData.cs" />
39 <include name="Types/AssetBase.cs" /> 39 <include name="Types/AssetBase.cs" />
40 <include name="Types/AssetStorage.cs" /> 40 <include name="Types/AssetLandmark.cs" />
41 <include name="Types/Login.cs" /> 41 <include name="Types/AssetStorage.cs" />
42 <include name="Types/NeighbourInfo.cs" /> 42 <include name="Types/Login.cs" />
43 <include name="Types/OSVector3.cs" /> 43 <include name="Types/NeighbourInfo.cs" />
44 <include name="Types/PrimData.cs" /> 44 <include name="Types/OSVector3.cs" />
45 </sources> 45 <include name="Types/PrimData.cs" />
46 <references basedir="${project::get-base-directory()}"> 46 </sources>
47 <lib> 47 <references basedir="${project::get-base-directory()}">
48 <include name="${project::get-base-directory()}" /> 48 <lib>
49 <include name="${project::get-base-directory()}/${build.dir}" /> 49 <include name="${project::get-base-directory()}" />
50 </lib> 50 <include name="${project::get-base-directory()}/${build.dir}" />
51 <include name="System.dll" /> 51 </lib>
52 <include name="System.Xml.dll" /> 52 <include name="System.dll" />
53 <include name="../bin/libsecondlife.dll" /> 53 <include name="System.Xml.dll" />
54 <include name="../bin/Db4objects.Db4o.dll" /> 54 <include name="../bin/libsecondlife.dll" />
55 <include name="../bin/XMLRPC.dll" /> 55 <include name="../bin/Db4objects.Db4o.dll" />
56 </references> 56 <include name="../bin/XMLRPC.dll" />
57 </csc> 57 </references>
58 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 58 </csc>
59 <mkdir dir="${project::get-base-directory()}/../bin/"/> 59 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
60 <copy todir="${project::get-base-directory()}/../bin/"> 60 <mkdir dir="${project::get-base-directory()}/../bin/"/>
61 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 61 <copy todir="${project::get-base-directory()}/../bin/">
62 <include name="*.dll"/> 62 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
63 <include name="*.exe"/> 63 <include name="*.dll"/>
64 </fileset> 64 <include name="*.exe"/>
65 </copy> 65 </fileset>
66 </target> 66 </copy>
67 <target name="clean"> 67 </target>
68 <delete dir="${bin.dir}" failonerror="false" /> 68 <target name="clean">
69 <delete dir="${obj.dir}" failonerror="false" /> 69 <delete dir="${bin.dir}" failonerror="false" />
70 </target> 70 <delete dir="${obj.dir}" failonerror="false" />
71 <target name="doc" description="Creates documentation."> 71 </target>
72 </target> 72 <target name="doc" description="Creates documentation.">
73</project> 73 </target>
74</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;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.Framework.Types 6namespace OpenSim.Framework.Types
7{ 7{
8 public class AssetStorage 8 public class AssetStorage
9 { 9 {
10 10
11 public AssetStorage() { 11 public AssetStorage() {
12 } 12 }
13 13
14 public AssetStorage(LLUUID assetUUID) { 14 public AssetStorage(LLUUID assetUUID) {
15 UUID=assetUUID; 15 UUID=assetUUID;
16 } 16 }
17 17
18 public byte[] Data; 18 public byte[] Data;
19 public sbyte Type; 19 public sbyte Type;
20 public string Name; 20 public string Name;
21 public LLUUID UUID; 21 public LLUUID UUID;
22 } 22 }
23} 23}
generated by cgit v1.1 at 2024-11-10 11:40:08 +0000