aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Framework
diff options
context:
space:
mode:
authorgareth2007-04-03 20:39:28 +0000
committergareth2007-04-03 20:39:28 +0000
commit5e81e7ed9d8d1b5be0d5390cab10975bb3b93516 (patch)
tree674e1df234ac56ccbe92007ea04a3d6711861d65 /OpenSim.Framework
parent* lovely. svn doesn't delete the files from disk on svn delete, so they show ... (diff)
downloadopensim-SC_OLD-5e81e7ed9d8d1b5be0d5390cab10975bb3b93516.zip
opensim-SC_OLD-5e81e7ed9d8d1b5be0d5390cab10975bb3b93516.tar.gz
opensim-SC_OLD-5e81e7ed9d8d1b5be0d5390cab10975bb3b93516.tar.bz2
opensim-SC_OLD-5e81e7ed9d8d1b5be0d5390cab10975bb3b93516.tar.xz
Finished initial sim<>Grid login (kinda)
Can login but no config data sent/updated yet
Diffstat (limited to '')
-rw-r--r--OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build84
-rw-r--r--OpenSim.Framework/IGridServer.cs2
-rw-r--r--OpenSim.Framework/LocalGridBase.cs2
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build134
-rw-r--r--OpenSim.Framework/RemoteGridBase.cs2
5 files changed, 112 insertions, 112 deletions
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
index fa90bb6..a3019ee 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
@@ -1,42 +1,42 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenSim.Framework.Console" default="build"> 2<project name="OpenSim.Framework.Console" 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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > 11 <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AssemblyInfo.cs" /> 14 <include name="AssemblyInfo.cs" />
15 <include name="ConsoleBase.cs" /> 15 <include name="ConsoleBase.cs" />
16 <include name="ConsoleCallbacksBase.cs" /> 16 <include name="ConsoleCallbacksBase.cs" />
17 <include name="MainConsole.cs" /> 17 <include name="MainConsole.cs" />
18 </sources> 18 </sources>
19 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
20 <lib> 20 <lib>
21 <include name="${project::get-base-directory()}" /> 21 <include name="${project::get-base-directory()}" />
22 <include name="${project::get-base-directory()}/${build.dir}" /> 22 <include name="${project::get-base-directory()}/${build.dir}" />
23 </lib> 23 </lib>
24 <include name="System.dll" /> 24 <include name="System.dll" />
25 </references> 25 </references>
26 </csc> 26 </csc>
27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 27 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
28 <mkdir dir="${project::get-base-directory()}/../bin/"/> 28 <mkdir dir="${project::get-base-directory()}/../bin/"/>
29 <copy todir="${project::get-base-directory()}/../bin/"> 29 <copy todir="${project::get-base-directory()}/../bin/">
30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 30 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
31 <include name="*.dll"/> 31 <include name="*.dll"/>
32 <include name="*.exe"/> 32 <include name="*.exe"/>
33 </fileset> 33 </fileset>
34 </copy> 34 </copy>
35 </target> 35 </target>
36 <target name="clean"> 36 <target name="clean">
37 <delete dir="${bin.dir}" failonerror="false" /> 37 <delete dir="${bin.dir}" failonerror="false" />
38 <delete dir="${obj.dir}" failonerror="false" /> 38 <delete dir="${obj.dir}" failonerror="false" />
39 </target> 39 </target>
40 <target name="doc" description="Creates documentation."> 40 <target name="doc" description="Creates documentation.">
41 </target> 41 </target>
42</project> 42</project>
diff --git a/OpenSim.Framework/IGridServer.cs b/OpenSim.Framework/IGridServer.cs
index 026dfab..001ce3b 100644
--- a/OpenSim.Framework/IGridServer.cs
+++ b/OpenSim.Framework/IGridServer.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Interfaces
48 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 48 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
49 bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 49 bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
50 string GetName(); 50 string GetName();
51 bool RequestConnection(); 51 bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
52 void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); 52 void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
53 void Close(); 53 void Close();
54 } 54 }
diff --git a/OpenSim.Framework/LocalGridBase.cs b/OpenSim.Framework/LocalGridBase.cs
index c9b278a..6857d6d 100644
--- a/OpenSim.Framework/LocalGridBase.cs
+++ b/OpenSim.Framework/LocalGridBase.cs
@@ -12,7 +12,7 @@ namespace OpenSim.Framework.Interfaces
12 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 12 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
13 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 13 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
14 public abstract string GetName(); 14 public abstract string GetName();
15 public abstract bool RequestConnection(); 15 public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
16 public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); 16 public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
17 public abstract void AddNewSession(Login session); 17 public abstract void AddNewSession(Login session);
18 public abstract void Close(); 18 public abstract void Close();
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index 89010d2..b351625 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -1,67 +1,67 @@
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;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> 10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" 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="AgentCiruitData.cs" /> 14 <include name="AgentCiruitData.cs" />
15 <include name="AgentInventory.cs" /> 15 <include name="AgentInventory.cs" />
16 <include name="AssetBase.cs" /> 16 <include name="AssetBase.cs" />
17 <include name="BlockingQueue.cs" /> 17 <include name="BlockingQueue.cs" />
18 <include name="HeightMapGenHills.cs" /> 18 <include name="HeightMapGenHills.cs" />
19 <include name="IAssetServer.cs" /> 19 <include name="IAssetServer.cs" />
20 <include name="IConfig.cs" /> 20 <include name="IConfig.cs" />
21 <include name="IGenericConfig.cs" /> 21 <include name="IGenericConfig.cs" />
22 <include name="IGridConfig.cs" /> 22 <include name="IGridConfig.cs" />
23 <include name="IGridServer.cs" /> 23 <include name="IGridServer.cs" />
24 <include name="ILocalStorage.cs" /> 24 <include name="ILocalStorage.cs" />
25 <include name="IUserConfig.cs" /> 25 <include name="IUserConfig.cs" />
26 <include name="IUserServer.cs" /> 26 <include name="IUserServer.cs" />
27 <include name="LocalGridBase.cs" /> 27 <include name="LocalGridBase.cs" />
28 <include name="Login.cs" /> 28 <include name="Login.cs" />
29 <include name="LoginService.cs" /> 29 <include name="LoginService.cs" />
30 <include name="NeighbourInfo.cs" /> 30 <include name="NeighbourInfo.cs" />
31 <include name="PrimData.cs" /> 31 <include name="PrimData.cs" />
32 <include name="RemoteGridBase.cs" /> 32 <include name="RemoteGridBase.cs" />
33 <include name="SimProfile.cs" /> 33 <include name="SimProfile.cs" />
34 <include name="SimProfileBase.cs" /> 34 <include name="SimProfileBase.cs" />
35 <include name="UserProfile.cs" /> 35 <include name="UserProfile.cs" />
36 <include name="UserProfileManager.cs" /> 36 <include name="UserProfileManager.cs" />
37 <include name="UserProfileManagerBase.cs" /> 37 <include name="UserProfileManagerBase.cs" />
38 <include name="Util.cs" /> 38 <include name="Util.cs" />
39 <include name="Properties/AssemblyInfo.cs" /> 39 <include name="Properties/AssemblyInfo.cs" />
40 </sources> 40 </sources>
41 <references basedir="${project::get-base-directory()}"> 41 <references basedir="${project::get-base-directory()}">
42 <lib> 42 <lib>
43 <include name="${project::get-base-directory()}" /> 43 <include name="${project::get-base-directory()}" />
44 <include name="${project::get-base-directory()}/${build.dir}" /> 44 <include name="${project::get-base-directory()}/${build.dir}" />
45 </lib> 45 </lib>
46 <include name="System.dll" /> 46 <include name="System.dll" />
47 <include name="System.Xml.dll" /> 47 <include name="System.Xml.dll" />
48 <include name="../bin/libsecondlife.dll" /> 48 <include name="../bin/libsecondlife.dll" />
49 <include name="../bin/Db4objects.Db4o.dll" /> 49 <include name="../bin/Db4objects.Db4o.dll" />
50 </references> 50 </references>
51 </csc> 51 </csc>
52 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 52 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
53 <mkdir dir="${project::get-base-directory()}/../bin/"/> 53 <mkdir dir="${project::get-base-directory()}/../bin/"/>
54 <copy todir="${project::get-base-directory()}/../bin/"> 54 <copy todir="${project::get-base-directory()}/../bin/">
55 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 55 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
56 <include name="*.dll"/> 56 <include name="*.dll"/>
57 <include name="*.exe"/> 57 <include name="*.exe"/>
58 </fileset> 58 </fileset>
59 </copy> 59 </copy>
60 </target> 60 </target>
61 <target name="clean"> 61 <target name="clean">
62 <delete dir="${bin.dir}" failonerror="false" /> 62 <delete dir="${bin.dir}" failonerror="false" />
63 <delete dir="${obj.dir}" failonerror="false" /> 63 <delete dir="${obj.dir}" failonerror="false" />
64 </target> 64 </target>
65 <target name="doc" description="Creates documentation."> 65 <target name="doc" description="Creates documentation.">
66 </target> 66 </target>
67</project> 67</project>
diff --git a/OpenSim.Framework/RemoteGridBase.cs b/OpenSim.Framework/RemoteGridBase.cs
index 6ca57df..e1f0b9b 100644
--- a/OpenSim.Framework/RemoteGridBase.cs
+++ b/OpenSim.Framework/RemoteGridBase.cs
@@ -18,7 +18,7 @@ namespace OpenSim.Framework.Interfaces
18 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 18 public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
19 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 19 public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
20 public abstract string GetName(); 20 public abstract string GetName();
21 public abstract bool RequestConnection(); 21 public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
22 public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); 22 public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
23 public abstract void Close(); 23 public abstract void Close();
24 } 24 }
generated by cgit v1.1 at 2024-11-10 01:33:06 +0000