aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-06-09 21:45:58 +0000
committerlbsa712007-06-09 21:45:58 +0000
commit4224b695acc2e1ad0199dc0ad7f560494182ed54 (patch)
tree8fae1cf25a058bc4e378ef2b6ce264d7f9f0b910
parent*Fixed casting mishap in last commit - client now starts up without crashing (diff)
downloadopensim-SC_OLD-4224b695acc2e1ad0199dc0ad7f560494182ed54.zip
opensim-SC_OLD-4224b695acc2e1ad0199dc0ad7f560494182ed54.tar.gz
opensim-SC_OLD-4224b695acc2e1ad0199dc0ad7f560494182ed54.tar.bz2
opensim-SC_OLD-4224b695acc2e1ad0199dc0ad7f560494182ed54.tar.xz
* LogFile now defaults to "{apptype}.log"
* cleaned away suo and user files. * added handy string chat variety to the API * Moved LockPhysicsEngine on World to SyncRoot on IWorld * Introduced NextLocalId instead of World fuggliness. * Transformed GetRegionInfo to Property on IWorld for great justice * Extracted default wearables (good to have) * Deleted unused BaseServer * Used IWorld instead of World wherever possible * The client constructor's not getting unused port any longer. * Extracted ClientView factoring so PacketServer can be tweaked. * Added SendLayerData to World * Made WorldBase abstract and cleaned it up a bit * added OpenGrid.Framework.Communications.dll.build and OpenSim.World.dll.build to svn * Added code for two examples (but not in prebuild yet)
Diffstat (limited to '')
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj18
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build51
-rw-r--r--Common/OpenSim.Framework.Console/ConsoleBase.cs6
-rw-r--r--Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user12
-rw-r--r--Common/OpenSim.Framework/Interfaces/IClientAPI.cs1
-rw-r--r--Common/OpenSim.Framework/Interfaces/IWorld.cs5
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj84
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj.user12
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.dll.build60
-rw-r--r--Common/OpenSim.Framework/Types/AgentWearable.cs15
-rw-r--r--Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user12
-rw-r--r--Common/OpenSim.Servers/BaseServer.cs10
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.csproj13
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.csproj.user12
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.dll.build7
-rw-r--r--Common/XmlRpcCS/XMLRPC.csproj36
-rw-r--r--Common/XmlRpcCS/XMLRPC.csproj.user12
-rw-r--r--Common/XmlRpcCS/XMLRPC.dll.build22
-rw-r--r--OpenGridServices.suobin139776 -> 0 bytes
-rw-r--r--OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user12
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj4
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user12
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build4
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user12
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj10
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user12
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build6
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj4
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user12
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build2
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj6
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user12
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build2
-rw-r--r--OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user12
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj4
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user12
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build2
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user12
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user12
-rw-r--r--OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user12
-rw-r--r--OpenSim.sln229
-rw-r--r--OpenSim/Examples/SimpleApp/MyWorld.cs101
-rw-r--r--OpenSim/Examples/SimpleApp/Program.cs110
-rw-r--r--OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs33
-rw-r--r--OpenSim/Examples/SimpleApp/SimpleApp.csproj86
-rw-r--r--OpenSim/Examples/SimpleApp2/MyClientView.cs69
-rw-r--r--OpenSim/Examples/SimpleApp2/MyPacketServer.cs30
-rw-r--r--OpenSim/Examples/SimpleApp2/Program.cs160
-rw-r--r--OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs33
-rw-r--r--OpenSim/Examples/SimpleApp2/SimpleApp2.csproj87
-rw-r--r--OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user12
-rw-r--r--OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user12
-rw-r--r--OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user12
-rw-r--r--OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user12
-rw-r--r--OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user12
-rw-r--r--OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user12
-rw-r--r--OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs8
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.API.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.cs6
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj36
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user12
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build26
-rw-r--r--OpenSim/OpenSim.RegionServer/PacketServer.cs10
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj32
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user12
-rw-r--r--OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build20
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user12
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj6
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user12
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build2
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user12
-rw-r--r--OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user12
-rw-r--r--OpenSim/OpenSim.World/Avatar.cs11
-rw-r--r--OpenSim/OpenSim.World/Entity.cs2
-rw-r--r--OpenSim/OpenSim.World/OpenSim.World.csproj32
-rw-r--r--OpenSim/OpenSim.World/OpenSim.World.csproj.user12
-rw-r--r--OpenSim/OpenSim.World/OpenSim.World.dll.build71
-rw-r--r--OpenSim/OpenSim.World/World.cs18
-rw-r--r--OpenSim/OpenSim.World/WorldBase.cs91
-rw-r--r--OpenSim/OpenSim/OpenSim.csproj.user13
-rw-r--r--Prebuild/src/Prebuild.csproj56
-rw-r--r--Prebuild/src/Prebuild.csproj.user12
-rw-r--r--Prebuild/src/Prebuild.exe.build34
83 files changed, 1273 insertions, 876 deletions
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
index 689210b..94682be 100644
--- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -83,31 +83,31 @@
83 <Compile Include="RegionServerCommsLocal.cs"> 83 <Compile Include="RegionServerCommsLocal.cs">
84 <SubType>Code</SubType> 84 <SubType>Code</SubType>
85 </Compile> 85 </Compile>
86 <Compile Include="RegionServerCommsOGS.cs"> 86 <Compile Include="RegionServerCommsManager.cs">
87 <SubType>Code</SubType> 87 <SubType>Code</SubType>
88 </Compile> 88 </Compile>
89 <Compile Include="RegionServerCommsManager.cs"> 89 <Compile Include="RegionServerCommsOGS.cs">
90 <SubType>Code</SubType> 90 <SubType>Code</SubType>
91 </Compile> 91 </Compile>
92 <Compile Include="Properties\AssemblyInfo.cs"> 92 <Compile Include="GridServer\GridCommsManagerBase.cs">
93 <SubType>Code</SubType> 93 <SubType>Code</SubType>
94 </Compile> 94 </Compile>
95 <Compile Include="UserServer\UserCommsManagerOGS.cs"> 95 <Compile Include="GridServer\GridCommsManagerLocal.cs">
96 <SubType>Code</SubType> 96 <SubType>Code</SubType>
97 </Compile> 97 </Compile>
98 <Compile Include="UserServer\UserCommsManagerLocal.cs"> 98 <Compile Include="GridServer\GridCommsManagerOGS.cs">
99 <SubType>Code</SubType> 99 <SubType>Code</SubType>
100 </Compile> 100 </Compile>
101 <Compile Include="UserServer\UserCommsManagerBase.cs"> 101 <Compile Include="Properties\AssemblyInfo.cs">
102 <SubType>Code</SubType> 102 <SubType>Code</SubType>
103 </Compile> 103 </Compile>
104 <Compile Include="GridServer\GridCommsManagerLocal.cs"> 104 <Compile Include="UserServer\UserCommsManagerBase.cs">
105 <SubType>Code</SubType> 105 <SubType>Code</SubType>
106 </Compile> 106 </Compile>
107 <Compile Include="GridServer\GridCommsManagerOGS.cs"> 107 <Compile Include="UserServer\UserCommsManagerLocal.cs">
108 <SubType>Code</SubType> 108 <SubType>Code</SubType>
109 </Compile> 109 </Compile>
110 <Compile Include="GridServer\GridCommsManagerBase.cs"> 110 <Compile Include="UserServer\UserCommsManagerOGS.cs">
111 <SubType>Code</SubType> 111 <SubType>Code</SubType>
112 </Compile> 112 </Compile>
113 </ItemGroup> 113 </ItemGroup>
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
new file mode 100644
index 0000000..a6616bf
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build
@@ -0,0 +1,51 @@
1<?xml version="1.0" ?>
2<project name="OpenGrid.Framework.Communications" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
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">
11 <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="RegionServerCommsLocal.cs" />
15 <include name="RegionServerCommsManager.cs" />
16 <include name="RegionServerCommsOGS.cs" />
17 <include name="GridServer/GridCommsManagerBase.cs" />
18 <include name="GridServer/GridCommsManagerLocal.cs" />
19 <include name="GridServer/GridCommsManagerOGS.cs" />
20 <include name="Properties/AssemblyInfo.cs" />
21 <include name="UserServer/UserCommsManagerBase.cs" />
22 <include name="UserServer/UserCommsManagerLocal.cs" />
23 <include name="UserServer/UserCommsManagerOGS.cs" />
24 </sources>
25 <references basedir="${project::get-base-directory()}">
26 <lib>
27 <include name="${project::get-base-directory()}" />
28 <include name="${project::get-base-directory()}/${build.dir}" />
29 </lib>
30 <include name="System.dll" />
31 <include name="System.Xml.dll" />
32 <include name="../../bin/OpenSim.Framework.dll" />
33 <include name="../../bin/libsecondlife.dll" />
34 </references>
35 </csc>
36 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
37 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
38 <copy todir="${project::get-base-directory()}/../../bin/">
39 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
40 <include name="*.dll"/>
41 <include name="*.exe"/>
42 </fileset>
43 </copy>
44 </target>
45 <target name="clean">
46 <delete dir="${bin.dir}" failonerror="false" />
47 <delete dir="${obj.dir}" failonerror="false" />
48 </target>
49 <target name="doc" description="Creates documentation.">
50 </target>
51</project>
diff --git a/Common/OpenSim.Framework.Console/ConsoleBase.cs b/Common/OpenSim.Framework.Console/ConsoleBase.cs
index 0377998..80a28e9 100644
--- a/Common/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common/OpenSim.Framework.Console/ConsoleBase.cs
@@ -54,6 +54,12 @@ namespace OpenSim.Framework.Console
54 this.cmdparser = cmdparser; 54 this.cmdparser = cmdparser;
55 this.m_silent = silent; 55 this.m_silent = silent;
56 System.Console.WriteLine("ServerConsole.cs - creating new local console"); 56 System.Console.WriteLine("ServerConsole.cs - creating new local console");
57
58 if( String.IsNullOrEmpty( LogFile ) )
59 {
60 LogFile = componentname + ".log";
61 }
62
57 System.Console.WriteLine("Logs will be saved to current directory in " + LogFile); 63 System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
58 Log = File.AppendText(LogFile); 64 Log = File.AppendText(LogFile);
59 Log.WriteLine("========================================================================"); 65 Log.WriteLine("========================================================================");
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index d5b2ae4..9d28dab 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -94,6 +94,7 @@ namespace OpenSim.Framework.Interfaces
94 void OutPacket(Packet newPack); 94 void OutPacket(Packet newPack);
95 void SendWearables(AvatarWearable[] wearables); 95 void SendWearables(AvatarWearable[] wearables);
96 void SendRegionHandshake(RegionInfo regionInfo); 96 void SendRegionHandshake(RegionInfo regionInfo);
97 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
97 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 98 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
98 void SendLayerData(float[] map); 99 void SendLayerData(float[] map);
99 void MoveAgentIntoRegion(RegionInfo regInfo); 100 void MoveAgentIntoRegion(RegionInfo regInfo);
diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs
index ab2d63d..eee30b7 100644
--- a/Common/OpenSim.Framework/Interfaces/IWorld.cs
+++ b/Common/OpenSim.Framework/Interfaces/IWorld.cs
@@ -10,6 +10,9 @@ namespace OpenSim.Framework.Interfaces
10 { 10 {
11 void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child); 11 void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);
12 void RemoveAvatar(LLUUID agentID); 12 void RemoveAvatar(LLUUID agentID);
13 RegionInfo GetRegionInfo(); 13
14 RegionInfo RegionInfo { get; }
15 object SyncRoot { get; }
16 uint NextLocalId { get; }
14 } 17 }
15} 18}
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 7e14e6a..f72c5f5 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -90,58 +90,49 @@
90 </ProjectReference> 90 </ProjectReference>
91 </ItemGroup> 91 </ItemGroup>
92 <ItemGroup> 92 <ItemGroup>
93 <Compile Include="RegionCommsHostBase.cs">
94 <SubType>Code</SubType>
95 </Compile>
96 <Compile Include="AgentInventory.cs"> 93 <Compile Include="AgentInventory.cs">
97 <SubType>Code</SubType> 94 <SubType>Code</SubType>
98 </Compile> 95 </Compile>
99 <Compile Include="AuthenticateSessionBase.cs"> 96 <Compile Include="AuthenticateSessionBase.cs">
100 <SubType>Code</SubType> 97 <SubType>Code</SubType>
101 </Compile> 98 </Compile>
102 <Compile Include="Util.cs"> 99 <Compile Include="BlockingQueue.cs">
103 <SubType>Code</SubType>
104 </Compile>
105 <Compile Include="Remoting.cs">
106 <SubType>Code</SubType> 100 <SubType>Code</SubType>
107 </Compile> 101 </Compile>
108 <Compile Include="UserProfileManagerBase.cs"> 102 <Compile Include="IRegionCommsHost.cs">
109 <SubType>Code</SubType> 103 <SubType>Code</SubType>
110 </Compile> 104 </Compile>
111 <Compile Include="LoginService.cs"> 105 <Compile Include="LoginService.cs">
112 <SubType>Code</SubType> 106 <SubType>Code</SubType>
113 </Compile> 107 </Compile>
114 <Compile Include="IRegionCommsHost.cs"> 108 <Compile Include="RegionCommsHostBase.cs">
115 <SubType>Code</SubType>
116 </Compile>
117 <Compile Include="UserProfileManager.cs">
118 <SubType>Code</SubType> 109 <SubType>Code</SubType>
119 </Compile> 110 </Compile>
120 <Compile Include="BlockingQueue.cs"> 111 <Compile Include="Remoting.cs">
121 <SubType>Code</SubType> 112 <SubType>Code</SubType>
122 </Compile> 113 </Compile>
123 <Compile Include="UserProfile.cs"> 114 <Compile Include="SimProfile.cs">
124 <SubType>Code</SubType> 115 <SubType>Code</SubType>
125 </Compile> 116 </Compile>
126 <Compile Include="SimProfileBase.cs"> 117 <Compile Include="SimProfileBase.cs">
127 <SubType>Code</SubType> 118 <SubType>Code</SubType>
128 </Compile> 119 </Compile>
129 <Compile Include="SimProfile.cs"> 120 <Compile Include="UserProfile.cs">
130 <SubType>Code</SubType> 121 <SubType>Code</SubType>
131 </Compile> 122 </Compile>
132 <Compile Include="Interfaces\LocalGridBase.cs"> 123 <Compile Include="UserProfileManager.cs">
133 <SubType>Code</SubType> 124 <SubType>Code</SubType>
134 </Compile> 125 </Compile>
135 <Compile Include="Interfaces\RemoteGridBase.cs"> 126 <Compile Include="UserProfileManagerBase.cs">
136 <SubType>Code</SubType> 127 <SubType>Code</SubType>
137 </Compile> 128 </Compile>
138 <Compile Include="Interfaces\IUserServer.cs"> 129 <Compile Include="Util.cs">
139 <SubType>Code</SubType> 130 <SubType>Code</SubType>
140 </Compile> 131 </Compile>
141 <Compile Include="Interfaces\IAssetServer.cs"> 132 <Compile Include="Interfaces\IAssetServer.cs">
142 <SubType>Code</SubType> 133 <SubType>Code</SubType>
143 </Compile> 134 </Compile>
144 <Compile Include="Interfaces\IWorld.cs"> 135 <Compile Include="Interfaces\IClientAPI.cs">
145 <SubType>Code</SubType> 136 <SubType>Code</SubType>
146 </Compile> 137 </Compile>
147 <Compile Include="Interfaces\IGridServer.cs"> 138 <Compile Include="Interfaces\IGridServer.cs">
@@ -150,61 +141,64 @@
150 <Compile Include="Interfaces\ILocalStorage.cs"> 141 <Compile Include="Interfaces\ILocalStorage.cs">
151 <SubType>Code</SubType> 142 <SubType>Code</SubType>
152 </Compile> 143 </Compile>
153 <Compile Include="Interfaces\IClientAPI.cs"> 144 <Compile Include="Interfaces\IUserServer.cs">
154 <SubType>Code</SubType> 145 <SubType>Code</SubType>
155 </Compile> 146 </Compile>
156 <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> 147 <Compile Include="Interfaces\IWorld.cs">
157 <SubType>Code</SubType> 148 <SubType>Code</SubType>
158 </Compile> 149 </Compile>
159 <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> 150 <Compile Include="Interfaces\LocalGridBase.cs">
160 <SubType>Code</SubType> 151 <SubType>Code</SubType>
161 </Compile> 152 </Compile>
162 <Compile Include="Interfaces\Remoting\IProxyServerHost.cs"> 153 <Compile Include="Interfaces\RemoteGridBase.cs">
163 <SubType>Code</SubType> 154 <SubType>Code</SubType>
164 </Compile> 155 </Compile>
165 <Compile Include="Interfaces\Remoting\IProxyServerClient.cs"> 156 <Compile Include="Interfaces\Config\IGenericConfig.cs">
166 <SubType>Code</SubType> 157 <SubType>Code</SubType>
167 </Compile> 158 </Compile>
168 <Compile Include="Interfaces\Remoting\IRegionGridClient.cs"> 159 <Compile Include="Interfaces\Config\IGridConfig.cs">
169 <SubType>Code</SubType> 160 <SubType>Code</SubType>
170 </Compile> 161 </Compile>
171 <Compile Include="Interfaces\Remoting\IGridServerHost.cs"> 162 <Compile Include="Interfaces\Config\IUserConfig.cs">
172 <SubType>Code</SubType> 163 <SubType>Code</SubType>
173 </Compile> 164 </Compile>
174 <Compile Include="Interfaces\Remoting\IRegionSimHost.cs"> 165 <Compile Include="Interfaces\Remoting\IGridServerHost.cs">
175 <SubType>Code</SubType> 166 <SubType>Code</SubType>
176 </Compile> 167 </Compile>
177 <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs"> 168 <Compile Include="Interfaces\Remoting\IProxyServerClient.cs">
178 <SubType>Code</SubType> 169 <SubType>Code</SubType>
179 </Compile> 170 </Compile>
180 <Compile Include="Interfaces\Config\IGenericConfig.cs"> 171 <Compile Include="Interfaces\Remoting\IProxyServerHost.cs">
181 <SubType>Code</SubType> 172 <SubType>Code</SubType>
182 </Compile> 173 </Compile>
183 <Compile Include="Interfaces\Config\IUserConfig.cs"> 174 <Compile Include="Interfaces\Remoting\IRegionGridClient.cs">
184 <SubType>Code</SubType> 175 <SubType>Code</SubType>
185 </Compile> 176 </Compile>
186 <Compile Include="Interfaces\Config\IGridConfig.cs"> 177 <Compile Include="Interfaces\Remoting\IRegionSimHost.cs">
187 <SubType>Code</SubType> 178 <SubType>Code</SubType>
188 </Compile> 179 </Compile>
189 <Compile Include="Properties\AssemblyInfo.cs"> 180 <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs">
190 <SubType>Code</SubType> 181 <SubType>Code</SubType>
191 </Compile> 182 </Compile>
192 <Compile Include="Types\NeighbourInfo.cs"> 183 <Compile Include="Interfaces\Scripting\IScriptAPI.cs">
193 <SubType>Code</SubType> 184 <SubType>Code</SubType>
194 </Compile> 185 </Compile>
195 <Compile Include="Types\NetworkServersInfo.cs"> 186 <Compile Include="Interfaces\Scripting\IScriptEngine.cs">
196 <SubType>Code</SubType> 187 <SubType>Code</SubType>
197 </Compile> 188 </Compile>
198 <Compile Include="Types\RegionInfo.cs"> 189 <Compile Include="Properties\AssemblyInfo.cs">
199 <SubType>Code</SubType> 190 <SubType>Code</SubType>
200 </Compile> 191 </Compile>
201 <Compile Include="Types\ParcelData.cs"> 192 <Compile Include="Types\AgentCiruitData.cs">
202 <SubType>Code</SubType> 193 <SubType>Code</SubType>
203 </Compile> 194 </Compile>
204 <Compile Include="Types\AgentWearable.cs"> 195 <Compile Include="Types\AgentWearable.cs">
205 <SubType>Code</SubType> 196 <SubType>Code</SubType>
206 </Compile> 197 </Compile>
207 <Compile Include="Types\PrimData.cs"> 198 <Compile Include="Types\AssetBase.cs">
199 <SubType>Code</SubType>
200 </Compile>
201 <Compile Include="Types\AssetLandmark.cs">
208 <SubType>Code</SubType> 202 <SubType>Code</SubType>
209 </Compile> 203 </Compile>
210 <Compile Include="Types\AssetStorage.cs"> 204 <Compile Include="Types\AssetStorage.cs">
@@ -213,19 +207,25 @@
213 <Compile Include="Types\EstateSettings.cs"> 207 <Compile Include="Types\EstateSettings.cs">
214 <SubType>Code</SubType> 208 <SubType>Code</SubType>
215 </Compile> 209 </Compile>
216 <Compile Include="Types\OSVector3.cs"> 210 <Compile Include="Types\Login.cs">
217 <SubType>Code</SubType> 211 <SubType>Code</SubType>
218 </Compile> 212 </Compile>
219 <Compile Include="Types\AgentCiruitData.cs"> 213 <Compile Include="Types\NeighbourInfo.cs">
220 <SubType>Code</SubType> 214 <SubType>Code</SubType>
221 </Compile> 215 </Compile>
222 <Compile Include="Types\Login.cs"> 216 <Compile Include="Types\NetworkServersInfo.cs">
223 <SubType>Code</SubType> 217 <SubType>Code</SubType>
224 </Compile> 218 </Compile>
225 <Compile Include="Types\AssetLandmark.cs"> 219 <Compile Include="Types\OSVector3.cs">
226 <SubType>Code</SubType> 220 <SubType>Code</SubType>
227 </Compile> 221 </Compile>
228 <Compile Include="Types\AssetBase.cs"> 222 <Compile Include="Types\ParcelData.cs">
223 <SubType>Code</SubType>
224 </Compile>
225 <Compile Include="Types\PrimData.cs">
226 <SubType>Code</SubType>
227 </Compile>
228 <Compile Include="Types\RegionInfo.cs">
229 <SubType>Code</SubType> 229 <SubType>Code</SubType>
230 </Compile> 230 </Compile>
231 </ItemGroup> 231 </ItemGroup>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
index 2678e54..7ead9a8 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -11,52 +11,52 @@
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="RegionCommsHostBase.cs" />
15 <include name="AgentInventory.cs" /> 14 <include name="AgentInventory.cs" />
16 <include name="AuthenticateSessionBase.cs" /> 15 <include name="AuthenticateSessionBase.cs" />
17 <include name="Util.cs" />
18 <include name="Remoting.cs" />
19 <include name="UserProfileManagerBase.cs" />
20 <include name="LoginService.cs" />
21 <include name="IRegionCommsHost.cs" />
22 <include name="UserProfileManager.cs" />
23 <include name="BlockingQueue.cs" /> 16 <include name="BlockingQueue.cs" />
24 <include name="UserProfile.cs" /> 17 <include name="IRegionCommsHost.cs" />
25 <include name="SimProfileBase.cs" /> 18 <include name="LoginService.cs" />
19 <include name="RegionCommsHostBase.cs" />
20 <include name="Remoting.cs" />
26 <include name="SimProfile.cs" /> 21 <include name="SimProfile.cs" />
27 <include name="Interfaces/LocalGridBase.cs" /> 22 <include name="SimProfileBase.cs" />
28 <include name="Interfaces/RemoteGridBase.cs" /> 23 <include name="UserProfile.cs" />
29 <include name="Interfaces/IUserServer.cs" /> 24 <include name="UserProfileManager.cs" />
25 <include name="UserProfileManagerBase.cs" />
26 <include name="Util.cs" />
30 <include name="Interfaces/IAssetServer.cs" /> 27 <include name="Interfaces/IAssetServer.cs" />
31 <include name="Interfaces/IWorld.cs" /> 28 <include name="Interfaces/IClientAPI.cs" />
32 <include name="Interfaces/IGridServer.cs" /> 29 <include name="Interfaces/IGridServer.cs" />
33 <include name="Interfaces/ILocalStorage.cs" /> 30 <include name="Interfaces/ILocalStorage.cs" />
34 <include name="Interfaces/IClientAPI.cs" /> 31 <include name="Interfaces/IUserServer.cs" />
35 <include name="Interfaces/Scripting/IScriptEngine.cs" /> 32 <include name="Interfaces/IWorld.cs" />
36 <include name="Interfaces/Scripting/IScriptAPI.cs" /> 33 <include name="Interfaces/LocalGridBase.cs" />
37 <include name="Interfaces/Remoting/IProxyServerHost.cs" /> 34 <include name="Interfaces/RemoteGridBase.cs" />
35 <include name="Interfaces/Config/IGenericConfig.cs" />
36 <include name="Interfaces/Config/IGridConfig.cs" />
37 <include name="Interfaces/Config/IUserConfig.cs" />
38 <include name="Interfaces/Remoting/IGridServerHost.cs" />
38 <include name="Interfaces/Remoting/IProxyServerClient.cs" /> 39 <include name="Interfaces/Remoting/IProxyServerClient.cs" />
40 <include name="Interfaces/Remoting/IProxyServerHost.cs" />
39 <include name="Interfaces/Remoting/IRegionGridClient.cs" /> 41 <include name="Interfaces/Remoting/IRegionGridClient.cs" />
40 <include name="Interfaces/Remoting/IGridServerHost.cs" />
41 <include name="Interfaces/Remoting/IRegionSimHost.cs" /> 42 <include name="Interfaces/Remoting/IRegionSimHost.cs" />
42 <include name="Interfaces/Remoting/RegionGridClientBase.cs" /> 43 <include name="Interfaces/Remoting/RegionGridClientBase.cs" />
43 <include name="Interfaces/Config/IGenericConfig.cs" /> 44 <include name="Interfaces/Scripting/IScriptAPI.cs" />
44 <include name="Interfaces/Config/IUserConfig.cs" /> 45 <include name="Interfaces/Scripting/IScriptEngine.cs" />
45 <include name="Interfaces/Config/IGridConfig.cs" />
46 <include name="Properties/AssemblyInfo.cs" /> 46 <include name="Properties/AssemblyInfo.cs" />
47 <include name="Types/NeighbourInfo.cs" /> 47 <include name="Types/AgentCiruitData.cs" />
48 <include name="Types/NetworkServersInfo.cs" />
49 <include name="Types/RegionInfo.cs" />
50 <include name="Types/ParcelData.cs" />
51 <include name="Types/AgentWearable.cs" /> 48 <include name="Types/AgentWearable.cs" />
52 <include name="Types/PrimData.cs" /> 49 <include name="Types/AssetBase.cs" />
50 <include name="Types/AssetLandmark.cs" />
53 <include name="Types/AssetStorage.cs" /> 51 <include name="Types/AssetStorage.cs" />
54 <include name="Types/EstateSettings.cs" /> 52 <include name="Types/EstateSettings.cs" />
55 <include name="Types/OSVector3.cs" />
56 <include name="Types/AgentCiruitData.cs" />
57 <include name="Types/Login.cs" /> 53 <include name="Types/Login.cs" />
58 <include name="Types/AssetLandmark.cs" /> 54 <include name="Types/NeighbourInfo.cs" />
59 <include name="Types/AssetBase.cs" /> 55 <include name="Types/NetworkServersInfo.cs" />
56 <include name="Types/OSVector3.cs" />
57 <include name="Types/ParcelData.cs" />
58 <include name="Types/PrimData.cs" />
59 <include name="Types/RegionInfo.cs" />
60 </sources> 60 </sources>
61 <references basedir="${project::get-base-directory()}"> 61 <references basedir="${project::get-base-directory()}">
62 <lib> 62 <lib>
diff --git a/Common/OpenSim.Framework/Types/AgentWearable.cs b/Common/OpenSim.Framework/Types/AgentWearable.cs
index b7fbe3c..49c1292 100644
--- a/Common/OpenSim.Framework/Types/AgentWearable.cs
+++ b/Common/OpenSim.Framework/Types/AgentWearable.cs
@@ -14,5 +14,20 @@ namespace OpenSim.Framework.Types
14 { 14 {
15 15
16 } 16 }
17
18 public static AvatarWearable[] DefaultWearables
19 {
20 get
21 {
22 AvatarWearable[] defaultWearables = new AvatarWearable[13]; //should be 13 of these
23 for (int i = 0; i < 13; i++)
24 {
25 defaultWearables[i] = new AvatarWearable();
26 }
27 defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
28 defaultWearables[0].ItemID = LLUUID.Random();
29 return defaultWearables;
30 }
31 }
17 } 32 }
18} 33}
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/Common/OpenSim.Servers/BaseServer.cs b/Common/OpenSim.Servers/BaseServer.cs
deleted file mode 100644
index 0a4c498..0000000
--- a/Common/OpenSim.Servers/BaseServer.cs
+++ /dev/null
@@ -1,10 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Servers
6{
7 public class BaseServer
8 {
9 }
10}
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index 6768ce4..0c61f75 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -92,13 +92,10 @@
92 </ProjectReference> 92 </ProjectReference>
93 </ItemGroup> 93 </ItemGroup>
94 <ItemGroup> 94 <ItemGroup>
95 <Compile Include="LoginServer.cs">
96 <SubType>Code</SubType>
97 </Compile>
98 <Compile Include="BaseHttpServer.cs"> 95 <Compile Include="BaseHttpServer.cs">
99 <SubType>Code</SubType> 96 <SubType>Code</SubType>
100 </Compile> 97 </Compile>
101 <Compile Include="BaseServer.cs"> 98 <Compile Include="CheckSumServer.cs">
102 <SubType>Code</SubType> 99 <SubType>Code</SubType>
103 </Compile> 100 </Compile>
104 <Compile Include="IRestHandler.cs"> 101 <Compile Include="IRestHandler.cs">
@@ -107,18 +104,18 @@
107 <Compile Include="LocalUserProfileManager.cs"> 104 <Compile Include="LocalUserProfileManager.cs">
108 <SubType>Code</SubType> 105 <SubType>Code</SubType>
109 </Compile> 106 </Compile>
110 <Compile Include="XmlRpcMethod.cs">
111 <SubType>Code</SubType>
112 </Compile>
113 <Compile Include="LoginResponse.cs"> 107 <Compile Include="LoginResponse.cs">
114 <SubType>Code</SubType> 108 <SubType>Code</SubType>
115 </Compile> 109 </Compile>
116 <Compile Include="CheckSumServer.cs"> 110 <Compile Include="LoginServer.cs">
117 <SubType>Code</SubType> 111 <SubType>Code</SubType>
118 </Compile> 112 </Compile>
119 <Compile Include="UDPServerBase.cs"> 113 <Compile Include="UDPServerBase.cs">
120 <SubType>Code</SubType> 114 <SubType>Code</SubType>
121 </Compile> 115 </Compile>
116 <Compile Include="XmlRpcMethod.cs">
117 <SubType>Code</SubType>
118 </Compile>
122 </ItemGroup> 119 </ItemGroup>
123 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 120 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
124 <PropertyGroup> 121 <PropertyGroup>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user b/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
index a2af584..ec868f1 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build
+++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build
@@ -11,15 +11,14 @@
11 <resources prefix="OpenSim.Servers" dynamicprefix="true" > 11 <resources prefix="OpenSim.Servers" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="LoginServer.cs" />
15 <include name="BaseHttpServer.cs" /> 14 <include name="BaseHttpServer.cs" />
16 <include name="BaseServer.cs" /> 15 <include name="CheckSumServer.cs" />
17 <include name="IRestHandler.cs" /> 16 <include name="IRestHandler.cs" />
18 <include name="LocalUserProfileManager.cs" /> 17 <include name="LocalUserProfileManager.cs" />
19 <include name="XmlRpcMethod.cs" />
20 <include name="LoginResponse.cs" /> 18 <include name="LoginResponse.cs" />
21 <include name="CheckSumServer.cs" /> 19 <include name="LoginServer.cs" />
22 <include name="UDPServerBase.cs" /> 20 <include name="UDPServerBase.cs" />
21 <include name="XmlRpcMethod.cs" />
23 </sources> 22 </sources>
24 <references basedir="${project::get-base-directory()}"> 23 <references basedir="${project::get-base-directory()}">
25 <lib> 24 <lib>
diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj
index 1ab494e..61f8be0 100644
--- a/Common/XmlRpcCS/XMLRPC.csproj
+++ b/Common/XmlRpcCS/XMLRPC.csproj
@@ -70,58 +70,58 @@
70 <ItemGroup> 70 <ItemGroup>
71 </ItemGroup> 71 </ItemGroup>
72 <ItemGroup> 72 <ItemGroup>
73 <Compile Include="XmlRpcBoxcarRequest.cs"> 73 <Compile Include="Logger.cs">
74 <SubType>Code</SubType> 74 <SubType>Code</SubType>
75 </Compile> 75 </Compile>
76 <Compile Include="XmlRpcRequest.cs"> 76 <Compile Include="SimpleHttpRequest.cs">
77 <SubType>Code</SubType> 77 <SubType>Code</SubType>
78 </Compile> 78 </Compile>
79 <Compile Include="XmlRpcResponseSerializer.cs"> 79 <Compile Include="XmlRpcBoxcarRequest.cs">
80 <SubType>Code</SubType> 80 <SubType>Code</SubType>
81 </Compile> 81 </Compile>
82 <Compile Include="Logger.cs"> 82 <Compile Include="XmlRpcClientProxy.cs">
83 <SubType>Code</SubType> 83 <SubType>Code</SubType>
84 </Compile> 84 </Compile>
85 <Compile Include="XmlRpcRequestDeserializer.cs"> 85 <Compile Include="XmlRpcDeserializer.cs">
86 <SubType>Code</SubType> 86 <SubType>Code</SubType>
87 </Compile> 87 </Compile>
88 <Compile Include="XmlRpcExposedAttribute.cs"> 88 <Compile Include="XmlRpcErrorCodes.cs">
89 <SubType>Code</SubType> 89 <SubType>Code</SubType>
90 </Compile> 90 </Compile>
91 <Compile Include="XmlRpcResponse.cs"> 91 <Compile Include="XmlRpcException.cs">
92 <SubType>Code</SubType> 92 <SubType>Code</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="XmlRpcException.cs"> 94 <Compile Include="XmlRpcExposedAttribute.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="XmlRpcResponder.cs"> 97 <Compile Include="XmlRpcRequest.cs">
98 <SubType>Code</SubType> 98 <SubType>Code</SubType>
99 </Compile> 99 </Compile>
100 <Compile Include="XmlRpcResponseDeserializer.cs"> 100 <Compile Include="XmlRpcRequestDeserializer.cs">
101 <SubType>Code</SubType> 101 <SubType>Code</SubType>
102 </Compile> 102 </Compile>
103 <Compile Include="XmlRpcServer.cs"> 103 <Compile Include="XmlRpcRequestSerializer.cs">
104 <SubType>Code</SubType> 104 <SubType>Code</SubType>
105 </Compile> 105 </Compile>
106 <Compile Include="XmlRpcErrorCodes.cs"> 106 <Compile Include="XmlRpcResponder.cs">
107 <SubType>Code</SubType> 107 <SubType>Code</SubType>
108 </Compile> 108 </Compile>
109 <Compile Include="XmlRpcSerializer.cs"> 109 <Compile Include="XmlRpcResponse.cs">
110 <SubType>Code</SubType> 110 <SubType>Code</SubType>
111 </Compile> 111 </Compile>
112 <Compile Include="XmlRpcSystemObject.cs"> 112 <Compile Include="XmlRpcResponseDeserializer.cs">
113 <SubType>Code</SubType> 113 <SubType>Code</SubType>
114 </Compile> 114 </Compile>
115 <Compile Include="SimpleHttpRequest.cs"> 115 <Compile Include="XmlRpcResponseSerializer.cs">
116 <SubType>Code</SubType> 116 <SubType>Code</SubType>
117 </Compile> 117 </Compile>
118 <Compile Include="XmlRpcClientProxy.cs"> 118 <Compile Include="XmlRpcSerializer.cs">
119 <SubType>Code</SubType> 119 <SubType>Code</SubType>
120 </Compile> 120 </Compile>
121 <Compile Include="XmlRpcRequestSerializer.cs"> 121 <Compile Include="XmlRpcServer.cs">
122 <SubType>Code</SubType> 122 <SubType>Code</SubType>
123 </Compile> 123 </Compile>
124 <Compile Include="XmlRpcDeserializer.cs"> 124 <Compile Include="XmlRpcSystemObject.cs">
125 <SubType>Code</SubType> 125 <SubType>Code</SubType>
126 </Compile> 126 </Compile>
127 <Compile Include="XmlRpcXmlTokens.cs"> 127 <Compile Include="XmlRpcXmlTokens.cs">
diff --git a/Common/XmlRpcCS/XMLRPC.csproj.user b/Common/XmlRpcCS/XMLRPC.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Common/XmlRpcCS/XMLRPC.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build
index e7936c3..2eabfcd 100644
--- a/Common/XmlRpcCS/XMLRPC.dll.build
+++ b/Common/XmlRpcCS/XMLRPC.dll.build
@@ -11,24 +11,24 @@
11 <resources prefix="XMLRPC" dynamicprefix="true" > 11 <resources prefix="XMLRPC" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="Logger.cs" />
15 <include name="SimpleHttpRequest.cs" />
14 <include name="XmlRpcBoxcarRequest.cs" /> 16 <include name="XmlRpcBoxcarRequest.cs" />
17 <include name="XmlRpcClientProxy.cs" />
18 <include name="XmlRpcDeserializer.cs" />
19 <include name="XmlRpcErrorCodes.cs" />
20 <include name="XmlRpcException.cs" />
21 <include name="XmlRpcExposedAttribute.cs" />
15 <include name="XmlRpcRequest.cs" /> 22 <include name="XmlRpcRequest.cs" />
16 <include name="XmlRpcResponseSerializer.cs" />
17 <include name="Logger.cs" />
18 <include name="XmlRpcRequestDeserializer.cs" /> 23 <include name="XmlRpcRequestDeserializer.cs" />
19 <include name="XmlRpcExposedAttribute.cs" /> 24 <include name="XmlRpcRequestSerializer.cs" />
20 <include name="XmlRpcResponse.cs" />
21 <include name="XmlRpcException.cs" />
22 <include name="XmlRpcResponder.cs" /> 25 <include name="XmlRpcResponder.cs" />
26 <include name="XmlRpcResponse.cs" />
23 <include name="XmlRpcResponseDeserializer.cs" /> 27 <include name="XmlRpcResponseDeserializer.cs" />
24 <include name="XmlRpcServer.cs" /> 28 <include name="XmlRpcResponseSerializer.cs" />
25 <include name="XmlRpcErrorCodes.cs" />
26 <include name="XmlRpcSerializer.cs" /> 29 <include name="XmlRpcSerializer.cs" />
30 <include name="XmlRpcServer.cs" />
27 <include name="XmlRpcSystemObject.cs" /> 31 <include name="XmlRpcSystemObject.cs" />
28 <include name="SimpleHttpRequest.cs" />
29 <include name="XmlRpcClientProxy.cs" />
30 <include name="XmlRpcRequestSerializer.cs" />
31 <include name="XmlRpcDeserializer.cs" />
32 <include name="XmlRpcXmlTokens.cs" /> 32 <include name="XmlRpcXmlTokens.cs" />
33 </sources> 33 </sources>
34 <references basedir="${project::get-base-directory()}"> 34 <references basedir="${project::get-base-directory()}">
diff --git a/OpenGridServices.suo b/OpenGridServices.suo
deleted file mode 100644
index 728df77..0000000
--- a/OpenGridServices.suo
+++ /dev/null
Binary files differ
diff --git a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user b/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index 3b783ca..82d4f5f 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
@@ -88,13 +88,13 @@
88 </ProjectReference> 88 </ProjectReference>
89 </ItemGroup> 89 </ItemGroup>
90 <ItemGroup> 90 <ItemGroup>
91 <Compile Include="DB4oUserData.cs"> 91 <Compile Include="DB4oGridData.cs">
92 <SubType>Code</SubType> 92 <SubType>Code</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="DB4oManager.cs"> 94 <Compile Include="DB4oManager.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="DB4oGridData.cs"> 97 <Compile Include="DB4oUserData.cs">
98 <SubType>Code</SubType> 98 <SubType>Code</SubType>
99 </Compile> 99 </Compile>
100 <Compile Include="Properties\AssemblyInfo.cs"> 100 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
index db8662d..8e0f53a 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build
@@ -11,9 +11,9 @@
11 <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" > 11 <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="DB4oUserData.cs" />
15 <include name="DB4oManager.cs" />
16 <include name="DB4oGridData.cs" /> 14 <include name="DB4oGridData.cs" />
15 <include name="DB4oManager.cs" />
16 <include name="DB4oUserData.cs" />
17 <include name="Properties/AssemblyInfo.cs" /> 17 <include name="Properties/AssemblyInfo.cs" />
18 </sources> 18 </sources>
19 <references basedir="${project::get-base-directory()}"> 19 <references basedir="${project::get-base-directory()}">
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
index 5fe0cf7..75ef149 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj
@@ -88,19 +88,19 @@
88 </ProjectReference> 88 </ProjectReference>
89 </ItemGroup> 89 </ItemGroup>
90 <ItemGroup> 90 <ItemGroup>
91 <Compile Include="MySQLInventoryData.cs"> 91 <Compile Include="MySQLGridData.cs">
92 <SubType>Code</SubType> 92 <SubType>Code</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="MySQLUserData.cs"> 94 <Compile Include="MySQLInventoryData.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="MySQLManager.cs"> 97 <Compile Include="MySQLLogData.cs">
98 <SubType>Code</SubType> 98 <SubType>Code</SubType>
99 </Compile> 99 </Compile>
100 <Compile Include="MySQLLogData.cs"> 100 <Compile Include="MySQLManager.cs">
101 <SubType>Code</SubType> 101 <SubType>Code</SubType>
102 </Compile> 102 </Compile>
103 <Compile Include="MySQLGridData.cs"> 103 <Compile Include="MySQLUserData.cs">
104 <SubType>Code</SubType> 104 <SubType>Code</SubType>
105 </Compile> 105 </Compile>
106 <Compile Include="Properties\AssemblyInfo.cs"> 106 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
index 84d3d56..78f4afe 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build
@@ -11,11 +11,11 @@
11 <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" > 11 <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="MySQLGridData.cs" />
14 <include name="MySQLInventoryData.cs" /> 15 <include name="MySQLInventoryData.cs" />
15 <include name="MySQLUserData.cs" />
16 <include name="MySQLManager.cs" />
17 <include name="MySQLLogData.cs" /> 16 <include name="MySQLLogData.cs" />
18 <include name="MySQLGridData.cs" /> 17 <include name="MySQLManager.cs" />
18 <include name="MySQLUserData.cs" />
19 <include name="Properties/AssemblyInfo.cs" /> 19 <include name="Properties/AssemblyInfo.cs" />
20 </sources> 20 </sources>
21 <references basedir="${project::get-base-directory()}"> 21 <references basedir="${project::get-base-directory()}">
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
index fa17367..463cf86 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj
@@ -88,10 +88,10 @@
88 </ProjectReference> 88 </ProjectReference>
89 </ItemGroup> 89 </ItemGroup>
90 <ItemGroup> 90 <ItemGroup>
91 <Compile Include="SQLiteManager.cs"> 91 <Compile Include="SQLiteGridData.cs">
92 <SubType>Code</SubType> 92 <SubType>Code</SubType>
93 </Compile> 93 </Compile>
94 <Compile Include="SQLiteGridData.cs"> 94 <Compile Include="SQLiteManager.cs">
95 <SubType>Code</SubType> 95 <SubType>Code</SubType>
96 </Compile> 96 </Compile>
97 <Compile Include="Properties\AssemblyInfo.cs"> 97 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
index 8c0f8fe..1be9b43 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build
@@ -11,8 +11,8 @@
11 <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" > 11 <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="SQLiteManager.cs" />
15 <include name="SQLiteGridData.cs" /> 14 <include name="SQLiteGridData.cs" />
15 <include name="SQLiteManager.cs" />
16 <include name="Properties/AssemblyInfo.cs" /> 16 <include name="Properties/AssemblyInfo.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index 990cd16..a572204 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -81,9 +81,6 @@
81 <Compile Include="GridData.cs"> 81 <Compile Include="GridData.cs">
82 <SubType>Code</SubType> 82 <SubType>Code</SubType>
83 </Compile> 83 </Compile>
84 <Compile Include="SimProfileData.cs">
85 <SubType>Code</SubType>
86 </Compile>
87 <Compile Include="ILogData.cs"> 84 <Compile Include="ILogData.cs">
88 <SubType>Code</SubType> 85 <SubType>Code</SubType>
89 </Compile> 86 </Compile>
@@ -93,6 +90,9 @@
93 <Compile Include="InventoryData.cs"> 90 <Compile Include="InventoryData.cs">
94 <SubType>Code</SubType> 91 <SubType>Code</SubType>
95 </Compile> 92 </Compile>
93 <Compile Include="SimProfileData.cs">
94 <SubType>Code</SubType>
95 </Compile>
96 <Compile Include="UserData.cs"> 96 <Compile Include="UserData.cs">
97 <SubType>Code</SubType> 97 <SubType>Code</SubType>
98 </Compile> 98 </Compile>
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index c993a8d..e6e0313 100644
--- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
@@ -12,10 +12,10 @@
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="GridData.cs" /> 14 <include name="GridData.cs" />
15 <include name="SimProfileData.cs" />
16 <include name="ILogData.cs" /> 15 <include name="ILogData.cs" />
17 <include name="IniConfig.cs" /> 16 <include name="IniConfig.cs" />
18 <include name="InventoryData.cs" /> 17 <include name="InventoryData.cs" />
18 <include name="SimProfileData.cs" />
19 <include name="UserData.cs" /> 19 <include name="UserData.cs" />
20 <include name="UserProfileData.cs" /> 20 <include name="UserProfileData.cs" />
21 <include name="Properties/AssemblyInfo.cs" /> 21 <include name="Properties/AssemblyInfo.cs" />
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
index a281e4f..f170f42 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
@@ -98,10 +98,10 @@
98 <ItemGroup> 98 <ItemGroup>
99 </ItemGroup> 99 </ItemGroup>
100 <ItemGroup> 100 <ItemGroup>
101 <Compile Include="Main.cs"> 101 <Compile Include="AssetHttpServer.cs">
102 <SubType>Code</SubType> 102 <SubType>Code</SubType>
103 </Compile> 103 </Compile>
104 <Compile Include="AssetHttpServer.cs"> 104 <Compile Include="Main.cs">
105 <SubType>Code</SubType> 105 <SubType>Code</SubType>
106 </Compile> 106 </Compile>
107 <Compile Include="Properties\AssemblyInfo.cs"> 107 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
index 700e32b..72bfc74 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
@@ -11,8 +11,8 @@
11 <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" > 11 <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="Main.cs" />
15 <include name="AssetHttpServer.cs" /> 14 <include name="AssetHttpServer.cs" />
15 <include name="Main.cs" />
16 <include name="Properties/AssemblyInfo.cs" /> 16 <include name="Properties/AssemblyInfo.cs" />
17 </sources> 17 </sources>
18 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.sln b/OpenSim.sln
index 33a7217..5b54b05 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -41,144 +41,93 @@ EndProject
41Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" 41Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
42EndProject 42EndProject
43Global 43Global
44 GlobalSection(SolutionConfigurationPlatforms) = preSolution 44 GlobalSection(SolutionConfigurationPlatforms) = preSolution
45 Debug|Any CPU = Debug|Any CPU 45 Debug|Any CPU = Debug|Any CPU
46 Release|Any CPU = Release|Any CPU 46 Release|Any CPU = Release|Any CPU
47 EndGlobalSection 47 EndGlobalSection
48 GlobalSection(ProjectDependencies) = postSolution 48 GlobalSection(ProjectConfigurationPlatforms) = postSolution
49 ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) 49 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50 ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) 50 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
51 ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) 51 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
52 ({683344D5-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) 52 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
53 ({642A14A8-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) 53 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54 ({642A14A8-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) 54 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
55 ({642A14A8-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) 55 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
56 ({642A14A8-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) 56 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
57 ({642A14A8-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) 57 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58 ({642A14A8-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) 58 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
59 ({642A14A8-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000}) 59 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
60 ({642A14A8-0000-0000-0000-000000000000}).12 = ({683344D5-0000-0000-0000-000000000000}) 60 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
61 ({438A9556-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) 61 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62 ({438A9556-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) 62 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
63 ({438A9556-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) 63 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
64 ({438A9556-0000-0000-0000-000000000000}).8 = ({8BE16150-0000-0000-0000-000000000000}) 64 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
65 ({438A9556-0000-0000-0000-000000000000}).9 = ({8BB20F0A-0000-0000-0000-000000000000}) 65 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66 ({438A9556-0000-0000-0000-000000000000}).10 = ({642A14A8-0000-0000-0000-000000000000}) 66 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
67 ({438A9556-0000-0000-0000-000000000000}).11 = ({632E1BFD-0000-0000-0000-000000000000}) 67 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
68 ({438A9556-0000-0000-0000-000000000000}).12 = ({E88EF749-0000-0000-0000-000000000000}) 68 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
69 ({438A9556-0000-0000-0000-000000000000}).13 = ({683344D5-0000-0000-0000-000000000000}) 69 {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70 ({438A9556-0000-0000-0000-000000000000}).14 = ({8E81D43C-0000-0000-0000-000000000000}) 70 {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
71 ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) 71 {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
72 ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) 72 {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
73 ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) 73 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74 ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) 74 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
75 ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) 75 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
76 ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) 76 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
77 ({632E1BFD-0000-0000-0000-000000000000}).11 = ({8E81D43C-0000-0000-0000-000000000000}) 77 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78 ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) 78 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
79 ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 79 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
80 ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) 80 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
81 ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) 81 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
82 ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) 82 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
83 ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 83 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
84 ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) 84 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
85 ({B55C0B5D-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) 85 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
86 ({8ACA2445-0000-0000-0000-000000000000}).4 = ({8E81D43C-0000-0000-0000-000000000000}) 86 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
87 ({8ACA2445-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) 87 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
88 ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) 88 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
89 ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) 89 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90 ({8BB20F0A-0000-0000-0000-000000000000}).5 = ({8E81D43C-0000-0000-0000-000000000000}) 90 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
91 ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) 91 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
92 ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) 92 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
93 ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 93 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
94 ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 94 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
95 ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) 95 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
96 ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) 96 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
97 ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) 97 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
98 EndGlobalSection 98 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
99 GlobalSection(ProjectConfigurationPlatforms) = postSolution 99 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
100 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 100 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
101 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 101 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 102 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
103 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 103 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
104 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 104 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
105 {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 105 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
106 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 106 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
107 {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 107 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
108 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 108 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
109 {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 109 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
110 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 110 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
111 {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 111 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
112 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 112 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
113 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 113 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
114 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 114 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
115 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 115 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
116 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 116 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
117 {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 117 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 118 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
119 {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 119 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
120 {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 120 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
121 {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 121 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
122 {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 122 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
123 {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 123 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
124 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 124 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
125 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 125 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 126 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
127 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 127 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
128 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 128 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
129 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 129 EndGlobalSection
130 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 130 GlobalSection(SolutionProperties) = preSolution
131 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 131 HideSolutionNode = FALSE
132 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 132 EndGlobalSection
133 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
134 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
135 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
136 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
137 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
138 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
139 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
140 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
141 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
142 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
143 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
144 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
146 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
147 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
148 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
149 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
150 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
151 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
152 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
154 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
155 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
156 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
158 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
159 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
160 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
161 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
162 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
163 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
164 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165 {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
166 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
167 {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
168 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
169 {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
170 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
171 {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
172 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
173 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
174 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
175 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
176 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
177 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
178 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
179 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
180 EndGlobalSection
181 GlobalSection(SolutionProperties) = preSolution
182 HideSolutionNode = FALSE
183 EndGlobalSection
184EndGlobal 133EndGlobal
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Examples/SimpleApp/MyWorld.cs
new file mode 100644
index 0000000..27775f1
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp/MyWorld.cs
@@ -0,0 +1,101 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Interfaces;
5using OpenSim.Framework.Types;
6using OpenSim.Framework.Console;
7using libsecondlife;
8
9namespace SimpleApp
10{
11 public class MyWorld : IWorld
12 {
13 private RegionInfo m_regionInfo;
14
15 public MyWorld(RegionInfo regionInfo)
16 {
17 m_regionInfo = regionInfo;
18 }
19
20 private void SendLayerData(IClientAPI remoteClient)
21 {
22 float[] map = new float[65536];
23
24 for (int i = 0; i < 65536; i++)
25 {
26 int x = i % 256;
27 int y = i / 256;
28
29 map[i] = (float)(x + y / 2);
30 }
31
32 remoteClient.SendLayerData(map);
33 }
34
35 #region IWorld Members
36
37 void IWorld.AddNewAvatar(IClientAPI client, LLUUID agentID, bool child)
38 {
39 LLVector3 pos = new LLVector3(128, 128, 128);
40
41 client.OnRegionHandShakeReply += SendLayerData;
42 client.OnChatFromViewer +=
43 delegate(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
44 {
45 // Echo it (so you know what you typed)
46 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
47 client.SendChatMessage("Ready.", 1, pos, "System", LLUUID.Zero );
48 };
49
50 client.OnRequestWearables += SendWearables;
51
52 client.OnCompleteMovementToRegion += delegate()
53 {
54 client.MoveAgentIntoRegion(m_regionInfo);
55 };
56
57 client.OnCompleteMovementToRegion += delegate()
58 {
59 client.SendAvatarData(m_regionInfo, client.FirstName,
60 client.LastName, client.AgentId, 0,
61 pos);
62
63 client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero );
64 };
65
66 client.SendRegionHandshake(m_regionInfo);
67
68 }
69
70 private void SendWearables( IClientAPI client )
71 {
72 client.SendWearables( AvatarWearable.DefaultWearables );
73 }
74
75 void IWorld.RemoveAvatar(LLUUID agentID)
76 {
77
78 }
79
80 RegionInfo IWorld.RegionInfo
81 {
82 get { return m_regionInfo; }
83 }
84
85 object IWorld.SyncRoot
86 {
87 get { return this; }
88 }
89
90 private uint m_nextLocalId = 1;
91
92 uint IWorld.NextLocalId
93 {
94 get { return m_nextLocalId++; }
95 }
96
97 #endregion
98
99
100 }
101}
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
new file mode 100644
index 0000000..e44bdba
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -0,0 +1,110 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim;
5using OpenSim.Servers;
6using OpenSim.GridInterfaces.Local;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types;
9using OpenSim.UserServer;
10using OpenSim.Framework.Console;
11using OpenSim.world;
12using OpenSim.Physics.Manager;
13using OpenSim.Assets;
14using libsecondlife;
15
16namespace SimpleApp
17{
18 class Program : IAssetReceiver, conscmd_callback
19 {
20 private ConsoleBase m_console;
21
22 private void Run()
23 {
24 m_console = new ConsoleBase(null, "SimpleApp", this, false);
25 MainConsole.Instance = m_console;
26
27 CheckSumServer checksumServer = new CheckSumServer(12036);
28 checksumServer.ServerListener();
29
30 string simAddr = "127.0.0.1";
31 int simPort = 9000;
32
33 LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );
34 loginServer.Startup();
35
36 AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal();
37 loginServer.SetSessionHandler(localSessions.AddNewSessionHandler );
38
39 InventoryCache inventoryCache = new InventoryCache();
40
41 LocalAssetServer assetServer = new LocalAssetServer();
42 assetServer.SetServerInfo("http://127.0.0.1:8003/", "");
43 assetServer.SetReceiver(this);
44
45 AssetCache assetCache = new AssetCache(assetServer);
46
47 UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, localSessions );
48 PacketServer packetServer = new PacketServer( udpServer, (uint) simPort );
49 udpServer.ServerListener();
50
51 ClientView.TerrainManager = new TerrainManager(new SecondLife());
52
53 RegionInfo regionInfo = new RegionInfo();
54
55 udpServer.LocalWorld = new MyWorld( regionInfo );
56
57 // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);
58 // PhysicsScene physicsScene = new NullPhysicsScene();
59 // world.PhysicsScene = physicsScene;
60 // udpServer.LocalWorld = world;
61
62 BaseHttpServer httpServer = new BaseHttpServer( simPort );
63 httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );
64 httpServer.Start();
65
66 m_console.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
67 m_console.ReadLine();
68 }
69
70 private void AddNewSessionHandler(Login loginData)
71 {
72 m_console.WriteLine( LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last );
73 }
74
75 #region IAssetReceiver Members
76
77 public void AssetReceived( AssetBase asset, bool IsTexture)
78 {
79 throw new Exception("The method or operation is not implemented.");
80 }
81
82 public void AssetNotFound( AssetBase asset)
83 {
84 throw new Exception("The method or operation is not implemented.");
85 }
86
87 #endregion
88
89 #region conscmd_callback Members
90
91 public void RunCmd(string cmd, string[] cmdparams)
92 {
93 throw new Exception("The method or operation is not implemented.");
94 }
95
96 public void Show(string ShowWhat)
97 {
98 throw new Exception("The method or operation is not implemented.");
99 }
100
101 #endregion
102
103 static void Main(string[] args)
104 {
105 Program app = new Program();
106
107 app.Run();
108 }
109 }
110}
diff --git a/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs b/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..0f9bf0f
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly.
8[assembly: AssemblyTitle("SimpleApp")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("Playahead AB")]
12[assembly: AssemblyProduct("SimpleApp")]
13[assembly: AssemblyCopyright("Copyright © Playahead AB 2007")]
14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")]
16
17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)]
21
22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("a5cfa45f-5acf-4b2e-9c50-1dd1fd7608ee")]
24
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32[assembly: AssemblyVersion("1.0.0.0")]
33[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Examples/SimpleApp/SimpleApp.csproj
new file mode 100644
index 0000000..51e14de
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp/SimpleApp.csproj
@@ -0,0 +1,86 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ProductVersion>8.0.50727</ProductVersion>
6 <SchemaVersion>2.0</SchemaVersion>
7 <ProjectGuid>{AD062D99-DD53-4D37-A4B8-2AF635377AEB}</ProjectGuid>
8 <OutputType>Exe</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder>
10 <RootNamespace>SimpleApp</RootNamespace>
11 <AssemblyName>SimpleApp</AssemblyName>
12 </PropertyGroup>
13 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14 <DebugSymbols>true</DebugSymbols>
15 <DebugType>full</DebugType>
16 <Optimize>false</Optimize>
17 <OutputPath>bin\Debug\</OutputPath>
18 <DefineConstants>DEBUG;TRACE</DefineConstants>
19 <ErrorReport>prompt</ErrorReport>
20 <WarningLevel>4</WarningLevel>
21 </PropertyGroup>
22 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
23 <DebugType>pdbonly</DebugType>
24 <Optimize>true</Optimize>
25 <OutputPath>bin\Release\</OutputPath>
26 <DefineConstants>TRACE</DefineConstants>
27 <ErrorReport>prompt</ErrorReport>
28 <WarningLevel>4</WarningLevel>
29 </PropertyGroup>
30 <ItemGroup>
31 <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
32 <SpecificVersion>False</SpecificVersion>
33 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
34 </Reference>
35 <Reference Include="System" />
36 <Reference Include="System.Data" />
37 <Reference Include="System.Xml" />
38 </ItemGroup>
39 <ItemGroup>
40 <Compile Include="MyWorld.cs" />
41 <Compile Include="Program.cs" />
42 <Compile Include="Properties\AssemblyInfo.cs" />
43 </ItemGroup>
44 <ItemGroup>
45 <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
46 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
47 <Name>OpenSim.Framework.Console</Name>
48 </ProjectReference>
49 <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
50 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
51 <Name>OpenSim.Framework</Name>
52 </ProjectReference>
53 <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
54 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
55 <Name>OpenSim.Servers</Name>
56 </ProjectReference>
57 <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj">
58 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
59 <Name>XMLRPC</Name>
60 </ProjectReference>
61 <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj">
62 <Project>{546099CD-0000-0000-0000-000000000000}</Project>
63 <Name>OpenSim.GridInterfaces.Local</Name>
64 </ProjectReference>
65 <ProjectReference Include="..\..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
66 <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
67 <Name>OpenSim.Physics.Manager</Name>
68 </ProjectReference>
69 <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
70 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
71 <Name>OpenSim.RegionServer</Name>
72 </ProjectReference>
73 <ProjectReference Include="..\..\OpenSim.World\OpenSim.World.csproj">
74 <Project>{642A14A8-0000-0000-0000-000000000000}</Project>
75 <Name>OpenSim.World</Name>
76 </ProjectReference>
77 </ItemGroup>
78 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
79 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
80 Other similar extension points exist, see Microsoft.Common.targets.
81 <Target Name="BeforeBuild">
82 </Target>
83 <Target Name="AfterBuild">
84 </Target>
85 -->
86</Project> \ No newline at end of file
diff --git a/OpenSim/Examples/SimpleApp2/MyClientView.cs b/OpenSim/Examples/SimpleApp2/MyClientView.cs
new file mode 100644
index 0000000..dd8869c
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/MyClientView.cs
@@ -0,0 +1,69 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim;
5using libsecondlife;
6using OpenSim.Framework.Interfaces;
7using System.Net;
8using libsecondlife.Packets;
9using OpenSim.Assets;
10using OpenSim.Framework.Types;
11using OpenSim.Framework;
12
13namespace SimpleApp2
14{
15 public class MyClientView : ClientView
16 {
17 private float[] m_map;
18 private Dictionary<uint, IClientAPI> m_clientAPIs;
19
20 public MyClientView(float[] map, Dictionary<uint, IClientAPI> clientAPIs, EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
21 : base(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions)
22 {
23 m_map = map;
24 m_clientAPIs = clientAPIs;
25
26 OnRegionHandShakeReply += RegionHandShakeReplyHandler;
27 OnChatFromViewer += ChatHandler;
28 OnRequestWearables += RequestWearablesHandler;
29 OnCompleteMovementToRegion += CompleteMovementToRegionHandler;
30 }
31
32 private void ChatHandler(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
33 {
34 // Echo it (so you know what you typed)
35 SendChatMessage(message, type, fromPos, fromName, fromAgentID);
36 SendChatMessage("Ready.", 1, fromPos, "System", LLUUID.Zero);
37 }
38
39 private void CompleteMovementToRegionHandler()
40 {
41 LLVector3 pos = new LLVector3(128, 128, 128);
42
43 MoveAgentIntoRegion(m_world.RegionInfo);
44
45 SendAvatarData( m_world.RegionInfo, FirstName,
46 LastName, AgentId, 0,
47 pos);
48
49 SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero);
50
51
52
53 // OpenSim.world.Primitive prim = new OpenSim.world.Primitive( m_clientAPIs, m_world.RegionInfo.RegionHandle, m_world, AgentId );
54
55 // SendNewPrim( prim );
56
57 }
58
59 private void RegionHandShakeReplyHandler(IClientAPI client)
60 {
61 client.SendLayerData(m_map);
62 }
63
64 private void RequestWearablesHandler(IClientAPI client)
65 {
66 SendWearables(AvatarWearable.DefaultWearables);
67 }
68 }
69}
diff --git a/OpenSim/Examples/SimpleApp2/MyPacketServer.cs b/OpenSim/Examples/SimpleApp2/MyPacketServer.cs
new file mode 100644
index 0000000..9c21016
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/MyPacketServer.cs
@@ -0,0 +1,30 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim;
5using OpenSim.Assets;
6using System.Net;
7using libsecondlife.Packets;
8using OpenSim.Framework.Interfaces;
9using OpenSim.Framework;
10
11namespace SimpleApp2
12{
13 public class MyPacketServer : PacketServer
14 {
15 private float[] m_map;
16
17 public MyPacketServer(float[] map, OpenSimNetworkHandler networkHandler, uint port ) : base( networkHandler, port )
18 {
19 m_map = map;
20 }
21
22 protected override ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
23 {
24 // (EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
25
26
27 return new MyClientView(m_map, ClientAPIs, remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions);
28 }
29 }
30}
diff --git a/OpenSim/Examples/SimpleApp2/Program.cs b/OpenSim/Examples/SimpleApp2/Program.cs
new file mode 100644
index 0000000..9b977f6
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/Program.cs
@@ -0,0 +1,160 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim;
5using OpenSim.Servers;
6using OpenSim.GridInterfaces.Local;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types;
9using OpenSim.UserServer;
10using OpenSim.Framework.Console;
11using OpenSim.world;
12using OpenSim.Physics.Manager;
13using OpenSim.Assets;
14using libsecondlife;
15
16namespace SimpleApp2
17{
18 class Program : IWorld, IAssetReceiver, conscmd_callback
19 {
20 private ConsoleBase m_console;
21 private RegionInfo m_regionInfo;
22 private float[] m_map;
23
24 private void Run()
25 {
26 m_console = new ConsoleBase(null, "SimpleApp", this, false);
27 MainConsole.Instance = m_console;
28
29 m_map = CreateMap();
30
31 CheckSumServer checksumServer = new CheckSumServer(12036);
32 checksumServer.ServerListener();
33
34 string simAddr = "127.0.0.1";
35 int simPort = 9000;
36
37 LoginServer loginServer = new LoginServer(simAddr, simPort, 0, 0, false);
38 loginServer.Startup();
39
40 AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal();
41 loginServer.SetSessionHandler(localSessions.AddNewSessionHandler);
42
43 InventoryCache inventoryCache = new InventoryCache();
44
45 LocalAssetServer assetServer = new LocalAssetServer();
46 assetServer.SetServerInfo("http://127.0.0.1:8003/", "");
47 assetServer.SetReceiver(this);
48
49 AssetCache assetCache = new AssetCache(assetServer);
50
51 UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, localSessions);
52 PacketServer packetServer = new MyPacketServer(m_map, udpServer, (uint) simPort );
53 udpServer.ServerListener();
54
55 ClientView.TerrainManager = new TerrainManager(new SecondLife());
56
57 m_regionInfo = new RegionInfo();
58
59 udpServer.LocalWorld = this;
60
61 // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);
62 // PhysicsScene physicsScene = new NullPhysicsScene();
63 // world.PhysicsScene = physicsScene;
64 // udpServer.LocalWorld = world;
65
66 BaseHttpServer httpServer = new BaseHttpServer(simPort);
67 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
68 httpServer.Start();
69
70 m_console.WriteLine(LogPriority.NORMAL, "Press enter to quit.");
71 m_console.ReadLine();
72 }
73
74 private float[] CreateMap()
75 {
76 float[] map = new float[65536];
77
78 for (int i = 0; i < 65536; i++)
79 {
80 int x = i % 256;
81 int y = i / 256;
82
83 map[i] = (float)(x + y / 2);
84 }
85
86 return map;
87 }
88
89 private void AddNewSessionHandler(Login loginData)
90 {
91 m_console.WriteLine(LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last);
92 }
93
94 static void Main(string[] args)
95 {
96 Program app = new Program();
97
98 app.Run();
99 }
100
101 #region IWorld Members
102
103 void IWorld.AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)
104 {
105 remoteClient.SendRegionHandshake(m_regionInfo);
106 }
107
108 void IWorld.RemoveAvatar(LLUUID agentID)
109 {
110 throw new Exception("The method or operation is not implemented.");
111 }
112
113 RegionInfo IWorld.RegionInfo
114 {
115 get { return m_regionInfo; }
116 }
117
118 object IWorld.SyncRoot
119 {
120 get { return this; }
121 }
122
123 private uint m_nextLocalId = 1;
124
125 uint IWorld.NextLocalId
126 {
127 get { return m_nextLocalId++; }
128 }
129
130 #endregion
131
132 #region IAssetReceiver Members
133
134 public void AssetReceived(AssetBase asset, bool IsTexture)
135 {
136 throw new Exception("The method or operation is not implemented.");
137 }
138
139 public void AssetNotFound(AssetBase asset)
140 {
141 throw new Exception("The method or operation is not implemented.");
142 }
143
144 #endregion
145
146 #region conscmd_callback Members
147
148 public void RunCmd(string cmd, string[] cmdparams)
149 {
150 throw new Exception("The method or operation is not implemented.");
151 }
152
153 public void Show(string ShowWhat)
154 {
155 throw new Exception("The method or operation is not implemented.");
156 }
157
158 #endregion
159 }
160}
diff --git a/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs b/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..f7d6aae
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly.
8[assembly: AssemblyTitle("SimpleApp2")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("Playahead AB")]
12[assembly: AssemblyProduct("SimpleApp2")]
13[assembly: AssemblyCopyright("Copyright © Playahead AB 2007")]
14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")]
16
17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)]
21
22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("bdda0707-02b4-46ca-87ce-ab3c12558a4a")]
24
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32[assembly: AssemblyVersion("1.0.0.0")]
33[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
new file mode 100644
index 0000000..92664e3
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
@@ -0,0 +1,87 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ProductVersion>8.0.50727</ProductVersion>
6 <SchemaVersion>2.0</SchemaVersion>
7 <ProjectGuid>{C84B2171-D386-4377-B490-9C5A56674B9E}</ProjectGuid>
8 <OutputType>Exe</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder>
10 <RootNamespace>SimpleApp2</RootNamespace>
11 <AssemblyName>SimpleApp2</AssemblyName>
12 </PropertyGroup>
13 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14 <DebugSymbols>true</DebugSymbols>
15 <DebugType>full</DebugType>
16 <Optimize>false</Optimize>
17 <OutputPath>bin\Debug\</OutputPath>
18 <DefineConstants>DEBUG;TRACE</DefineConstants>
19 <ErrorReport>prompt</ErrorReport>
20 <WarningLevel>4</WarningLevel>
21 </PropertyGroup>
22 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
23 <DebugType>pdbonly</DebugType>
24 <Optimize>true</Optimize>
25 <OutputPath>bin\Release\</OutputPath>
26 <DefineConstants>TRACE</DefineConstants>
27 <ErrorReport>prompt</ErrorReport>
28 <WarningLevel>4</WarningLevel>
29 </PropertyGroup>
30 <ItemGroup>
31 <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
32 <SpecificVersion>False</SpecificVersion>
33 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
34 </Reference>
35 <Reference Include="System" />
36 <Reference Include="System.Data" />
37 <Reference Include="System.Xml" />
38 </ItemGroup>
39 <ItemGroup>
40 <Compile Include="MyClientView.cs" />
41 <Compile Include="MyPacketServer.cs" />
42 <Compile Include="Program.cs" />
43 <Compile Include="Properties\AssemblyInfo.cs" />
44 </ItemGroup>
45 <ItemGroup>
46 <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
47 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
48 <Name>OpenSim.Framework.Console</Name>
49 </ProjectReference>
50 <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
51 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
52 <Name>OpenSim.Framework</Name>
53 </ProjectReference>
54 <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
55 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
56 <Name>OpenSim.Servers</Name>
57 </ProjectReference>
58 <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj">
59 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
60 <Name>XMLRPC</Name>
61 </ProjectReference>
62 <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj">
63 <Project>{546099CD-0000-0000-0000-000000000000}</Project>
64 <Name>OpenSim.GridInterfaces.Local</Name>
65 </ProjectReference>
66 <ProjectReference Include="..\..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
67 <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
68 <Name>OpenSim.Physics.Manager</Name>
69 </ProjectReference>
70 <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
71 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
72 <Name>OpenSim.RegionServer</Name>
73 </ProjectReference>
74 <ProjectReference Include="..\..\OpenSim.World\OpenSim.World.csproj">
75 <Project>{642A14A8-0000-0000-0000-000000000000}</Project>
76 <Name>OpenSim.World</Name>
77 </ProjectReference>
78 </ItemGroup>
79 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
80 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
81 Other similar extension points exist, see Microsoft.Common.targets.
82 <Target Name="BeforeBuild">
83 </Target>
84 <Target Name="AfterBuild">
85 </Target>
86 -->
87</Project> \ No newline at end of file
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index 91772f8..4db7ccb 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
@@ -13,7 +13,13 @@ namespace OpenSim
13 { 13 {
14 14
15 } 15 }
16 16
17 public bool AddNewSessionHandler(ulong regionHandle, Login loginData)
18 {
19 AddNewSession( loginData );
20 return true;
21 }
22
17 public void AddNewSession(Login loginData) 23 public void AddNewSession(Login loginData)
18 { 24 {
19 AgentCircuitData agent = new AgentCircuitData(); 25 AgentCircuitData agent = new AgentCircuitData();
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index 9e0cd48..37e27f8 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -153,6 +153,11 @@ namespace OpenSim
153 OutPacket(mov); 153 OutPacket(mov);
154 } 154 }
155 155
156 public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
157 {
158 SendChatMessage( Helpers.StringToField( message ), type, fromPos, fromName, fromAgentID);
159 }
160
156 /// <summary> 161 /// <summary>
157 /// 162 ///
158 /// </summary> 163 /// </summary>
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index d970162..f9a7fe4 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -70,7 +70,7 @@ namespace OpenSim
70 private AgentAssetUpload UploadAssets; 70 private AgentAssetUpload UploadAssets;
71 private LLUUID newAssetFolder = LLUUID.Zero; 71 private LLUUID newAssetFolder = LLUUID.Zero;
72 private bool debug = false; 72 private bool debug = false;
73 private IWorld m_world; 73 protected IWorld m_world;
74 private Dictionary<uint, ClientView> m_clientThreads; 74 private Dictionary<uint, ClientView> m_clientThreads;
75 private AssetCache m_assetCache; 75 private AssetCache m_assetCache;
76 private IGridServer m_gridServer; 76 private IGridServer m_gridServer;
@@ -78,11 +78,9 @@ namespace OpenSim
78 private int cachedtextureserial = 0; 78 private int cachedtextureserial = 0;
79 private RegionInfo m_regionData; 79 private RegionInfo m_regionData;
80 protected AuthenticateSessionsBase m_authenticateSessionsHandler; 80 protected AuthenticateSessionsBase m_authenticateSessionsHandler;
81 protected uint serverPort = 0;
82 81
83 public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions, uint port) 82 public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
84 { 83 {
85 this.serverPort = port;
86 m_world = world; 84 m_world = world;
87 m_clientThreads = clientThreads; 85 m_clientThreads = clientThreads;
88 m_assetCache = assetCache; 86 m_assetCache = assetCache;
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 2fc6516..990b5c3 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,10 +124,7 @@
124 </ProjectReference> 124 </ProjectReference>
125 </ItemGroup> 125 </ItemGroup>
126 <ItemGroup> 126 <ItemGroup>
127 <Compile Include="NetworkServersInfo.cs"> 127 <Compile Include="AgentAssetUpload.cs">
128 <SubType>Code</SubType>
129 </Compile>
130 <Compile Include="UDPServer.cs">
131 <SubType>Code</SubType> 128 <SubType>Code</SubType>
132 </Compile> 129 </Compile>
133 <Compile Include="AuthenticateSessionsLocal.cs"> 130 <Compile Include="AuthenticateSessionsLocal.cs">
@@ -136,52 +133,55 @@
136 <Compile Include="AuthenticateSessionsRemote.cs"> 133 <Compile Include="AuthenticateSessionsRemote.cs">
137 <SubType>Code</SubType> 134 <SubType>Code</SubType>
138 </Compile> 135 </Compile>
139 <Compile Include="OpenSimNetworkHandler.cs"> 136 <Compile Include="ClientView.API.cs">
140 <SubType>Code</SubType> 137 <SubType>Code</SubType>
141 </Compile> 138 </Compile>
142 <Compile Include="UserConfigUtility.cs"> 139 <Compile Include="ClientView.cs">
143 <SubType>Code</SubType> 140 <SubType>Code</SubType>
144 </Compile> 141 </Compile>
145 <Compile Include="ClientView.Grid.cs"> 142 <Compile Include="ClientView.Grid.cs">
146 <SubType>Code</SubType> 143 <SubType>Code</SubType>
147 </Compile> 144 </Compile>
148 <Compile Include="PacketServer.cs"> 145 <Compile Include="ClientView.PacketHandlers.cs">
149 <SubType>Code</SubType> 146 <SubType>Code</SubType>
150 </Compile> 147 </Compile>
151 <Compile Include="ClientView.PacketHandlers.cs"> 148 <Compile Include="ClientView.ProcessPackets.cs">
152 <SubType>Code</SubType> 149 <SubType>Code</SubType>
153 </Compile> 150 </Compile>
154 <Compile Include="VersionInfo.cs"> 151 <Compile Include="ClientViewBase.cs">
155 <SubType>Code</SubType> 152 <SubType>Code</SubType>
156 </Compile> 153 </Compile>
157 <Compile Include="AgentAssetUpload.cs"> 154 <Compile Include="CommsManager.cs">
158 <SubType>Code</SubType> 155 <SubType>Code</SubType>
159 </Compile> 156 </Compile>
160 <Compile Include="ClientViewBase.cs"> 157 <Compile Include="NetworkServersInfo.cs">
161 <SubType>Code</SubType> 158 <SubType>Code</SubType>
162 </Compile> 159 </Compile>
163 <Compile Include="RegionServerBase.cs"> 160 <Compile Include="OpenSimNetworkHandler.cs">
164 <SubType>Code</SubType> 161 <SubType>Code</SubType>
165 </Compile> 162 </Compile>
166 <Compile Include="CommsManager.cs"> 163 <Compile Include="PacketServer.cs">
167 <SubType>Code</SubType> 164 <SubType>Code</SubType>
168 </Compile> 165 </Compile>
169 <Compile Include="ClientView.cs"> 166 <Compile Include="RegionServerBase.cs">
170 <SubType>Code</SubType> 167 <SubType>Code</SubType>
171 </Compile> 168 </Compile>
172 <Compile Include="ClientView.API.cs"> 169 <Compile Include="UDPServer.cs">
173 <SubType>Code</SubType> 170 <SubType>Code</SubType>
174 </Compile> 171 </Compile>
175 <Compile Include="ClientView.ProcessPackets.cs"> 172 <Compile Include="UserConfigUtility.cs">
176 <SubType>Code</SubType> 173 <SubType>Code</SubType>
177 </Compile> 174 </Compile>
178 <Compile Include="CAPS\AdminWebFront.cs"> 175 <Compile Include="VersionInfo.cs">
176 <SubType>Code</SubType>
177 </Compile>
178 <Compile Include="Assets\AssetCache.cs">
179 <SubType>Code</SubType> 179 <SubType>Code</SubType>
180 </Compile> 180 </Compile>
181 <Compile Include="Assets\InventoryCache.cs"> 181 <Compile Include="Assets\InventoryCache.cs">
182 <SubType>Code</SubType> 182 <SubType>Code</SubType>
183 </Compile> 183 </Compile>
184 <Compile Include="Assets\AssetCache.cs"> 184 <Compile Include="CAPS\AdminWebFront.cs">
185 <SubType>Code</SubType> 185 <SubType>Code</SubType>
186 </Compile> 186 </Compile>
187 </ItemGroup> 187 </ItemGroup>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index c988025..8384407 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,26 +11,26 @@
11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="NetworkServersInfo.cs" /> 14 <include name="AgentAssetUpload.cs" />
15 <include name="UDPServer.cs" />
16 <include name="AuthenticateSessionsLocal.cs" /> 15 <include name="AuthenticateSessionsLocal.cs" />
17 <include name="AuthenticateSessionsRemote.cs" /> 16 <include name="AuthenticateSessionsRemote.cs" />
18 <include name="OpenSimNetworkHandler.cs" /> 17 <include name="ClientView.API.cs" />
19 <include name="UserConfigUtility.cs" /> 18 <include name="ClientView.cs" />
20 <include name="ClientView.Grid.cs" /> 19 <include name="ClientView.Grid.cs" />
21 <include name="PacketServer.cs" />
22 <include name="ClientView.PacketHandlers.cs" /> 20 <include name="ClientView.PacketHandlers.cs" />
23 <include name="VersionInfo.cs" /> 21 <include name="ClientView.ProcessPackets.cs" />
24 <include name="AgentAssetUpload.cs" />
25 <include name="ClientViewBase.cs" /> 22 <include name="ClientViewBase.cs" />
26 <include name="RegionServerBase.cs" />
27 <include name="CommsManager.cs" /> 23 <include name="CommsManager.cs" />
28 <include name="ClientView.cs" /> 24 <include name="NetworkServersInfo.cs" />
29 <include name="ClientView.API.cs" /> 25 <include name="OpenSimNetworkHandler.cs" />
30 <include name="ClientView.ProcessPackets.cs" /> 26 <include name="PacketServer.cs" />
31 <include name="CAPS/AdminWebFront.cs" /> 27 <include name="RegionServerBase.cs" />
32 <include name="Assets/InventoryCache.cs" /> 28 <include name="UDPServer.cs" />
29 <include name="UserConfigUtility.cs" />
30 <include name="VersionInfo.cs" />
33 <include name="Assets/AssetCache.cs" /> 31 <include name="Assets/AssetCache.cs" />
32 <include name="Assets/InventoryCache.cs" />
33 <include name="CAPS/AdminWebFront.cs" />
34 </sources> 34 </sources>
35 <references basedir="${project::get-base-directory()}"> 35 <references basedir="${project::get-base-directory()}">
36 <lib> 36 <lib>
diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs
index ab77b5d..f1ca881 100644
--- a/OpenSim/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim/OpenSim.RegionServer/PacketServer.cs
@@ -66,9 +66,17 @@ namespace OpenSim
66 66
67 } 67 }
68 68
69 protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
70 {
71 return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions );
72 }
73
69 public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass) 74 public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass)
70 { 75 {
71 ClientView newuser = new ClientView(epSender, useCircuit, this.ClientThreads, this._localWorld, assetCache, this, inventoryCache, authenticateSessionsClass, serverPort); 76 ClientView newuser =
77 CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache,
78 authenticateSessionsClass);
79
72 this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); 80 this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
73 this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser); 81 this.ClientAPIs.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);
74 82
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index 6ffcf9e..bd1a332 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -76,64 +76,64 @@
76 </ProjectReference> 76 </ProjectReference>
77 </ItemGroup> 77 </ItemGroup>
78 <ItemGroup> 78 <ItemGroup>
79 <Compile Include="MainMemory.cs"> 79 <Compile Include="ClassInstance.cs">
80 <SubType>Code</SubType>
81 </Compile>
82 <Compile Include="ClassRecord.cs">
80 <SubType>Code</SubType> 83 <SubType>Code</SubType>
81 </Compile> 84 </Compile>
82 <Compile Include="Heap.cs"> 85 <Compile Include="Heap.cs">
83 <SubType>Code</SubType> 86 <SubType>Code</SubType>
84 </Compile> 87 </Compile>
85 <Compile Include="StackFrame.cs"> 88 <Compile Include="Interpreter.cs">
86 <SubType>Code</SubType> 89 <SubType>Code</SubType>
87 </Compile> 90 </Compile>
88 <Compile Include="InterpreterLogic.cs"> 91 <Compile Include="InterpreterLogic.cs">
89 <SubType>Code</SubType> 92 <SubType>Code</SubType>
90 </Compile> 93 </Compile>
91 <Compile Include="OpenSimJVM.cs"> 94 <Compile Include="InterpreterMethods.cs">
92 <SubType>Code</SubType> 95 <SubType>Code</SubType>
93 </Compile> 96 </Compile>
94 <Compile Include="InterpreterMethods.cs"> 97 <Compile Include="InterpreterReturn.cs">
95 <SubType>Code</SubType> 98 <SubType>Code</SubType>
96 </Compile> 99 </Compile>
97 <Compile Include="ClassInstance.cs"> 100 <Compile Include="MainMemory.cs">
98 <SubType>Code</SubType> 101 <SubType>Code</SubType>
99 </Compile> 102 </Compile>
100 <Compile Include="InterpreterReturn.cs"> 103 <Compile Include="MethodMemory.cs">
101 <SubType>Code</SubType> 104 <SubType>Code</SubType>
102 </Compile> 105 </Compile>
103 <Compile Include="Interpreter.cs"> 106 <Compile Include="Object.cs">
104 <SubType>Code</SubType> 107 <SubType>Code</SubType>
105 </Compile> 108 </Compile>
106 <Compile Include="ClassRecord.cs"> 109 <Compile Include="OpenSimJVM.cs">
107 <SubType>Code</SubType> 110 <SubType>Code</SubType>
108 </Compile> 111 </Compile>
109 <Compile Include="Stack.cs"> 112 <Compile Include="Stack.cs">
110 <SubType>Code</SubType> 113 <SubType>Code</SubType>
111 </Compile> 114 </Compile>
112 <Compile Include="Object.cs"> 115 <Compile Include="StackFrame.cs">
113 <SubType>Code</SubType> 116 <SubType>Code</SubType>
114 </Compile> 117 </Compile>
115 <Compile Include="Thread.cs"> 118 <Compile Include="Thread.cs">
116 <SubType>Code</SubType> 119 <SubType>Code</SubType>
117 </Compile> 120 </Compile>
118 <Compile Include="MethodMemory.cs">
119 <SubType>Code</SubType>
120 </Compile>
121 <Compile Include="Properties\AssemblyInfo.cs"> 121 <Compile Include="Properties\AssemblyInfo.cs">
122 <SubType>Code</SubType> 122 <SubType>Code</SubType>
123 </Compile> 123 </Compile>
124 <Compile Include="Types\BaseType.cs"> 124 <Compile Include="Types\ArrayReference.cs">
125 <SubType>Code</SubType> 125 <SubType>Code</SubType>
126 </Compile> 126 </Compile>
127 <Compile Include="Types\ArrayReference.cs"> 127 <Compile Include="Types\BaseType.cs">
128 <SubType>Code</SubType> 128 <SubType>Code</SubType>
129 </Compile> 129 </Compile>
130 <Compile Include="Types\ObjectReference.cs"> 130 <Compile Include="Types\ObjectReference.cs">
131 <SubType>Code</SubType> 131 <SubType>Code</SubType>
132 </Compile> 132 </Compile>
133 <Compile Include="Types\PrimitiveTypes\Char.cs"> 133 <Compile Include="Types\PrimitiveTypes\Byte.cs">
134 <SubType>Code</SubType> 134 <SubType>Code</SubType>
135 </Compile> 135 </Compile>
136 <Compile Include="Types\PrimitiveTypes\Byte.cs"> 136 <Compile Include="Types\PrimitiveTypes\Char.cs">
137 <SubType>Code</SubType> 137 <SubType>Code</SubType>
138 </Compile> 138 </Compile>
139 <Compile Include="Types\PrimitiveTypes\Float.cs"> 139 <Compile Include="Types\PrimitiveTypes\Float.cs">
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index ac4d564..c5255db 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -11,26 +11,26 @@
11 <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" > 11 <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="MainMemory.cs" /> 14 <include name="ClassInstance.cs" />
15 <include name="ClassRecord.cs" />
15 <include name="Heap.cs" /> 16 <include name="Heap.cs" />
16 <include name="StackFrame.cs" /> 17 <include name="Interpreter.cs" />
17 <include name="InterpreterLogic.cs" /> 18 <include name="InterpreterLogic.cs" />
18 <include name="OpenSimJVM.cs" />
19 <include name="InterpreterMethods.cs" /> 19 <include name="InterpreterMethods.cs" />
20 <include name="ClassInstance.cs" />
21 <include name="InterpreterReturn.cs" /> 20 <include name="InterpreterReturn.cs" />
22 <include name="Interpreter.cs" /> 21 <include name="MainMemory.cs" />
23 <include name="ClassRecord.cs" /> 22 <include name="MethodMemory.cs" />
24 <include name="Stack.cs" />
25 <include name="Object.cs" /> 23 <include name="Object.cs" />
24 <include name="OpenSimJVM.cs" />
25 <include name="Stack.cs" />
26 <include name="StackFrame.cs" />
26 <include name="Thread.cs" /> 27 <include name="Thread.cs" />
27 <include name="MethodMemory.cs" />
28 <include name="Properties/AssemblyInfo.cs" /> 28 <include name="Properties/AssemblyInfo.cs" />
29 <include name="Types/BaseType.cs" />
30 <include name="Types/ArrayReference.cs" /> 29 <include name="Types/ArrayReference.cs" />
30 <include name="Types/BaseType.cs" />
31 <include name="Types/ObjectReference.cs" /> 31 <include name="Types/ObjectReference.cs" />
32 <include name="Types/PrimitiveTypes/Char.cs" />
33 <include name="Types/PrimitiveTypes/Byte.cs" /> 32 <include name="Types/PrimitiveTypes/Byte.cs" />
33 <include name="Types/PrimitiveTypes/Char.cs" />
34 <include name="Types/PrimitiveTypes/Float.cs" /> 34 <include name="Types/PrimitiveTypes/Float.cs" />
35 <include name="Types/PrimitiveTypes/Int.cs" /> 35 <include name="Types/PrimitiveTypes/Int.cs" />
36 </sources> 36 </sources>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index af8285b..15ae5bf 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -93,6 +93,9 @@
93 <Compile Include="AssemblyInfo.cs"> 93 <Compile Include="AssemblyInfo.cs">
94 <SubType>Code</SubType> 94 <SubType>Code</SubType>
95 </Compile> 95 </Compile>
96 <Compile Include="Db4LocalStorage.cs">
97 <SubType>Code</SubType>
98 </Compile>
96 <Compile Include="MapStorage.cs"> 99 <Compile Include="MapStorage.cs">
97 <SubType>Code</SubType> 100 <SubType>Code</SubType>
98 </Compile> 101 </Compile>
@@ -102,9 +105,6 @@
102 <Compile Include="UUIDPrimQuery.cs"> 105 <Compile Include="UUIDPrimQuery.cs">
103 <SubType>Code</SubType> 106 <SubType>Code</SubType>
104 </Compile> 107 </Compile>
105 <Compile Include="Db4LocalStorage.cs">
106 <SubType>Code</SubType>
107 </Compile>
108 </ItemGroup> 108 </ItemGroup>
109 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 109 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
110 <PropertyGroup> 110 <PropertyGroup>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 72aac2a..c2fd2bd 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
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="Db4LocalStorage.cs" />
15 <include name="MapStorage.cs" /> 16 <include name="MapStorage.cs" />
16 <include name="UUIDParcelQuery.cs" /> 17 <include name="UUIDParcelQuery.cs" />
17 <include name="UUIDPrimQuery.cs" /> 18 <include name="UUIDPrimQuery.cs" />
18 <include name="Db4LocalStorage.cs" />
19 </sources> 19 </sources>
20 <references basedir="${project::get-base-directory()}"> 20 <references basedir="${project::get-base-directory()}">
21 <lib> 21 <lib>
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index c251d57..4ab576c 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -55,21 +55,16 @@ namespace OpenSim.world
55 ControllingClient = theClient; 55 ControllingClient = theClient;
56 this.firstname = ControllingClient.FirstName; 56 this.firstname = ControllingClient.FirstName;
57 this.lastname = ControllingClient.LastName; 57 this.lastname = ControllingClient.LastName;
58 localid = 8880000 + (this.m_world._localNumber++); 58 localid = this.m_world.NextLocalId;
59 Pos = ControllingClient.StartPos; 59 Pos = ControllingClient.StartPos;
60 visualParams = new byte[218]; 60 visualParams = new byte[218];
61 for (int i = 0; i < 218; i++) 61 for (int i = 0; i < 218; i++)
62 { 62 {
63 visualParams[i] = 100; 63 visualParams[i] = 100;
64 } 64 }
65 Wearables = new AvatarWearable[13]; //should be 13 of these
66 for (int i = 0; i < 13; i++)
67 {
68 Wearables[i] = new AvatarWearable();
69 }
70 this.Wearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
71 this.Wearables[0].ItemID = LLUUID.Random();
72 65
66 Wearables = AvatarWearable.DefaultWearables;
67
73 this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); 68 this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
74 Console.WriteLine("avatar point 4"); 69 Console.WriteLine("avatar point 4");
75 70
diff --git a/OpenSim/OpenSim.World/Entity.cs b/OpenSim/OpenSim.World/Entity.cs
index b14beed..dd5f9a6 100644
--- a/OpenSim/OpenSim.World/Entity.cs
+++ b/OpenSim/OpenSim.World/Entity.cs
@@ -51,7 +51,7 @@ namespace OpenSim.world
51 { 51 {
52 try 52 try
53 { 53 {
54 lock (this.m_world.LockPhysicsEngine) 54 lock (this.m_world.SyncRoot)
55 { 55 {
56 56
57 this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z); 57 this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj
index f2fb596..46803d6 100644
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj
+++ b/OpenSim/OpenSim.World/OpenSim.World.csproj
@@ -130,58 +130,58 @@
130 </ProjectReference> 130 </ProjectReference>
131 </ItemGroup> 131 </ItemGroup>
132 <ItemGroup> 132 <ItemGroup>
133 <Compile Include="Entity.cs"> 133 <Compile Include="Avatar.Client.cs">
134 <SubType>Code</SubType> 134 <SubType>Code</SubType>
135 </Compile> 135 </Compile>
136 <Compile Include="World.PacketHandlers.cs"> 136 <Compile Include="Avatar.cs">
137 <SubType>Code</SubType> 137 <SubType>Code</SubType>
138 </Compile> 138 </Compile>
139 <Compile Include="WorldBase.cs"> 139 <Compile Include="Avatar.Update.cs">
140 <SubType>Code</SubType> 140 <SubType>Code</SubType>
141 </Compile> 141 </Compile>
142 <Compile Include="SceneObject.cs"> 142 <Compile Include="AvatarAnimations.cs">
143 <SubType>Code</SubType> 143 <SubType>Code</SubType>
144 </Compile> 144 </Compile>
145 <Compile Include="World.Scripting.cs"> 145 <Compile Include="Entity.cs">
146 <SubType>Code</SubType> 146 <SubType>Code</SubType>
147 </Compile> 147 </Compile>
148 <Compile Include="Avatar.Client.cs"> 148 <Compile Include="ParcelManager.cs">
149 <SubType>Code</SubType> 149 <SubType>Code</SubType>
150 </Compile> 150 </Compile>
151 <Compile Include="Avatar.Update.cs"> 151 <Compile Include="Primitive.cs">
152 <SubType>Code</SubType> 152 <SubType>Code</SubType>
153 </Compile> 153 </Compile>
154 <Compile Include="AvatarAnimations.cs"> 154 <Compile Include="SceneObject.cs">
155 <SubType>Code</SubType> 155 <SubType>Code</SubType>
156 </Compile> 156 </Compile>
157 <Compile Include="Primitive.cs"> 157 <Compile Include="World.cs">
158 <SubType>Code</SubType> 158 <SubType>Code</SubType>
159 </Compile> 159 </Compile>
160 <Compile Include="Avatar.cs"> 160 <Compile Include="World.PacketHandlers.cs">
161 <SubType>Code</SubType> 161 <SubType>Code</SubType>
162 </Compile> 162 </Compile>
163 <Compile Include="ParcelManager.cs"> 163 <Compile Include="World.Scripting.cs">
164 <SubType>Code</SubType> 164 <SubType>Code</SubType>
165 </Compile> 165 </Compile>
166 <Compile Include="World.cs"> 166 <Compile Include="WorldBase.cs">
167 <SubType>Code</SubType> 167 <SubType>Code</SubType>
168 </Compile> 168 </Compile>
169 <Compile Include="Estate\EstateManager.cs"> 169 <Compile Include="Estate\EstateManager.cs">
170 <SubType>Code</SubType> 170 <SubType>Code</SubType>
171 </Compile> 171 </Compile>
172 <Compile Include="scripting\IScriptHandler.cs"> 172 <Compile Include="scripting\IScriptContext.cs">
173 <SubType>Code</SubType> 173 <SubType>Code</SubType>
174 </Compile> 174 </Compile>
175 <Compile Include="scripting\ScriptFactory.cs"> 175 <Compile Include="scripting\IScriptEntity.cs">
176 <SubType>Code</SubType> 176 <SubType>Code</SubType>
177 </Compile> 177 </Compile>
178 <Compile Include="scripting\IScriptContext.cs"> 178 <Compile Include="scripting\IScriptHandler.cs">
179 <SubType>Code</SubType> 179 <SubType>Code</SubType>
180 </Compile> 180 </Compile>
181 <Compile Include="scripting\Script.cs"> 181 <Compile Include="scripting\Script.cs">
182 <SubType>Code</SubType> 182 <SubType>Code</SubType>
183 </Compile> 183 </Compile>
184 <Compile Include="scripting\IScriptEntity.cs"> 184 <Compile Include="scripting\ScriptFactory.cs">
185 <SubType>Code</SubType> 185 <SubType>Code</SubType>
186 </Compile> 186 </Compile>
187 <Compile Include="scripting\Scripts\FollowRandomAvatar.cs"> 187 <Compile Include="scripting\Scripts\FollowRandomAvatar.cs">
diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj.user b/OpenSim/OpenSim.World/OpenSim.World.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim/OpenSim.World/OpenSim.World.dll.build b/OpenSim/OpenSim.World/OpenSim.World.dll.build
new file mode 100644
index 0000000..3fa534e
--- /dev/null
+++ b/OpenSim/OpenSim.World/OpenSim.World.dll.build
@@ -0,0 +1,71 @@
1<?xml version="1.0" ?>
2<project name="OpenSim.World" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
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">
11 <resources prefix="OpenSim.World" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="Avatar.Client.cs" />
15 <include name="Avatar.cs" />
16 <include name="Avatar.Update.cs" />
17 <include name="AvatarAnimations.cs" />
18 <include name="Entity.cs" />
19 <include name="ParcelManager.cs" />
20 <include name="Primitive.cs" />
21 <include name="SceneObject.cs" />
22 <include name="World.cs" />
23 <include name="World.PacketHandlers.cs" />
24 <include name="World.Scripting.cs" />
25 <include name="WorldBase.cs" />
26 <include name="Estate/EstateManager.cs" />
27 <include name="scripting/IScriptContext.cs" />
28 <include name="scripting/IScriptEntity.cs" />
29 <include name="scripting/IScriptHandler.cs" />
30 <include name="scripting/Script.cs" />
31 <include name="scripting/ScriptFactory.cs" />
32 <include name="scripting/Scripts/FollowRandomAvatar.cs" />
33 <include name="types/Mesh.cs" />
34 <include name="types/Triangle.cs" />
35 </sources>
36 <references basedir="${project::get-base-directory()}">
37 <lib>
38 <include name="${project::get-base-directory()}" />
39 <include name="${project::get-base-directory()}/${build.dir}" />
40 </lib>
41 <include name="System.dll" />
42 <include name="System.Xml.dll" />
43 <include name="../../bin/libsecondlife.dll" />
44 <include name="../../bin/Axiom.MathLib.dll" />
45 <include name="../../bin/Db4objects.Db4o.dll" />
46 <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
47 <include name="../../bin/OpenSim.Framework.dll" />
48 <include name="../../bin/OpenSim.Framework.Console.dll" />
49 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
50 <include name="../../bin/OpenSim.Physics.Manager.dll" />
51 <include name="../../bin/OpenSim.Servers.dll" />
52 <include name="../../bin/XMLRPC.dll" />
53 <include name="../../bin/OpenGrid.Framework.Communications.dll" />
54 </references>
55 </csc>
56 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
57 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
58 <copy todir="${project::get-base-directory()}/../../bin/">
59 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
60 <include name="*.dll"/>
61 <include name="*.exe"/>
62 </fileset>
63 </copy>
64 </target>
65 <target name="clean">
66 <delete dir="${bin.dir}" failonerror="false" />
67 <delete dir="${obj.dir}" failonerror="false" />
68 </target>
69 <target name="doc" description="Creates documentation.">
70 </target>
71</project>
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 011e39a..7ef06e2 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -23,10 +23,8 @@ namespace OpenSim.world
23 public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI 23 public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI
24 { 24 {
25 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer(); 25 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
26 public object LockPhysicsEngine = new object();
27 protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars; 26 protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
28 protected Dictionary<libsecondlife.LLUUID, Primitive> Prims; 27 protected Dictionary<libsecondlife.LLUUID, Primitive> Prims;
29 public uint _localNumber = 0;
30 private PhysicsScene phyScene; 28 private PhysicsScene phyScene;
31 private float timeStep = 0.1f; 29 private float timeStep = 0.1f;
32 public ILocalStorage localStorage; 30 public ILocalStorage localStorage;
@@ -59,6 +57,7 @@ namespace OpenSim.world
59 return (this.phyScene); 57 return (this.phyScene);
60 } 58 }
61 } 59 }
60
62 #endregion 61 #endregion
63 62
64 #region Constructors 63 #region Constructors
@@ -155,7 +154,7 @@ namespace OpenSim.world
155 Entities[UUID].addForces(); 154 Entities[UUID].addForces();
156 } 155 }
157 156
158 lock (this.LockPhysicsEngine) 157 lock (this.m_syncRoot)
159 { 158 {
160 this.phyScene.Simulate(timeStep); 159 this.phyScene.Simulate(timeStep);
161 } 160 }
@@ -203,7 +202,7 @@ namespace OpenSim.world
203 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving."); 202 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");
204 localStorage.SaveMap(Terrain.getHeights1D()); 203 localStorage.SaveMap(Terrain.getHeights1D());
205 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics."); 204 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");
206 lock (this.LockPhysicsEngine) 205 lock (this.m_syncRoot)
207 { 206 {
208 phyScene.SetTerrain(Terrain.getHeights1D()); 207 phyScene.SetTerrain(Terrain.getHeights1D());
209 } 208 }
@@ -297,7 +296,7 @@ namespace OpenSim.world
297 { 296 {
298 Terrain.hills(); 297 Terrain.hills();
299 298
300 lock (this.LockPhysicsEngine) 299 lock (this.m_syncRoot)
301 { 300 {
302 this.phyScene.SetTerrain(Terrain.getHeights1D()); 301 this.phyScene.SetTerrain(Terrain.getHeights1D());
303 } 302 }
@@ -328,7 +327,7 @@ namespace OpenSim.world
328 try 327 try
329 { 328 {
330 this.Terrain.setHeights2D(newMap); 329 this.Terrain.setHeights2D(newMap);
331 lock (this.LockPhysicsEngine) 330 lock (this.m_syncRoot)
332 { 331 {
333 this.phyScene.SetTerrain(this.Terrain.getHeights1D()); 332 this.phyScene.SetTerrain(this.Terrain.getHeights1D());
334 } 333 }
@@ -483,7 +482,7 @@ namespace OpenSim.world
483 this.estateManager.sendRegionHandshake(remoteClient); 482 this.estateManager.sendRegionHandshake(remoteClient);
484 483
485 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); 484 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
486 lock (this.LockPhysicsEngine) 485 lock (this.m_syncRoot)
487 { 486 {
488 newAvatar.PhysActor = this.phyScene.AddAvatar(pVec); 487 newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
489 } 488 }
@@ -612,5 +611,10 @@ namespace OpenSim.world
612 } 611 }
613 612
614 #endregion 613 #endregion
614
615 public override void SendLayerData(int px, int py, IClientAPI RemoteClient)
616 {
617 RemoteClient.SendLayerData( Terrain.getHeights1D() );
618 }
615 } 619 }
616} 620}
diff --git a/OpenSim/OpenSim.World/WorldBase.cs b/OpenSim/OpenSim.World/WorldBase.cs
index 19a8fb5..92bc6a3 100644
--- a/OpenSim/OpenSim.World/WorldBase.cs
+++ b/OpenSim/OpenSim.World/WorldBase.cs
@@ -15,61 +15,25 @@ using OpenSim.Terrain;
15 15
16namespace OpenSim.world 16namespace OpenSim.world
17{ 17{
18 public class WorldBase : IWorld 18 public abstract class WorldBase : IWorld
19 { 19 {
20 public Dictionary<libsecondlife.LLUUID, Entity> Entities; 20 public Dictionary<libsecondlife.LLUUID, Entity> Entities;
21 protected Dictionary<uint, IClientAPI> m_clientThreads; 21 protected Dictionary<uint, IClientAPI> m_clientThreads;
22 protected ulong m_regionHandle; 22 protected ulong m_regionHandle;
23 protected string m_regionName; 23 protected string m_regionName;
24 // protected InventoryCache _inventoryCache;
25 // protected AssetCache _assetCache;
26 protected RegionInfo m_regInfo; 24 protected RegionInfo m_regInfo;
27 25
28 public TerrainEngine Terrain; //TODO: Replace TerrainManager with this. 26 public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
29 protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine 27 protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine
30 28 protected object m_syncRoot = new object();
31 #region Properties 29 private uint m_nextLocalId = 8880000;
32 /*
33 public InventoryCache InventoryCache
34 {
35 set
36 {
37 this._inventoryCache = value;
38 }
39 }
40
41 public AssetCache AssetCache
42 {
43 set
44 {
45 this._assetCache = value;
46 }
47 }
48 */
49 #endregion
50
51 #region Constructors
52 /// <summary>
53 ///
54 /// </summary>
55 public WorldBase()
56 {
57
58 }
59 #endregion
60
61 #region Setup Methods
62
63 #endregion
64 30
65 #region Update Methods 31 #region Update Methods
66 /// <summary> 32 /// <summary>
67 /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation) 33 /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
68 /// </summary> 34 /// </summary>
69 public virtual void Update() 35 public abstract void Update();
70 {
71 36
72 }
73 #endregion 37 #endregion
74 38
75 #region Terrain Methods 39 #region Terrain Methods
@@ -77,11 +41,8 @@ namespace OpenSim.world
77 /// <summary> 41 /// <summary>
78 /// Loads the World heightmap 42 /// Loads the World heightmap
79 /// </summary> 43 /// </summary>
80 public virtual void LoadWorldMap() 44 public abstract void LoadWorldMap();
81 { 45
82
83 }
84
85 /// <summary> 46 /// <summary>
86 /// Send the region heightmap to the client 47 /// Send the region heightmap to the client
87 /// </summary> 48 /// </summary>
@@ -97,10 +58,8 @@ namespace OpenSim.world
97 /// <param name="px">Patch coordinate (x) 0..16</param> 58 /// <param name="px">Patch coordinate (x) 0..16</param>
98 /// <param name="py">Patch coordinate (y) 0..16</param> 59 /// <param name="py">Patch coordinate (y) 0..16</param>
99 /// <param name="RemoteClient">The client to send to</param> 60 /// <param name="RemoteClient">The client to send to</param>
100 public void SendLayerData(int px, int py, IClientAPI RemoteClient) 61 public abstract void SendLayerData(int px, int py, IClientAPI RemoteClient);
101 { 62
102
103 }
104 #endregion 63 #endregion
105 64
106 #region Add/Remove Agent/Avatar 65 #region Add/Remove Agent/Avatar
@@ -110,39 +69,43 @@ namespace OpenSim.world
110 /// <param name="remoteClient"></param> 69 /// <param name="remoteClient"></param>
111 /// <param name="agentID"></param> 70 /// <param name="agentID"></param>
112 /// <param name="child"></param> 71 /// <param name="child"></param>
113 public virtual void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child) 72 public abstract void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);
114 { 73
115 return ;
116 }
117
118 /// <summary> 74 /// <summary>
119 /// 75 ///
120 /// </summary> 76 /// </summary>
121 /// <param name="agentID"></param> 77 /// <param name="agentID"></param>
122 public virtual void RemoveAvatar(LLUUID agentID) 78 public abstract void RemoveAvatar(LLUUID agentID);
123 { 79
124 return ;
125 }
126
127 #endregion 80 #endregion
128 81
129 /// <summary> 82 /// <summary>
130 /// 83 ///
131 /// </summary> 84 /// </summary>
132 /// <returns></returns> 85 /// <returns></returns>
133 public virtual RegionInfo GetRegionInfo() 86 public virtual RegionInfo RegionInfo
87 {
88 get { return null; }
89 }
90
91 public object SyncRoot
92 {
93 get { return m_syncRoot; }
94 }
95
96 public uint NextLocalId
134 { 97 {
135 return null; 98 get { return m_nextLocalId++; }
136 } 99 }
137 100
138 #region Shutdown 101 #region Shutdown
139 /// <summary> 102 /// <summary>
140 /// Tidy before shutdown 103 /// Tidy before shutdown
141 /// </summary> 104 /// </summary>
142 public virtual void Close() 105 public abstract void Close();
143 {
144 106
145 }
146 #endregion 107 #endregion
108
109
147 } 110 }
148} 111}
diff --git a/OpenSim/OpenSim/OpenSim.csproj.user b/OpenSim/OpenSim/OpenSim.csproj.user
deleted file mode 100644
index 66e2cb4..0000000
--- a/OpenSim/OpenSim/OpenSim.csproj.user
+++ /dev/null
@@ -1,13 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <StartArguments>-loginserver -sandbox -accounts</StartArguments>
6 <ReferencePath>C:\sugilite\bin\</ReferencePath>
7 <LastOpenVersion>8.0.50727</LastOpenVersion>
8 <ProjectView>ProjectFiles</ProjectView>
9 <ProjectTrust>0</ProjectTrust>
10 </PropertyGroup>
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
12 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
13</Project>
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index df6b4f4..55efffa 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -83,6 +83,9 @@
83 <Compile Include="Prebuild.cs"> 83 <Compile Include="Prebuild.cs">
84 <SubType>Code</SubType> 84 <SubType>Code</SubType>
85 </Compile> 85 </Compile>
86 <Compile Include="Core\FatalException.cs">
87 <SubType>Code</SubType>
88 </Compile>
86 <Compile Include="Core\Kernel.cs"> 89 <Compile Include="Core\Kernel.cs">
87 <SubType>Code</SubType> 90 <SubType>Code</SubType>
88 </Compile> 91 </Compile>
@@ -92,25 +95,19 @@
92 <Compile Include="Core\WarningException.cs"> 95 <Compile Include="Core\WarningException.cs">
93 <SubType>Code</SubType> 96 <SubType>Code</SubType>
94 </Compile> 97 </Compile>
95 <Compile Include="Core\FatalException.cs"> 98 <Compile Include="Core\Attributes\DataNodeAttribute.cs">
96 <SubType>Code</SubType>
97 </Compile>
98 <Compile Include="Core\Interfaces\ITarget.cs">
99 <SubType>Code</SubType>
100 </Compile>
101 <Compile Include="Core\Interfaces\IDataNode.cs">
102 <SubType>Code</SubType> 99 <SubType>Code</SubType>
103 </Compile> 100 </Compile>
104 <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> 101 <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
105 <SubType>Code</SubType> 102 <SubType>Code</SubType>
106 </Compile> 103 </Compile>
107 <Compile Include="Core\Attributes\DataNodeAttribute.cs"> 104 <Compile Include="Core\Attributes\TargetAttribute.cs">
108 <SubType>Code</SubType> 105 <SubType>Code</SubType>
109 </Compile> 106 </Compile>
110 <Compile Include="Core\Attributes\TargetAttribute.cs"> 107 <Compile Include="Core\Interfaces\IDataNode.cs">
111 <SubType>Code</SubType> 108 <SubType>Code</SubType>
112 </Compile> 109 </Compile>
113 <Compile Include="Core\Nodes\ProjectNode.cs"> 110 <Compile Include="Core\Interfaces\ITarget.cs">
114 <SubType>Code</SubType> 111 <SubType>Code</SubType>
115 </Compile> 112 </Compile>
116 <Compile Include="Core\Nodes\ConfigurationNode.cs"> 113 <Compile Include="Core\Nodes\ConfigurationNode.cs">
@@ -122,73 +119,76 @@
122 <Compile Include="Core\Nodes\ExcludeNode.cs"> 119 <Compile Include="Core\Nodes\ExcludeNode.cs">
123 <SubType>Code</SubType> 120 <SubType>Code</SubType>
124 </Compile> 121 </Compile>
125 <Compile Include="Core\Nodes\OptionsNode.cs"> 122 <Compile Include="Core\Nodes\FileNode.cs">
126 <SubType>Code</SubType> 123 <SubType>Code</SubType>
127 </Compile> 124 </Compile>
128 <Compile Include="Core\Nodes\ReferencePathNode.cs"> 125 <Compile Include="Core\Nodes\FilesNode.cs">
129 <SubType>Code</SubType> 126 <SubType>Code</SubType>
130 </Compile> 127 </Compile>
131 <Compile Include="Core\Nodes\MatchNode.cs"> 128 <Compile Include="Core\Nodes\MatchNode.cs">
132 <SubType>Code</SubType> 129 <SubType>Code</SubType>
133 </Compile> 130 </Compile>
134 <Compile Include="Core\Nodes\SolutionNode.cs"> 131 <Compile Include="Core\Nodes\OptionsNode.cs">
135 <SubType>Code</SubType> 132 <SubType>Code</SubType>
136 </Compile> 133 </Compile>
137 <Compile Include="Core\Nodes\ProcessNode.cs"> 134 <Compile Include="Core\Nodes\ProcessNode.cs">
138 <SubType>Code</SubType> 135 <SubType>Code</SubType>
139 </Compile> 136 </Compile>
137 <Compile Include="Core\Nodes\ProjectNode.cs">
138 <SubType>Code</SubType>
139 </Compile>
140 <Compile Include="Core\Nodes\ReferenceNode.cs"> 140 <Compile Include="Core\Nodes\ReferenceNode.cs">
141 <SubType>Code</SubType> 141 <SubType>Code</SubType>
142 </Compile> 142 </Compile>
143 <Compile Include="Core\Nodes\FileNode.cs"> 143 <Compile Include="Core\Nodes\ReferencePathNode.cs">
144 <SubType>Code</SubType> 144 <SubType>Code</SubType>
145 </Compile> 145 </Compile>
146 <Compile Include="Core\Nodes\FilesNode.cs"> 146 <Compile Include="Core\Nodes\SolutionNode.cs">
147 <SubType>Code</SubType> 147 <SubType>Code</SubType>
148 </Compile> 148 </Compile>
149 <Compile Include="Core\Targets\DebugTarget.cs"> 149 <Compile Include="Core\Parse\IfContext.cs">
150 <SubType>Code</SubType> 150 <SubType>Code</SubType>
151 </Compile> 151 </Compile>
152 <Compile Include="Core\Targets\MonoDevelopTarget.cs"> 152 <Compile Include="Core\Parse\Preprocessor.cs">
153 <SubType>Code</SubType> 153 <SubType>Code</SubType>
154 </Compile> 154 </Compile>
155 <Compile Include="Core\Targets\AutotoolsTarget.cs"> 155 <Compile Include="Core\Targets\AutotoolsTarget.cs">
156 <SubType>Code</SubType> 156 <SubType>Code</SubType>
157 </Compile> 157 </Compile>
158 <Compile Include="Core\Targets\SharpDevelopTarget.cs"> 158 <Compile Include="Core\Targets\DebugTarget.cs">
159 <SubType>Code</SubType> 159 <SubType>Code</SubType>
160 </Compile> 160 </Compile>
161 <Compile Include="Core\Targets\VS2002Target.cs"> 161 <Compile Include="Core\Targets\MonoDevelopTarget.cs">
162 <SubType>Code</SubType> 162 <SubType>Code</SubType>
163 </Compile> 163 </Compile>
164 <Compile Include="Core\Targets\VS2003Target.cs"> 164 <Compile Include="Core\Targets\NAntTarget.cs">
165 <SubType>Code</SubType> 165 <SubType>Code</SubType>
166 </Compile> 166 </Compile>
167 <Compile Include="Core\Targets\SharpDevelop2Target.cs"> 167 <Compile Include="Core\Targets\SharpDevelop2Target.cs">
168 <SubType>Code</SubType> 168 <SubType>Code</SubType>
169 </Compile> 169 </Compile>
170 <Compile Include="Core\Targets\VS2005Target.cs"> 170 <Compile Include="Core\Targets\SharpDevelopTarget.cs">
171 <SubType>Code</SubType> 171 <SubType>Code</SubType>
172 </Compile> 172 </Compile>
173 <Compile Include="Core\Targets\NAntTarget.cs"> 173 <Compile Include="Core\Targets\VS2002Target.cs">
174 <SubType>Code</SubType> 174 <SubType>Code</SubType>
175 </Compile> 175 </Compile>
176 <Compile Include="Core\Parse\IfContext.cs"> 176 <Compile Include="Core\Targets\VS2003Target.cs">
177 <SubType>Code</SubType> 177 <SubType>Code</SubType>
178 </Compile> 178 </Compile>
179 <Compile Include="Core\Parse\Preprocessor.cs"> 179 <Compile Include="Core\Targets\VS2005Target.cs">
180 <SubType>Code</SubType> 180 <SubType>Code</SubType>
181 </Compile> 181 </Compile>
182 <Compile Include="Core\Utilities\Helper.cs"> 182 <Compile Include="Core\Utilities\CommandLineCollection.cs">
183 <SubType>Code</SubType> 183 <SubType>Code</SubType>
184 </Compile> 184 </Compile>
185 <Compile Include="Core\Utilities\Log.cs"> 185 <Compile Include="Core\Utilities\CurrentDirectory.cs">
186 <SubType>Code</SubType> 186 <SubType>Code</SubType>
187 </Compile> 187 </Compile>
188 <Compile Include="Core\Utilities\CommandLineCollection.cs"> 188 <Compile Include="Core\Utilities\Helper.cs">
189 <SubType>Code</SubType> 189 <SubType>Code</SubType>
190 </Compile> 190 </Compile>
191 <Compile Include="Core\Utilities\CurrentDirectory.cs"> 191 <Compile Include="Core\Utilities\Log.cs">
192 <SubType>Code</SubType> 192 <SubType>Code</SubType>
193 </Compile> 193 </Compile>
194 <Compile Include="Properties\AssemblyInfo.cs"> 194 <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Prebuild/src/Prebuild.csproj.user b/Prebuild/src/Prebuild.csproj.user
deleted file mode 100644
index 082d673..0000000
--- a/Prebuild/src/Prebuild.csproj.user
+++ /dev/null
@@ -1,12 +0,0 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index f2c8cab..43f5516 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -14,42 +14,42 @@
14 </resources> 14 </resources>
15 <sources failonempty="true"> 15 <sources failonempty="true">
16 <include name="Prebuild.cs" /> 16 <include name="Prebuild.cs" />
17 <include name="Core/FatalException.cs" />
17 <include name="Core/Kernel.cs" /> 18 <include name="Core/Kernel.cs" />
18 <include name="Core/UnknownLanguageException.cs" /> 19 <include name="Core/UnknownLanguageException.cs" />
19 <include name="Core/WarningException.cs" /> 20 <include name="Core/WarningException.cs" />
20 <include name="Core/FatalException.cs" />
21 <include name="Core/Interfaces/ITarget.cs" />
22 <include name="Core/Interfaces/IDataNode.cs" />
23 <include name="Core/Attributes/OptionNodeAttribute.cs" />
24 <include name="Core/Attributes/DataNodeAttribute.cs" /> 21 <include name="Core/Attributes/DataNodeAttribute.cs" />
22 <include name="Core/Attributes/OptionNodeAttribute.cs" />
25 <include name="Core/Attributes/TargetAttribute.cs" /> 23 <include name="Core/Attributes/TargetAttribute.cs" />
26 <include name="Core/Nodes/ProjectNode.cs" /> 24 <include name="Core/Interfaces/IDataNode.cs" />
25 <include name="Core/Interfaces/ITarget.cs" />
27 <include name="Core/Nodes/ConfigurationNode.cs" /> 26 <include name="Core/Nodes/ConfigurationNode.cs" />
28 <include name="Core/Nodes/DataNode.cs" /> 27 <include name="Core/Nodes/DataNode.cs" />
29 <include name="Core/Nodes/ExcludeNode.cs" /> 28 <include name="Core/Nodes/ExcludeNode.cs" />
30 <include name="Core/Nodes/OptionsNode.cs" /> 29 <include name="Core/Nodes/FileNode.cs" />
31 <include name="Core/Nodes/ReferencePathNode.cs" /> 30 <include name="Core/Nodes/FilesNode.cs" />
32 <include name="Core/Nodes/MatchNode.cs" /> 31 <include name="Core/Nodes/MatchNode.cs" />
33 <include name="Core/Nodes/SolutionNode.cs" /> 32 <include name="Core/Nodes/OptionsNode.cs" />
34 <include name="Core/Nodes/ProcessNode.cs" /> 33 <include name="Core/Nodes/ProcessNode.cs" />
34 <include name="Core/Nodes/ProjectNode.cs" />
35 <include name="Core/Nodes/ReferenceNode.cs" /> 35 <include name="Core/Nodes/ReferenceNode.cs" />
36 <include name="Core/Nodes/FileNode.cs" /> 36 <include name="Core/Nodes/ReferencePathNode.cs" />
37 <include name="Core/Nodes/FilesNode.cs" /> 37 <include name="Core/Nodes/SolutionNode.cs" />
38 <include name="Core/Parse/IfContext.cs" />
39 <include name="Core/Parse/Preprocessor.cs" />
40 <include name="Core/Targets/AutotoolsTarget.cs" />
38 <include name="Core/Targets/DebugTarget.cs" /> 41 <include name="Core/Targets/DebugTarget.cs" />
39 <include name="Core/Targets/MonoDevelopTarget.cs" /> 42 <include name="Core/Targets/MonoDevelopTarget.cs" />
40 <include name="Core/Targets/AutotoolsTarget.cs" /> 43 <include name="Core/Targets/NAntTarget.cs" />
44 <include name="Core/Targets/SharpDevelop2Target.cs" />
41 <include name="Core/Targets/SharpDevelopTarget.cs" /> 45 <include name="Core/Targets/SharpDevelopTarget.cs" />
42 <include name="Core/Targets/VS2002Target.cs" /> 46 <include name="Core/Targets/VS2002Target.cs" />
43 <include name="Core/Targets/VS2003Target.cs" /> 47 <include name="Core/Targets/VS2003Target.cs" />
44 <include name="Core/Targets/SharpDevelop2Target.cs" />
45 <include name="Core/Targets/VS2005Target.cs" /> 48 <include name="Core/Targets/VS2005Target.cs" />
46 <include name="Core/Targets/NAntTarget.cs" />
47 <include name="Core/Parse/IfContext.cs" />
48 <include name="Core/Parse/Preprocessor.cs" />
49 <include name="Core/Utilities/Helper.cs" />
50 <include name="Core/Utilities/Log.cs" />
51 <include name="Core/Utilities/CommandLineCollection.cs" /> 49 <include name="Core/Utilities/CommandLineCollection.cs" />
52 <include name="Core/Utilities/CurrentDirectory.cs" /> 50 <include name="Core/Utilities/CurrentDirectory.cs" />
51 <include name="Core/Utilities/Helper.cs" />
52 <include name="Core/Utilities/Log.cs" />
53 <include name="Properties/AssemblyInfo.cs" /> 53 <include name="Properties/AssemblyInfo.cs" />
54 </sources> 54 </sources>
55 <references basedir="${project::get-base-directory()}"> 55 <references basedir="${project::get-base-directory()}">