diff options
40 files changed, 3192 insertions, 3106 deletions
diff --git a/OpenGridServices.GridServer/GridHttp.cs b/OpenGridServices.GridServer/GridHttp.cs index c9cda61..33e1e71 100644 --- a/OpenGridServices.GridServer/GridHttp.cs +++ b/OpenGridServices.GridServer/GridHttp.cs | |||
@@ -56,8 +56,13 @@ namespace OpenGridServices.GridServer | |||
56 | MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK"); | 56 | MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK"); |
57 | Listener = new HttpListener(); | 57 | Listener = new HttpListener(); |
58 | 58 | ||
59 | Listener.Prefixes.Add("http://+:8001/gridserver/"); | 59 | Listener.Prefixes.Add("http://+:8001/sims/"); |
60 | Listener.Prefixes.Add("http://+:8001/gods/"); | ||
61 | Listener.Prefixes.Add("http://+:8001/highestuuid/"); | ||
62 | Listener.Prefixes.Add("http://+:8001/uuidblocks/"); | ||
60 | Listener.Start(); | 63 | Listener.Start(); |
64 | |||
65 | MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Successfully bound to port 8001"); | ||
61 | 66 | ||
62 | HttpListenerContext context; | 67 | HttpListenerContext context; |
63 | while(true) { | 68 | while(true) { |
@@ -66,72 +71,105 @@ namespace OpenGridServices.GridServer | |||
66 | } | 71 | } |
67 | } | 72 | } |
68 | 73 | ||
69 | static string ParseXMLRPC(string requestBody) { | 74 | static string ParseXMLRPC(string requestBody, string referrer) { |
70 | try{ | 75 | try{ |
71 | XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody); | 76 | XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody); |
72 | 77 | ||
73 | Hashtable requestData = (Hashtable)request.Params[0]; | 78 | Hashtable requestData = (Hashtable)request.Params[0]; |
74 | switch(request.MethodName) { | 79 | switch(request.MethodName) { |
75 | case "get_sim_info": | 80 | case "simulator_login": |
76 | ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]); | 81 | if(!(referrer=="simulator")) { |
77 | SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle); | 82 | XmlRpcResponse ErrorResp = new XmlRpcResponse(); |
78 | string RecvKey=""; | 83 | Hashtable ErrorRespData = new Hashtable(); |
79 | string caller=(string)requestData["caller"]; | 84 | ErrorRespData["error"]="Only simulators can login with this method"; |
80 | switch(caller) { | 85 | ErrorResp.Value=ErrorRespData; |
81 | case "userserver": | 86 | return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8")); |
82 | RecvKey=OpenGrid_Main.thegrid.UserRecvKey; | 87 | } |
83 | break; | 88 | |
84 | case "assetserver": | 89 | if(!((string)requestData["authkey"]==OpenGrid_Main.thegrid.SimRecvKey)) { |
85 | RecvKey=OpenGrid_Main.thegrid.AssetRecvKey; | 90 | XmlRpcResponse ErrorResp = new XmlRpcResponse(); |
86 | break; | 91 | Hashtable ErrorRespData = new Hashtable(); |
87 | } | 92 | ErrorRespData["error"]="invalid key"; |
88 | if((TheSim!=null) && (string)requestData["authkey"]==RecvKey) { | 93 | ErrorResp.Value=ErrorRespData; |
89 | XmlRpcResponse SimInfoResp = new XmlRpcResponse(); | 94 | return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8")); |
90 | Hashtable SimInfoData = new Hashtable(); | 95 | } |
91 | SimInfoData["UUID"]=TheSim.UUID.ToString(); | 96 | |
92 | SimInfoData["regionhandle"]=TheSim.regionhandle.ToString(); | 97 | SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByLLUUID(new LLUUID((string)requestData["UUID"])); |
93 | SimInfoData["regionname"]=TheSim.regionname; | 98 | XmlRpcResponse SimLoginResp = new XmlRpcResponse(); |
94 | SimInfoData["sim_ip"]=TheSim.sim_ip; | 99 | Hashtable SimLoginRespData = new Hashtable(); |
95 | SimInfoData["sim_port"]=TheSim.sim_port.ToString(); | 100 | |
96 | SimInfoData["caps_url"]=TheSim.caps_url; | 101 | ArrayList SimNeighboursData = new ArrayList(); |
97 | SimInfoData["RegionLocX"]=TheSim.RegionLocX.ToString(); | 102 | |
98 | SimInfoData["RegionLocY"]=TheSim.RegionLocY.ToString(); | 103 | SimProfileBase neighbour; |
99 | SimInfoData["sendkey"]=TheSim.sendkey; | 104 | Hashtable NeighbourBlock; |
100 | SimInfoData["recvkey"]=TheSim.recvkey; | 105 | for(int x=-1; x<2; x++) for(int y=-1; y<2; y++) { |
101 | SimInfoResp.Value=SimInfoData; | 106 | if(OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(Helpers.UIntsToLong((uint)((TheSim.RegionLocX+x)*256), (uint)(TheSim.RegionLocY+y)*256))!=null) { |
102 | return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(SimInfoResp),"utf-16","utf-8")); | 107 | neighbour=OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(Helpers.UIntsToLong((uint)((TheSim.RegionLocX+x)*256), (uint)(TheSim.RegionLocY+y)*256)); |
103 | } else { | 108 | NeighbourBlock = new Hashtable(); |
104 | XmlRpcResponse SimErrorResp = new XmlRpcResponse(); | 109 | NeighbourBlock["sim_ip"] = neighbour.sim_ip; |
105 | Hashtable SimErrorData = new Hashtable(); | 110 | NeighbourBlock["sim_port"] = neighbour.sim_port.ToString(); |
106 | SimErrorData["error"]="sim not found"; | 111 | NeighbourBlock["region_locx"] = neighbour.RegionLocX.ToString(); |
107 | SimErrorResp.Value=SimErrorData; | 112 | NeighbourBlock["region_locy"] = neighbour.RegionLocY.ToString(); |
108 | return(XmlRpcResponseSerializer.Singleton.Serialize(SimErrorResp)); | 113 | NeighbourBlock["UUID"] = neighbour.UUID.ToString(); |
109 | } | 114 | SimNeighboursData.Add(NeighbourBlock); |
110 | break; | 115 | } |
111 | } | 116 | } |
117 | |||
118 | |||
119 | SimLoginRespData["region_locx"]=TheSim.RegionLocX.ToString(); | ||
120 | SimLoginRespData["region_locy"]=TheSim.RegionLocY.ToString(); | ||
121 | SimLoginRespData["regionname"]=TheSim.regionname; | ||
122 | SimLoginRespData["estate_id"]="1"; | ||
123 | SimLoginRespData["neighbours"]=SimNeighboursData; | ||
124 | SimLoginRespData["asset_url"]=OpenGrid_Main.thegrid.DefaultAssetServer; | ||
125 | SimLoginRespData["asset_sendkey"]=OpenGrid_Main.thegrid.AssetSendKey; | ||
126 | SimLoginRespData["asset_recvkey"]=OpenGrid_Main.thegrid.AssetRecvKey; | ||
127 | SimLoginRespData["user_url"]=OpenGrid_Main.thegrid.DefaultUserServer; | ||
128 | SimLoginRespData["user_sendkey"]=OpenGrid_Main.thegrid.UserSendKey; | ||
129 | SimLoginRespData["user_recvkey"]=OpenGrid_Main.thegrid.UserRecvKey; | ||
130 | SimLoginRespData["authkey"]=OpenGrid_Main.thegrid.SimSendKey; | ||
131 | SimLoginResp.Value=SimLoginRespData; | ||
132 | return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(SimLoginResp),"utf-16","utf-8")); | ||
133 | break; | ||
134 | } | ||
112 | } catch(Exception e) { | 135 | } catch(Exception e) { |
113 | Console.WriteLine(e.ToString()); | 136 | Console.WriteLine(e.ToString()); |
114 | } | 137 | } |
115 | return ""; | 138 | return ""; |
116 | } | 139 | } |
117 | 140 | ||
118 | static string ParseREST(string requestBody, string requestURL) { | 141 | static string ParseREST(string requestBody, string requestURL, string HTTPmethod) { |
119 | char[] splitter = {'/'}; | 142 | char[] splitter = {'/'}; |
120 | string[] rest_params = requestURL.Split(splitter); | 143 | string[] rest_params = requestURL.Split(splitter); |
121 | string req_type = rest_params[1]; // First part of the URL is the type of request - | 144 | string req_type = rest_params[0]; // First part of the URL is the type of request - |
122 | switch(req_type) { | 145 | string respstring; |
123 | case "regions": | 146 | switch(req_type) { |
124 | ulong regionhandle = (ulong)Convert.ToInt64(rest_params[2]); // get usersessions/sessionid | 147 | case "sims": |
125 | switch(rest_params[3]) { | 148 | LLUUID UUID = new LLUUID((string)rest_params[1]); |
126 | case "neighbours": | 149 | SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByLLUUID(UUID); |
127 | return OpenGrid_Main.thegrid._regionmanager.GetXMLNeighbours(regionhandle); | 150 | if(!(TheSim==null)) { |
128 | break; | 151 | switch(HTTPmethod) { |
152 | case "GET": | ||
153 | respstring="<authkey>" + OpenGrid_Main.thegrid.SimSendKey + "</authkey>"; | ||
154 | respstring+="<sim>"; | ||
155 | respstring+="<uuid>" + TheSim.UUID.ToString() + "</uuid>"; | ||
156 | respstring+="<regionname>" + TheSim.regionname + "</regionname>"; | ||
157 | respstring+="<sim_ip>" + TheSim.sim_ip + "</sim_ip>"; | ||
158 | respstring+="<sim_port>" + TheSim.sim_port.ToString() + "</sim_port>"; | ||
159 | respstring+="<region_locx>" + TheSim.RegionLocX.ToString() + "</region_locx>"; | ||
160 | respstring+="<region_locy>" + TheSim.RegionLocY.ToString() + "</region_locy>"; | ||
161 | respstring+="<estate_id>1</estate_id>"; | ||
162 | respstring+="</sim>"; | ||
163 | break; | ||
164 | } | ||
129 | } | 165 | } |
130 | return "OK"; | ||
131 | break; | 166 | break; |
132 | } | 167 | case "highestuuid": |
168 | |||
169 | break; | ||
170 | } | ||
133 | return ""; | 171 | return ""; |
134 | 172 | ||
135 | } | 173 | } |
136 | 174 | ||
137 | 175 | ||
@@ -152,18 +190,20 @@ namespace OpenGridServices.GridServer | |||
152 | body.Close(); | 190 | body.Close(); |
153 | reader.Close(); | 191 | reader.Close(); |
154 | 192 | ||
193 | // TODO: AUTHENTICATION!!!!!!!!! MUST ADD!!!!!!!!!! SCRIPT KIDDIES LOVE LACK OF IT!!!!!!!!!! | ||
194 | |||
155 | string responseString=""; | 195 | string responseString=""; |
156 | switch(request.ContentType) { | 196 | switch(request.ContentType) { |
157 | case "text/xml": | 197 | case "text/xml": |
158 | // must be XML-RPC, so pass to the XML-RPC parser | 198 | // must be XML-RPC, so pass to the XML-RPC parser |
159 | 199 | ||
160 | responseString=ParseXMLRPC(requestBody); | 200 | responseString=ParseXMLRPC(requestBody,request.Headers["Referer"]); |
161 | response.AddHeader("Content-type","text/xml"); | 201 | response.AddHeader("Content-type","text/xml"); |
162 | break; | 202 | break; |
163 | 203 | ||
164 | case null: | 204 | case null: |
165 | // must be REST or invalid crap, so pass to the REST parser | 205 | // must be REST or invalid crap, so pass to the REST parser |
166 | responseString=ParseREST(request.Url.OriginalString,requestBody); | 206 | responseString=ParseREST(request.Url.OriginalString,requestBody,request.HttpMethod); |
167 | break; | 207 | break; |
168 | } | 208 | } |
169 | 209 | ||
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs index 2382fd7..46041d9 100644 --- a/OpenGridServices.GridServer/Main.cs +++ b/OpenGridServices.GridServer/Main.cs | |||
@@ -39,7 +39,6 @@ namespace OpenGridServices.GridServer | |||
39 | /// </summary> | 39 | /// </summary> |
40 | public class OpenGrid_Main : conscmd_callback | 40 | public class OpenGrid_Main : conscmd_callback |
41 | { | 41 | { |
42 | |||
43 | public static OpenGrid_Main thegrid; | 42 | public static OpenGrid_Main thegrid; |
44 | public string GridOwner; | 43 | public string GridOwner; |
45 | public string DefaultStartupMsg; | 44 | public string DefaultStartupMsg; |
@@ -49,6 +48,9 @@ namespace OpenGridServices.GridServer | |||
49 | public string DefaultUserServer; | 48 | public string DefaultUserServer; |
50 | public string UserSendKey; | 49 | public string UserSendKey; |
51 | public string UserRecvKey; | 50 | public string UserRecvKey; |
51 | public string SimSendKey; | ||
52 | public string SimRecvKey; | ||
53 | public LLUUID highestUUID; | ||
52 | 54 | ||
53 | public GridHTTPServer _httpd; | 55 | public GridHTTPServer _httpd; |
54 | public SimProfileManager _regionmanager; | 56 | public SimProfileManager _regionmanager; |
@@ -97,11 +99,16 @@ namespace OpenGridServices.GridServer | |||
97 | this.UserSendKey = m_console.CmdPrompt("Key to send to user server: "); | 99 | this.UserSendKey = m_console.CmdPrompt("Key to send to user server: "); |
98 | this.UserRecvKey = m_console.CmdPrompt("Key to expect from user server: "); | 100 | this.UserRecvKey = m_console.CmdPrompt("Key to expect from user server: "); |
99 | 101 | ||
100 | m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); | 102 | this.SimSendKey = m_console.CmdPrompt("Key to send to sims: "); |
103 | this.SimRecvKey = m_console.CmdPrompt("Key to expect from sims: "); | ||
104 | |||
105 | m_console.WriteLine("Main.cs:Startup() - Loading sim profiles from database"); | ||
106 | this._regionmanager = new SimProfileManager(); | ||
107 | _regionmanager.LoadProfiles(); | ||
108 | |||
109 | m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); | ||
101 | _httpd = new GridHTTPServer(); | 110 | _httpd = new GridHTTPServer(); |
102 | 111 | ||
103 | this._regionmanager = new SimProfileManager(); | ||
104 | _regionmanager.CreateNewProfile("OpenSim Test", "http://there-is-no-caps.com", "4.78.190.75", 9000, 997, 996, this.UserSendKey, this.UserRecvKey); | ||
105 | } | 112 | } |
106 | 113 | ||
107 | public void RunCmd(string cmd, string[] cmdparams) | 114 | public void RunCmd(string cmd, string[] cmdparams) |
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj index 71d603e..12b4933 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj | |||
@@ -1,113 +1,117 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{21BFC8E2-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{53A65EE9-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenGridServices.GridServer</AssemblyName> | 12 | <AssemblyName>OpenGridServices.GridServer</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Exe</OutputType> | 17 | <OutputType>Exe</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenGridServices.GridServer</RootNamespace> | 19 | <RootNamespace>OpenGridServices.GridServer</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Data" > | 65 | <Reference Include="System.Data" > |
66 | <HintPath>System.Data.dll</HintPath> | 66 | <HintPath>System.Data.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="System.Xml" > | 69 | <Reference Include="System.Xml" > |
70 | <HintPath>System.Xml.dll</HintPath> | 70 | <HintPath>System.Xml.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | </ItemGroup> | 77 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <ItemGroup> | 78 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> |
79 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | 79 | <Private>False</Private> |
80 | <Name>OpenSim.Framework</Name> | 80 | </Reference> |
81 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 81 | </ItemGroup> |
82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <ItemGroup> |
83 | <Private>False</Private> | 83 | <ProjectReference Include="../OpenSim.Framework/OpenSim.Framework.csproj"> |
84 | </ProjectReference> | 84 | <Name>OpenSim.Framework</Name> |
85 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 85 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> |
86 | <Name>OpenSim.Framework.Console</Name> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 87 | <Private>False</Private> |
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 88 | </ProjectReference> |
89 | <Private>False</Private> | 89 | <ProjectReference Include="../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> |
90 | </ProjectReference> | 90 | <Name>OpenSim.Framework.Console</Name> |
91 | </ItemGroup> | 91 | <Project>{16759386-0000-0000-0000-000000000000}</Project> |
92 | <ItemGroup> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Compile Include="GridHttp.cs"> | 93 | <Private>False</Private> |
94 | <SubType>Code</SubType> | 94 | </ProjectReference> |
95 | </Compile> | 95 | </ItemGroup> |
96 | <Compile Include="Main.cs"> | 96 | <ItemGroup> |
97 | <SubType>Code</SubType> | 97 | <Compile Include="GridHttp.cs"> |
98 | </Compile> | 98 | <SubType>Code</SubType> |
99 | <Compile Include="SimProfiles.cs"> | 99 | </Compile> |
100 | <SubType>Code</SubType> | 100 | <Compile Include="Main.cs"> |
101 | </Compile> | 101 | <SubType>Code</SubType> |
102 | <Compile Include="Properties\AssemblyInfo.cs"> | 102 | </Compile> |
103 | <SubType>Code</SubType> | 103 | <Compile Include="SimProfiles.cs"> |
104 | </Compile> | 104 | <SubType>Code</SubType> |
105 | </ItemGroup> | 105 | </Compile> |
106 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 106 | <Compile Include="Properties/AssemblyInfo.cs"> |
107 | <PropertyGroup> | 107 | <SubType>Code</SubType> |
108 | <PreBuildEvent> | 108 | </Compile> |
109 | </PreBuildEvent> | 109 | </ItemGroup> |
110 | <PostBuildEvent> | 110 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
111 | </PostBuildEvent> | 111 | <PropertyGroup> |
112 | </PropertyGroup> | 112 | <PreBuildEvent> |
113 | </Project> | 113 | </PreBuildEvent> |
114 | <PostBuildEvent> | ||
115 | </PostBuildEvent> | ||
116 | </PropertyGroup> | ||
117 | </Project> | ||
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build index a25536e..111e2f7 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build | |||
@@ -1,47 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGridServices.GridServer" default="build"> | 2 | <project name="OpenGridServices.GridServer" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > | 11 | <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="GridHttp.cs" /> | 14 | <include name="GridHttp.cs" /> |
15 | <include name="Main.cs" /> | 15 | <include name="Main.cs" /> |
16 | <include name="SimProfiles.cs" /> | 16 | <include name="SimProfiles.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()}"> |
20 | <lib> | 20 | <lib> |
21 | <include name="${project::get-base-directory()}" /> | 21 | <include name="${project::get-base-directory()}" /> |
22 | <include name="${project::get-base-directory()}/${build.dir}" /> | 22 | <include name="${project::get-base-directory()}/${build.dir}" /> |
23 | </lib> | 23 | </lib> |
24 | <include name="System.dll" /> | 24 | <include name="System.dll" /> |
25 | <include name="System.Data.dll" /> | 25 | <include name="System.Data.dll" /> |
26 | <include name="System.Xml.dll" /> | 26 | <include name="System.Xml.dll" /> |
27 | <include name="../bin/OpenSim.Framework.dll" /> | 27 | <include name="../bin/OpenSim.Framework.dll" /> |
28 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
29 | <include name="../bin/libsecondlife.dll" /> | 29 | <include name="../bin/libsecondlife.dll" /> |
30 | </references> | 30 | <include name="../bin/Db4objects.Db4o.dll" /> |
31 | </csc> | 31 | </references> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 32 | </csc> |
33 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
34 | <copy todir="${project::get-base-directory()}/../bin/"> | 34 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <copy todir="${project::get-base-directory()}/../bin/"> |
36 | <include name="*.dll"/> | 36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
37 | <include name="*.exe"/> | 37 | <include name="*.dll"/> |
38 | </fileset> | 38 | <include name="*.exe"/> |
39 | </copy> | 39 | </fileset> |
40 | </target> | 40 | </copy> |
41 | <target name="clean"> | 41 | </target> |
42 | <delete dir="${bin.dir}" failonerror="false" /> | 42 | <target name="clean"> |
43 | <delete dir="${obj.dir}" failonerror="false" /> | 43 | <delete dir="${bin.dir}" failonerror="false" /> |
44 | </target> | 44 | <delete dir="${obj.dir}" failonerror="false" /> |
45 | <target name="doc" description="Creates documentation."> | 45 | </target> |
46 | </target> | 46 | <target name="doc" description="Creates documentation."> |
47 | </project> | 47 | </target> |
48 | </project> | ||
diff --git a/OpenGridServices.GridServer/SimProfiles.cs b/OpenGridServices.GridServer/SimProfiles.cs index 253c2d4..7aff434 100644 --- a/OpenGridServices.GridServer/SimProfiles.cs +++ b/OpenGridServices.GridServer/SimProfiles.cs | |||
@@ -33,7 +33,9 @@ using System.Collections; | |||
33 | using System.Collections.Generic; | 33 | using System.Collections.Generic; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using OpenSim.Framework.Utilities; | 35 | using OpenSim.Framework.Utilities; |
36 | using OpenSim.Framework.Console; | ||
36 | using OpenSim.Framework.Sims; | 37 | using OpenSim.Framework.Sims; |
38 | using Db4objects.Db4o; | ||
37 | 39 | ||
38 | namespace OpenGridServices.GridServer | 40 | namespace OpenGridServices.GridServer |
39 | { | 41 | { |
@@ -46,8 +48,15 @@ namespace OpenGridServices.GridServer | |||
46 | public SimProfileManager() { | 48 | public SimProfileManager() { |
47 | } | 49 | } |
48 | 50 | ||
49 | public void InitSimProfiles() { | 51 | public void LoadProfiles() { // should abstract this out |
50 | // TODO: need to load from database | 52 | IObjectContainer db; |
53 | db = Db4oFactory.OpenFile("simprofiles.yap"); | ||
54 | IObjectSet result = db.Get(typeof(SimProfileBase)); | ||
55 | foreach (SimProfileBase simprof in result) { | ||
56 | SimProfiles.Add(simprof.UUID, simprof); | ||
57 | } | ||
58 | MainConsole.Instance.WriteLine("SimProfiles.Cs:LoadProfiles() - Successfully loaded " + result.Count.ToString() + " from database"); | ||
59 | db.Close(); | ||
51 | } | 60 | } |
52 | 61 | ||
53 | public SimProfileBase GetProfileByHandle(ulong reqhandle) { | 62 | public SimProfileBase GetProfileByHandle(ulong reqhandle) { |
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index 013c08c..da40971 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj | |||
@@ -1,110 +1,110 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{66591469-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{890187AE-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenGridServices.UserServer</AssemblyName> | 12 | <AssemblyName>OpenGridServices.UserServer</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Exe</OutputType> | 17 | <OutputType>Exe</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenGridServices.UserServer</RootNamespace> | 19 | <RootNamespace>OpenGridServices.UserServer</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Data" > | 65 | <Reference Include="System.Data" > |
66 | <HintPath>System.Data.dll</HintPath> | 66 | <HintPath>System.Data.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="System.Xml" > | 69 | <Reference Include="System.Xml" > |
70 | <HintPath>System.Xml.dll</HintPath> | 70 | <HintPath>System.Xml.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | </ItemGroup> | 77 | </ItemGroup> |
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | 79 | <ProjectReference Include="../OpenSim.Framework/OpenSim.Framework.csproj"> |
80 | <Name>OpenSim.Framework</Name> | 80 | <Name>OpenSim.Framework</Name> |
81 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 81 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> |
82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
83 | <Private>False</Private> | 83 | <Private>False</Private> |
84 | </ProjectReference> | 84 | </ProjectReference> |
85 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 85 | <ProjectReference Include="../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> |
86 | <Name>OpenSim.Framework.Console</Name> | 86 | <Name>OpenSim.Framework.Console</Name> |
87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 87 | <Project>{16759386-0000-0000-0000-000000000000}</Project> |
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
89 | <Private>False</Private> | 89 | <Private>False</Private> |
90 | </ProjectReference> | 90 | </ProjectReference> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
93 | <Compile Include="Main.cs"> | 93 | <Compile Include="Main.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="UserHttp.cs"> | 96 | <Compile Include="UserHttp.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="Properties\AssemblyInfo.cs"> | 99 | <Compile Include="Properties/AssemblyInfo.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | </ItemGroup> | 102 | </ItemGroup> |
103 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 103 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
104 | <PropertyGroup> | 104 | <PropertyGroup> |
105 | <PreBuildEvent> | 105 | <PreBuildEvent> |
106 | </PreBuildEvent> | 106 | </PreBuildEvent> |
107 | <PostBuildEvent> | 107 | <PostBuildEvent> |
108 | </PostBuildEvent> | 108 | </PostBuildEvent> |
109 | </PropertyGroup> | 109 | </PropertyGroup> |
110 | </Project> | 110 | </Project> |
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build index 1cb35dd..7ab3ed5 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenGridServices.UserServer" default="build"> | 2 | <project name="OpenGridServices.UserServer" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > | 11 | <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Main.cs" /> | 14 | <include name="Main.cs" /> |
15 | <include name="UserHttp.cs" /> | 15 | <include name="UserHttp.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()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll" /> | 24 | <include name="System.Data.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="../bin/OpenSim.Framework.dll" /> | 26 | <include name="../bin/OpenSim.Framework.dll" /> |
27 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
28 | <include name="../bin/libsecondlife.dll" /> | 28 | <include name="../bin/libsecondlife.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj index e15551b..da72dcd 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj | |||
@@ -1,114 +1,114 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{83C87BE6-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{CB5EADE7-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Config.SimConfigDb4o</AssemblyName> | 12 | <AssemblyName>OpenSim.Config.SimConfigDb4o</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Config.SimConfigDb4o</RootNamespace> | 19 | <RootNamespace>OpenSim.Config.SimConfigDb4o</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\..\bin\</OutputPath> | 35 | <OutputPath>../../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>../../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Data.dll" > | 65 | <Reference Include="System.Data.dll" > |
66 | <HintPath>..\..\bin\System.Data.dll</HintPath> | 66 | <HintPath>..\..\bin\System.Data.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="System.Xml" > | 69 | <Reference Include="System.Xml" > |
70 | <HintPath>System.Xml.dll</HintPath> | 70 | <HintPath>System.Xml.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | <Reference Include="Db4objects.Db4o.dll" > | 77 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </Reference> | 80 | </Reference> |
81 | </ItemGroup> | 81 | </ItemGroup> |
82 | <ItemGroup> | 82 | <ItemGroup> |
83 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | 83 | <ProjectReference Include="../../OpenSim.Framework/OpenSim.Framework.csproj"> |
84 | <Name>OpenSim.Framework</Name> | 84 | <Name>OpenSim.Framework</Name> |
85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 85 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> |
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
87 | <Private>False</Private> | 87 | <Private>False</Private> |
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 89 | <ProjectReference Include="../../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> |
90 | <Name>OpenSim.Framework.Console</Name> | 90 | <Name>OpenSim.Framework.Console</Name> |
91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 91 | <Project>{16759386-0000-0000-0000-000000000000}</Project> |
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Private>False</Private> | 93 | <Private>False</Private> |
94 | </ProjectReference> | 94 | </ProjectReference> |
95 | </ItemGroup> | 95 | </ItemGroup> |
96 | <ItemGroup> | 96 | <ItemGroup> |
97 | <Compile Include="AssemblyInfo.cs"> | 97 | <Compile Include="AssemblyInfo.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="DbSimConfig.cs"> | 100 | <Compile Include="DbSimConfig.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
103 | <Compile Include="MapStorage.cs"> | 103 | <Compile Include="MapStorage.cs"> |
104 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
105 | </Compile> | 105 | </Compile> |
106 | </ItemGroup> | 106 | </ItemGroup> |
107 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 107 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
108 | <PropertyGroup> | 108 | <PropertyGroup> |
109 | <PreBuildEvent> | 109 | <PreBuildEvent> |
110 | </PreBuildEvent> | 110 | </PreBuildEvent> |
111 | <PostBuildEvent> | 111 | <PostBuildEvent> |
112 | </PostBuildEvent> | 112 | </PostBuildEvent> |
113 | </PropertyGroup> | 113 | </PropertyGroup> |
114 | </Project> | 114 | </Project> |
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build index e576728..085dc55 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build | |||
@@ -1,47 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Config.SimConfigDb4o" default="build"> | 2 | <project name="OpenSim.Config.SimConfigDb4o" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="DbSimConfig.cs" /> | 15 | <include name="DbSimConfig.cs" /> |
16 | <include name="MapStorage.cs" /> | 16 | <include name="MapStorage.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Data.dll.dll" /> | 24 | <include name="System.Data.dll.dll" /> |
25 | <include name="System.Xml.dll" /> | 25 | <include name="System.Xml.dll" /> |
26 | <include name="../../bin/libsecondlife.dll" /> | 26 | <include name="../../bin/libsecondlife.dll" /> |
27 | <include name="../../bin/Db4objects.Db4o.dll" /> | 27 | <include name="../../bin/Db4objects.Db4o.dll" /> |
28 | <include name="../../bin/OpenSim.Framework.dll" /> | 28 | <include name="../../bin/OpenSim.Framework.dll" /> |
29 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 29 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
30 | </references> | 30 | </references> |
31 | </csc> | 31 | </csc> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
34 | <copy todir="${project::get-base-directory()}/../../bin/"> | 34 | <copy todir="${project::get-base-directory()}/../../bin/"> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
36 | <include name="*.dll"/> | 36 | <include name="*.dll"/> |
37 | <include name="*.exe"/> | 37 | <include name="*.exe"/> |
38 | </fileset> | 38 | </fileset> |
39 | </copy> | 39 | </copy> |
40 | </target> | 40 | </target> |
41 | <target name="clean"> | 41 | <target name="clean"> |
42 | <delete dir="${bin.dir}" failonerror="false" /> | 42 | <delete dir="${bin.dir}" failonerror="false" /> |
43 | <delete dir="${obj.dir}" failonerror="false" /> | 43 | <delete dir="${obj.dir}" failonerror="false" /> |
44 | </target> | 44 | </target> |
45 | <target name="doc" description="Creates documentation."> | 45 | <target name="doc" description="Creates documentation."> |
46 | </target> | 46 | </target> |
47 | </project> | 47 | </project> |
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj index 0961492..3e9327c 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj | |||
@@ -1,89 +1,89 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{16759386-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Framework.Console</AssemblyName> | 12 | <AssemblyName>OpenSim.Framework.Console</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Framework.Console</RootNamespace> | 19 | <RootNamespace>OpenSim.Framework.Console</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | </ItemGroup> | 65 | </ItemGroup> |
66 | <ItemGroup> | 66 | <ItemGroup> |
67 | </ItemGroup> | 67 | </ItemGroup> |
68 | <ItemGroup> | 68 | <ItemGroup> |
69 | <Compile Include="AssemblyInfo.cs"> | 69 | <Compile Include="AssemblyInfo.cs"> |
70 | <SubType>Code</SubType> | 70 | <SubType>Code</SubType> |
71 | </Compile> | 71 | </Compile> |
72 | <Compile Include="ConsoleBase.cs"> | 72 | <Compile Include="ConsoleBase.cs"> |
73 | <SubType>Code</SubType> | 73 | <SubType>Code</SubType> |
74 | </Compile> | 74 | </Compile> |
75 | <Compile Include="ConsoleCallbacksBase.cs"> | 75 | <Compile Include="ConsoleCallbacksBase.cs"> |
76 | <SubType>Code</SubType> | 76 | <SubType>Code</SubType> |
77 | </Compile> | 77 | </Compile> |
78 | <Compile Include="MainConsole.cs"> | 78 | <Compile Include="MainConsole.cs"> |
79 | <SubType>Code</SubType> | 79 | <SubType>Code</SubType> |
80 | </Compile> | 80 | </Compile> |
81 | </ItemGroup> | 81 | </ItemGroup> |
82 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 82 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
83 | <PropertyGroup> | 83 | <PropertyGroup> |
84 | <PreBuildEvent> | 84 | <PreBuildEvent> |
85 | </PreBuildEvent> | 85 | </PreBuildEvent> |
86 | <PostBuildEvent> | 86 | <PostBuildEvent> |
87 | </PostBuildEvent> | 87 | </PostBuildEvent> |
88 | </PropertyGroup> | 88 | </PropertyGroup> |
89 | </Project> | 89 | </Project> |
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build index fa90bb6..a3019ee 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build | |||
@@ -1,42 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Framework.Console" default="build"> | 2 | <project name="OpenSim.Framework.Console" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="ConsoleBase.cs" /> | 15 | <include name="ConsoleBase.cs" /> |
16 | <include name="ConsoleCallbacksBase.cs" /> | 16 | <include name="ConsoleCallbacksBase.cs" /> |
17 | <include name="MainConsole.cs" /> | 17 | <include name="MainConsole.cs" /> |
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
20 | <lib> | 20 | <lib> |
21 | <include name="${project::get-base-directory()}" /> | 21 | <include name="${project::get-base-directory()}" /> |
22 | <include name="${project::get-base-directory()}/${build.dir}" /> | 22 | <include name="${project::get-base-directory()}/${build.dir}" /> |
23 | </lib> | 23 | </lib> |
24 | <include name="System.dll" /> | 24 | <include name="System.dll" /> |
25 | </references> | 25 | </references> |
26 | </csc> | 26 | </csc> |
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
28 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 28 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
29 | <copy todir="${project::get-base-directory()}/../bin/"> | 29 | <copy todir="${project::get-base-directory()}/../bin/"> |
30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
31 | <include name="*.dll"/> | 31 | <include name="*.dll"/> |
32 | <include name="*.exe"/> | 32 | <include name="*.exe"/> |
33 | </fileset> | 33 | </fileset> |
34 | </copy> | 34 | </copy> |
35 | </target> | 35 | </target> |
36 | <target name="clean"> | 36 | <target name="clean"> |
37 | <delete dir="${bin.dir}" failonerror="false" /> | 37 | <delete dir="${bin.dir}" failonerror="false" /> |
38 | <delete dir="${obj.dir}" failonerror="false" /> | 38 | <delete dir="${obj.dir}" failonerror="false" /> |
39 | </target> | 39 | </target> |
40 | <target name="doc" description="Creates documentation."> | 40 | <target name="doc" description="Creates documentation."> |
41 | </target> | 41 | </target> |
42 | </project> | 42 | </project> |
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj index 575d0ad..2e2d16c 100644 --- a/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim.Framework/OpenSim.Framework.csproj | |||
@@ -1,154 +1,154 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{7404933D-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Framework</AssemblyName> | 12 | <AssemblyName>OpenSim.Framework</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Framework</RootNamespace> | 19 | <RootNamespace>OpenSim.Framework</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Xml" > | 65 | <Reference Include="System.Xml" > |
66 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="libsecondlife.dll" > | 69 | <Reference Include="libsecondlife.dll" > |
70 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | </ItemGroup> | 73 | </ItemGroup> |
74 | <ItemGroup> | 74 | <ItemGroup> |
75 | </ItemGroup> | 75 | </ItemGroup> |
76 | <ItemGroup> | 76 | <ItemGroup> |
77 | <Compile Include="AgentCiruitData.cs"> | 77 | <Compile Include="AgentCiruitData.cs"> |
78 | <SubType>Code</SubType> | 78 | <SubType>Code</SubType> |
79 | </Compile> | 79 | </Compile> |
80 | <Compile Include="AgentInventory.cs"> | 80 | <Compile Include="AgentInventory.cs"> |
81 | <SubType>Code</SubType> | 81 | <SubType>Code</SubType> |
82 | </Compile> | 82 | </Compile> |
83 | <Compile Include="AssetBase.cs"> | 83 | <Compile Include="AssetBase.cs"> |
84 | <SubType>Code</SubType> | 84 | <SubType>Code</SubType> |
85 | </Compile> | 85 | </Compile> |
86 | <Compile Include="BlockingQueue.cs"> | 86 | <Compile Include="BlockingQueue.cs"> |
87 | <SubType>Code</SubType> | 87 | <SubType>Code</SubType> |
88 | </Compile> | 88 | </Compile> |
89 | <Compile Include="HeightMapGenHills.cs"> | 89 | <Compile Include="HeightMapGenHills.cs"> |
90 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
91 | </Compile> | 91 | </Compile> |
92 | <Compile Include="IAssetServer.cs"> | 92 | <Compile Include="IAssetServer.cs"> |
93 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
94 | </Compile> | 94 | </Compile> |
95 | <Compile Include="IConfig.cs"> | 95 | <Compile Include="IConfig.cs"> |
96 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
97 | </Compile> | 97 | </Compile> |
98 | <Compile Include="IGridServer.cs"> | 98 | <Compile Include="IGridServer.cs"> |
99 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
100 | </Compile> | 100 | </Compile> |
101 | <Compile Include="ILocalStorage.cs"> | 101 | <Compile Include="ILocalStorage.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
104 | <Compile Include="IUserServer.cs"> | 104 | <Compile Include="IUserServer.cs"> |
105 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
106 | </Compile> | 106 | </Compile> |
107 | <Compile Include="LocalGridBase.cs"> | 107 | <Compile Include="LocalGridBase.cs"> |
108 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
109 | </Compile> | 109 | </Compile> |
110 | <Compile Include="Login.cs"> | 110 | <Compile Include="Login.cs"> |
111 | <SubType>Code</SubType> | 111 | <SubType>Code</SubType> |
112 | </Compile> | 112 | </Compile> |
113 | <Compile Include="LoginService.cs"> | 113 | <Compile Include="LoginService.cs"> |
114 | <SubType>Code</SubType> | 114 | <SubType>Code</SubType> |
115 | </Compile> | 115 | </Compile> |
116 | <Compile Include="NeighbourInfo.cs"> | 116 | <Compile Include="NeighbourInfo.cs"> |
117 | <SubType>Code</SubType> | 117 | <SubType>Code</SubType> |
118 | </Compile> | 118 | </Compile> |
119 | <Compile Include="PrimData.cs"> | 119 | <Compile Include="PrimData.cs"> |
120 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
121 | </Compile> | 121 | </Compile> |
122 | <Compile Include="RemoteGridBase.cs"> | 122 | <Compile Include="RemoteGridBase.cs"> |
123 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
124 | </Compile> | 124 | </Compile> |
125 | <Compile Include="SimProfile.cs"> | 125 | <Compile Include="SimProfile.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="SimProfileBase.cs"> | 128 | <Compile Include="SimProfileBase.cs"> |
129 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
130 | </Compile> | 130 | </Compile> |
131 | <Compile Include="UserProfile.cs"> | 131 | <Compile Include="UserProfile.cs"> |
132 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
133 | </Compile> | 133 | </Compile> |
134 | <Compile Include="UserProfileManager.cs"> | 134 | <Compile Include="UserProfileManager.cs"> |
135 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
136 | </Compile> | 136 | </Compile> |
137 | <Compile Include="UserProfileManagerBase.cs"> | 137 | <Compile Include="UserProfileManagerBase.cs"> |
138 | <SubType>Code</SubType> | 138 | <SubType>Code</SubType> |
139 | </Compile> | 139 | </Compile> |
140 | <Compile Include="Util.cs"> | 140 | <Compile Include="Util.cs"> |
141 | <SubType>Code</SubType> | 141 | <SubType>Code</SubType> |
142 | </Compile> | 142 | </Compile> |
143 | <Compile Include="Properties\AssemblyInfo.cs"> | 143 | <Compile Include="Properties/AssemblyInfo.cs"> |
144 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
145 | </Compile> | 145 | </Compile> |
146 | </ItemGroup> | 146 | </ItemGroup> |
147 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 147 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
148 | <PropertyGroup> | 148 | <PropertyGroup> |
149 | <PreBuildEvent> | 149 | <PreBuildEvent> |
150 | </PreBuildEvent> | 150 | </PreBuildEvent> |
151 | <PostBuildEvent> | 151 | <PostBuildEvent> |
152 | </PostBuildEvent> | 152 | </PostBuildEvent> |
153 | </PropertyGroup> | 153 | </PropertyGroup> |
154 | </Project> | 154 | </Project> |
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build index 79bbf05..a5ec58c 100644 --- a/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -1,63 +1,63 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Framework" default="build"> | 2 | <project name="OpenSim.Framework" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentCiruitData.cs" /> | 14 | <include name="AgentCiruitData.cs" /> |
15 | <include name="AgentInventory.cs" /> | 15 | <include name="AgentInventory.cs" /> |
16 | <include name="AssetBase.cs" /> | 16 | <include name="AssetBase.cs" /> |
17 | <include name="BlockingQueue.cs" /> | 17 | <include name="BlockingQueue.cs" /> |
18 | <include name="HeightMapGenHills.cs" /> | 18 | <include name="HeightMapGenHills.cs" /> |
19 | <include name="IAssetServer.cs" /> | 19 | <include name="IAssetServer.cs" /> |
20 | <include name="IConfig.cs" /> | 20 | <include name="IConfig.cs" /> |
21 | <include name="IGridServer.cs" /> | 21 | <include name="IGridServer.cs" /> |
22 | <include name="ILocalStorage.cs" /> | 22 | <include name="ILocalStorage.cs" /> |
23 | <include name="IUserServer.cs" /> | 23 | <include name="IUserServer.cs" /> |
24 | <include name="LocalGridBase.cs" /> | 24 | <include name="LocalGridBase.cs" /> |
25 | <include name="Login.cs" /> | 25 | <include name="Login.cs" /> |
26 | <include name="LoginService.cs" /> | 26 | <include name="LoginService.cs" /> |
27 | <include name="NeighbourInfo.cs" /> | 27 | <include name="NeighbourInfo.cs" /> |
28 | <include name="PrimData.cs" /> | 28 | <include name="PrimData.cs" /> |
29 | <include name="RemoteGridBase.cs" /> | 29 | <include name="RemoteGridBase.cs" /> |
30 | <include name="SimProfile.cs" /> | 30 | <include name="SimProfile.cs" /> |
31 | <include name="SimProfileBase.cs" /> | 31 | <include name="SimProfileBase.cs" /> |
32 | <include name="UserProfile.cs" /> | 32 | <include name="UserProfile.cs" /> |
33 | <include name="UserProfileManager.cs" /> | 33 | <include name="UserProfileManager.cs" /> |
34 | <include name="UserProfileManagerBase.cs" /> | 34 | <include name="UserProfileManagerBase.cs" /> |
35 | <include name="Util.cs" /> | 35 | <include name="Util.cs" /> |
36 | <include name="Properties/AssemblyInfo.cs" /> | 36 | <include name="Properties/AssemblyInfo.cs" /> |
37 | </sources> | 37 | </sources> |
38 | <references basedir="${project::get-base-directory()}"> | 38 | <references basedir="${project::get-base-directory()}"> |
39 | <lib> | 39 | <lib> |
40 | <include name="${project::get-base-directory()}" /> | 40 | <include name="${project::get-base-directory()}" /> |
41 | <include name="${project::get-base-directory()}/${build.dir}" /> | 41 | <include name="${project::get-base-directory()}/${build.dir}" /> |
42 | </lib> | 42 | </lib> |
43 | <include name="System.dll" /> | 43 | <include name="System.dll" /> |
44 | <include name="System.Xml.dll" /> | 44 | <include name="System.Xml.dll" /> |
45 | <include name="../bin/libsecondlife.dll" /> | 45 | <include name="../bin/libsecondlife.dll" /> |
46 | </references> | 46 | </references> |
47 | </csc> | 47 | </csc> |
48 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 48 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
49 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 49 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
50 | <copy todir="${project::get-base-directory()}/../bin/"> | 50 | <copy todir="${project::get-base-directory()}/../bin/"> |
51 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 51 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
52 | <include name="*.dll"/> | 52 | <include name="*.dll"/> |
53 | <include name="*.exe"/> | 53 | <include name="*.exe"/> |
54 | </fileset> | 54 | </fileset> |
55 | </copy> | 55 | </copy> |
56 | </target> | 56 | </target> |
57 | <target name="clean"> | 57 | <target name="clean"> |
58 | <delete dir="${bin.dir}" failonerror="false" /> | 58 | <delete dir="${bin.dir}" failonerror="false" /> |
59 | <delete dir="${obj.dir}" failonerror="false" /> | 59 | <delete dir="${obj.dir}" failonerror="false" /> |
60 | </target> | 60 | </target> |
61 | <target name="doc" description="Creates documentation."> | 61 | <target name="doc" description="Creates documentation."> |
62 | </target> | 62 | </target> |
63 | </project> | 63 | </project> |
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj index 1aec5aa..4f85820 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj | |||
@@ -1,110 +1,110 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{546099CD-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{A86B5F7E-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.GridInterfaces.Local</AssemblyName> | 12 | <AssemblyName>OpenSim.GridInterfaces.Local</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.GridInterfaces.Local</RootNamespace> | 19 | <RootNamespace>OpenSim.GridInterfaces.Local</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\..\bin\</OutputPath> | 35 | <OutputPath>../../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>../../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Xml" > | 65 | <Reference Include="System.Xml" > |
66 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="Db4objects.Db4o.dll" > | 69 | <Reference Include="Db4objects.Db4o.dll" > |
70 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 70 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | </ItemGroup> | 77 | </ItemGroup> |
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | 79 | <ProjectReference Include="../../OpenSim.Framework/OpenSim.Framework.csproj"> |
80 | <Name>OpenSim.Framework</Name> | 80 | <Name>OpenSim.Framework</Name> |
81 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 81 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> |
82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
83 | <Private>False</Private> | 83 | <Private>False</Private> |
84 | </ProjectReference> | 84 | </ProjectReference> |
85 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 85 | <ProjectReference Include="../../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> |
86 | <Name>OpenSim.Framework.Console</Name> | 86 | <Name>OpenSim.Framework.Console</Name> |
87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 87 | <Project>{16759386-0000-0000-0000-000000000000}</Project> |
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
89 | <Private>False</Private> | 89 | <Private>False</Private> |
90 | </ProjectReference> | 90 | </ProjectReference> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
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="LocalAssetServer.cs"> | 96 | <Compile Include="LocalAssetServer.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="LocalGridServer.cs"> | 99 | <Compile Include="LocalGridServer.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | </ItemGroup> | 102 | </ItemGroup> |
103 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 103 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
104 | <PropertyGroup> | 104 | <PropertyGroup> |
105 | <PreBuildEvent> | 105 | <PreBuildEvent> |
106 | </PreBuildEvent> | 106 | </PreBuildEvent> |
107 | <PostBuildEvent> | 107 | <PostBuildEvent> |
108 | </PostBuildEvent> | 108 | </PostBuildEvent> |
109 | </PropertyGroup> | 109 | </PropertyGroup> |
110 | </Project> | 110 | </Project> |
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build index 6bf398e..c7a1966 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.GridInterfaces.Local" default="build"> | 2 | <project name="OpenSim.GridInterfaces.Local" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="LocalAssetServer.cs" /> | 15 | <include name="LocalAssetServer.cs" /> |
16 | <include name="LocalGridServer.cs" /> | 16 | <include name="LocalGridServer.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../../bin/libsecondlife.dll" /> | 26 | <include name="../../bin/libsecondlife.dll" /> |
27 | <include name="../../bin/OpenSim.Framework.dll" /> | 27 | <include name="../../bin/OpenSim.Framework.dll" /> |
28 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj index 2b80456..b23cb1d 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj | |||
@@ -1,106 +1,106 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{B55C0B5D-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{6EB57A93-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.GridInterfaces.Remote</AssemblyName> | 12 | <AssemblyName>OpenSim.GridInterfaces.Remote</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.GridInterfaces.Remote</RootNamespace> | 19 | <RootNamespace>OpenSim.GridInterfaces.Remote</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\..\bin\</OutputPath> | 35 | <OutputPath>../../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>../../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Xml" > | 65 | <Reference Include="System.Xml" > |
66 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="libsecondlife.dll" > | 69 | <Reference Include="libsecondlife.dll" > |
70 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | </ItemGroup> | 73 | </ItemGroup> |
74 | <ItemGroup> | 74 | <ItemGroup> |
75 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | 75 | <ProjectReference Include="../../OpenSim.Framework/OpenSim.Framework.csproj"> |
76 | <Name>OpenSim.Framework</Name> | 76 | <Name>OpenSim.Framework</Name> |
77 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 77 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </ProjectReference> | 80 | </ProjectReference> |
81 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 81 | <ProjectReference Include="../../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> |
82 | <Name>OpenSim.Framework.Console</Name> | 82 | <Name>OpenSim.Framework.Console</Name> |
83 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 83 | <Project>{16759386-0000-0000-0000-000000000000}</Project> |
84 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 84 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
85 | <Private>False</Private> | 85 | <Private>False</Private> |
86 | </ProjectReference> | 86 | </ProjectReference> |
87 | </ItemGroup> | 87 | </ItemGroup> |
88 | <ItemGroup> | 88 | <ItemGroup> |
89 | <Compile Include="AssemblyInfo.cs"> | 89 | <Compile Include="AssemblyInfo.cs"> |
90 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
91 | </Compile> | 91 | </Compile> |
92 | <Compile Include="RemoteAssetServer.cs"> | 92 | <Compile Include="RemoteAssetServer.cs"> |
93 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
94 | </Compile> | 94 | </Compile> |
95 | <Compile Include="RemoteGridServer.cs"> | 95 | <Compile Include="RemoteGridServer.cs"> |
96 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
97 | </Compile> | 97 | </Compile> |
98 | </ItemGroup> | 98 | </ItemGroup> |
99 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 99 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
100 | <PropertyGroup> | 100 | <PropertyGroup> |
101 | <PreBuildEvent> | 101 | <PreBuildEvent> |
102 | </PreBuildEvent> | 102 | </PreBuildEvent> |
103 | <PostBuildEvent> | 103 | <PostBuildEvent> |
104 | </PostBuildEvent> | 104 | </PostBuildEvent> |
105 | </PropertyGroup> | 105 | </PropertyGroup> |
106 | </Project> | 106 | </Project> |
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build index dd6db18..4788f32 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build | |||
@@ -1,45 +1,45 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.GridInterfaces.Remote" default="build"> | 2 | <project name="OpenSim.GridInterfaces.Remote" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="RemoteAssetServer.cs" /> | 15 | <include name="RemoteAssetServer.cs" /> |
16 | <include name="RemoteGridServer.cs" /> | 16 | <include name="RemoteGridServer.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/libsecondlife.dll" /> | 25 | <include name="../../bin/libsecondlife.dll" /> |
26 | <include name="../../bin/OpenSim.Framework.dll" /> | 26 | <include name="../../bin/OpenSim.Framework.dll" /> |
27 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
28 | </references> | 28 | </references> |
29 | </csc> | 29 | </csc> |
30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 30 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
31 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 31 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
32 | <copy todir="${project::get-base-directory()}/../../bin/"> | 32 | <copy todir="${project::get-base-directory()}/../../bin/"> |
33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 33 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
34 | <include name="*.dll"/> | 34 | <include name="*.dll"/> |
35 | <include name="*.exe"/> | 35 | <include name="*.exe"/> |
36 | </fileset> | 36 | </fileset> |
37 | </copy> | 37 | </copy> |
38 | </target> | 38 | </target> |
39 | <target name="clean"> | 39 | <target name="clean"> |
40 | <delete dir="${bin.dir}" failonerror="false" /> | 40 | <delete dir="${bin.dir}" failonerror="false" /> |
41 | <delete dir="${obj.dir}" failonerror="false" /> | 41 | <delete dir="${obj.dir}" failonerror="false" /> |
42 | </target> | 42 | </target> |
43 | <target name="doc" description="Creates documentation."> | 43 | <target name="doc" description="Creates documentation."> |
44 | </target> | 44 | </target> |
45 | </project> | 45 | </project> |
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj index 6d5b4d0..b4fc5ed 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj | |||
@@ -1,93 +1,93 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{4F874463-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{43258694-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Physics.BasicPhysicsPlugin</AssemblyName> | 12 | <AssemblyName>OpenSim.Physics.BasicPhysicsPlugin</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Physics.BasicPhysicsPlugin</RootNamespace> | 19 | <RootNamespace>OpenSim.Physics.BasicPhysicsPlugin</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\..\bin\Physics\</OutputPath> | 35 | <OutputPath>../../bin/Physics/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\..\bin\Physics\</OutputPath> | 53 | <OutputPath>../../bin/Physics/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="Axiom.MathLib.dll" > | 65 | <Reference Include="Axiom.MathLib.dll" > |
66 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> | 66 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | </ItemGroup> | 69 | </ItemGroup> |
70 | <ItemGroup> | 70 | <ItemGroup> |
71 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> | 71 | <ProjectReference Include="../Manager/OpenSim.Physics.Manager.csproj"> |
72 | <Name>OpenSim.Physics.Manager</Name> | 72 | <Name>OpenSim.Physics.Manager</Name> |
73 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 73 | <Project>{DA1FDCE5-0000-0000-0000-000000000000}</Project> |
74 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 74 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </ProjectReference> | 76 | </ProjectReference> |
77 | </ItemGroup> | 77 | </ItemGroup> |
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | <Compile Include="AssemblyInfo.cs"> | 79 | <Compile Include="AssemblyInfo.cs"> |
80 | <SubType>Code</SubType> | 80 | <SubType>Code</SubType> |
81 | </Compile> | 81 | </Compile> |
82 | <Compile Include="BasicPhysicsPlugin.cs"> | 82 | <Compile Include="BasicPhysicsPlugin.cs"> |
83 | <SubType>Code</SubType> | 83 | <SubType>Code</SubType> |
84 | </Compile> | 84 | </Compile> |
85 | </ItemGroup> | 85 | </ItemGroup> |
86 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 86 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
87 | <PropertyGroup> | 87 | <PropertyGroup> |
88 | <PreBuildEvent> | 88 | <PreBuildEvent> |
89 | </PreBuildEvent> | 89 | </PreBuildEvent> |
90 | <PostBuildEvent> | 90 | <PostBuildEvent> |
91 | </PostBuildEvent> | 91 | </PostBuildEvent> |
92 | </PropertyGroup> | 92 | </PropertyGroup> |
93 | </Project> | 93 | </Project> |
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build index 3497a55..7b063a3 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build | |||
@@ -1,42 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.BasicPhysicsPlugin" default="build"> | 2 | <project name="OpenSim.Physics.BasicPhysicsPlugin" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="BasicPhysicsPlugin.cs" /> | 15 | <include name="BasicPhysicsPlugin.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../../bin/Axiom.MathLib.dll" /> | 23 | <include name="../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> | 24 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> |
25 | </references> | 25 | </references> |
26 | </csc> | 26 | </csc> |
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> | 27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> |
28 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> | 28 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> |
29 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> | 29 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> |
30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
31 | <include name="*.dll"/> | 31 | <include name="*.dll"/> |
32 | <include name="*.exe"/> | 32 | <include name="*.exe"/> |
33 | </fileset> | 33 | </fileset> |
34 | </copy> | 34 | </copy> |
35 | </target> | 35 | </target> |
36 | <target name="clean"> | 36 | <target name="clean"> |
37 | <delete dir="${bin.dir}" failonerror="false" /> | 37 | <delete dir="${bin.dir}" failonerror="false" /> |
38 | <delete dir="${obj.dir}" failonerror="false" /> | 38 | <delete dir="${obj.dir}" failonerror="false" /> |
39 | </target> | 39 | </target> |
40 | <target name="doc" description="Creates documentation."> | 40 | <target name="doc" description="Creates documentation."> |
41 | </target> | 41 | </target> |
42 | </project> | 42 | </project> |
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj index 294e005..5d88b1c 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj | |||
@@ -1,112 +1,112 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{8BE16150-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{DA1FDCE5-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Physics.Manager</AssemblyName> | 12 | <AssemblyName>OpenSim.Physics.Manager</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Physics.Manager</RootNamespace> | 19 | <RootNamespace>OpenSim.Physics.Manager</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\..\bin\</OutputPath> | 35 | <OutputPath>../../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>../../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Xml" > | 65 | <Reference Include="System.Xml" > |
66 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="Axiom.MathLib.dll" > | 69 | <Reference Include="Axiom.MathLib.dll" > |
70 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> | 70 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | </ItemGroup> | 73 | </ItemGroup> |
74 | <ItemGroup> | 74 | <ItemGroup> |
75 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | 75 | <ProjectReference Include="../../OpenSim.Framework/OpenSim.Framework.csproj"> |
76 | <Name>OpenSim.Framework</Name> | 76 | <Name>OpenSim.Framework</Name> |
77 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 77 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </ProjectReference> | 80 | </ProjectReference> |
81 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 81 | <ProjectReference Include="../../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> |
82 | <Name>OpenSim.Framework.Console</Name> | 82 | <Name>OpenSim.Framework.Console</Name> |
83 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 83 | <Project>{16759386-0000-0000-0000-000000000000}</Project> |
84 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 84 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
85 | <Private>False</Private> | 85 | <Private>False</Private> |
86 | </ProjectReference> | 86 | </ProjectReference> |
87 | </ItemGroup> | 87 | </ItemGroup> |
88 | <ItemGroup> | 88 | <ItemGroup> |
89 | <Compile Include="AssemblyInfo.cs"> | 89 | <Compile Include="AssemblyInfo.cs"> |
90 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
91 | </Compile> | 91 | </Compile> |
92 | <Compile Include="PhysicsActor.cs"> | 92 | <Compile Include="PhysicsActor.cs"> |
93 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
94 | </Compile> | 94 | </Compile> |
95 | <Compile Include="PhysicsManager.cs"> | 95 | <Compile Include="PhysicsManager.cs"> |
96 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
97 | </Compile> | 97 | </Compile> |
98 | <Compile Include="PhysicsScene.cs"> | 98 | <Compile Include="PhysicsScene.cs"> |
99 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
100 | </Compile> | 100 | </Compile> |
101 | <Compile Include="PhysicsVector.cs"> | 101 | <Compile Include="PhysicsVector.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
104 | </ItemGroup> | 104 | </ItemGroup> |
105 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 105 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
106 | <PropertyGroup> | 106 | <PropertyGroup> |
107 | <PreBuildEvent> | 107 | <PreBuildEvent> |
108 | </PreBuildEvent> | 108 | </PreBuildEvent> |
109 | <PostBuildEvent> | 109 | <PostBuildEvent> |
110 | </PostBuildEvent> | 110 | </PostBuildEvent> |
111 | </PropertyGroup> | 111 | </PropertyGroup> |
112 | </Project> | 112 | </Project> |
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 4b5ee51..1554485 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build | |||
@@ -1,47 +1,47 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.Manager" default="build"> | 2 | <project name="OpenSim.Physics.Manager" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="PhysicsActor.cs" /> | 15 | <include name="PhysicsActor.cs" /> |
16 | <include name="PhysicsManager.cs" /> | 16 | <include name="PhysicsManager.cs" /> |
17 | <include name="PhysicsScene.cs" /> | 17 | <include name="PhysicsScene.cs" /> |
18 | <include name="PhysicsVector.cs" /> | 18 | <include name="PhysicsVector.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |
22 | <include name="${project::get-base-directory()}" /> | 22 | <include name="${project::get-base-directory()}" /> |
23 | <include name="${project::get-base-directory()}/${build.dir}" /> | 23 | <include name="${project::get-base-directory()}/${build.dir}" /> |
24 | </lib> | 24 | </lib> |
25 | <include name="System.dll" /> | 25 | <include name="System.dll" /> |
26 | <include name="System.Xml.dll" /> | 26 | <include name="System.Xml.dll" /> |
27 | <include name="../../bin/Axiom.MathLib.dll" /> | 27 | <include name="../../bin/Axiom.MathLib.dll" /> |
28 | <include name="../../bin/OpenSim.Framework.dll" /> | 28 | <include name="../../bin/OpenSim.Framework.dll" /> |
29 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 29 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
30 | </references> | 30 | </references> |
31 | </csc> | 31 | </csc> |
32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 32 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 33 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
34 | <copy todir="${project::get-base-directory()}/../../bin/"> | 34 | <copy todir="${project::get-base-directory()}/../../bin/"> |
35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 35 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
36 | <include name="*.dll"/> | 36 | <include name="*.dll"/> |
37 | <include name="*.exe"/> | 37 | <include name="*.exe"/> |
38 | </fileset> | 38 | </fileset> |
39 | </copy> | 39 | </copy> |
40 | </target> | 40 | </target> |
41 | <target name="clean"> | 41 | <target name="clean"> |
42 | <delete dir="${bin.dir}" failonerror="false" /> | 42 | <delete dir="${bin.dir}" failonerror="false" /> |
43 | <delete dir="${obj.dir}" failonerror="false" /> | 43 | <delete dir="${obj.dir}" failonerror="false" /> |
44 | </target> | 44 | </target> |
45 | <target name="doc" description="Creates documentation."> | 45 | <target name="doc" description="Creates documentation."> |
46 | </target> | 46 | </target> |
47 | </project> | 47 | </project> |
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj index 68f1aa1..d69a467 100644 --- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj +++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj | |||
@@ -1,97 +1,97 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{63A05FE9-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{38FBC3BB-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Physics.OdePlugin</AssemblyName> | 12 | <AssemblyName>OpenSim.Physics.OdePlugin</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Physics.OdePlugin</RootNamespace> | 19 | <RootNamespace>OpenSim.Physics.OdePlugin</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\..\bin\Physics\</OutputPath> | 35 | <OutputPath>../../bin/Physics/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\..\bin\Physics\</OutputPath> | 53 | <OutputPath>../../bin/Physics/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="Axiom.MathLib.dll" > | 65 | <Reference Include="Axiom.MathLib.dll" > |
66 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> | 66 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="Ode.NET.dll" > | 69 | <Reference Include="Ode.NET.dll" > |
70 | <HintPath>..\..\bin\Ode.NET.dll</HintPath> | 70 | <HintPath>..\..\bin\Ode.NET.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | </ItemGroup> | 73 | </ItemGroup> |
74 | <ItemGroup> | 74 | <ItemGroup> |
75 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> | 75 | <ProjectReference Include="../Manager/OpenSim.Physics.Manager.csproj"> |
76 | <Name>OpenSim.Physics.Manager</Name> | 76 | <Name>OpenSim.Physics.Manager</Name> |
77 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 77 | <Project>{DA1FDCE5-0000-0000-0000-000000000000}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </ProjectReference> | 80 | </ProjectReference> |
81 | </ItemGroup> | 81 | </ItemGroup> |
82 | <ItemGroup> | 82 | <ItemGroup> |
83 | <Compile Include="AssemblyInfo.cs"> | 83 | <Compile Include="AssemblyInfo.cs"> |
84 | <SubType>Code</SubType> | 84 | <SubType>Code</SubType> |
85 | </Compile> | 85 | </Compile> |
86 | <Compile Include="OdePlugin.cs"> | 86 | <Compile Include="OdePlugin.cs"> |
87 | <SubType>Code</SubType> | 87 | <SubType>Code</SubType> |
88 | </Compile> | 88 | </Compile> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 90 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
91 | <PropertyGroup> | 91 | <PropertyGroup> |
92 | <PreBuildEvent> | 92 | <PreBuildEvent> |
93 | </PreBuildEvent> | 93 | </PreBuildEvent> |
94 | <PostBuildEvent> | 94 | <PostBuildEvent> |
95 | </PostBuildEvent> | 95 | </PostBuildEvent> |
96 | </PropertyGroup> | 96 | </PropertyGroup> |
97 | </Project> | 97 | </Project> |
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build index f25361a..098472a 100644 --- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build +++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.OdePlugin" default="build"> | 2 | <project name="OpenSim.Physics.OdePlugin" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="OdePlugin.cs" /> | 15 | <include name="OdePlugin.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../../bin/Axiom.MathLib.dll" /> | 23 | <include name="../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> | 24 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> |
25 | <include name="../../bin/Ode.NET.dll" /> | 25 | <include name="../../bin/Ode.NET.dll" /> |
26 | </references> | 26 | </references> |
27 | </csc> | 27 | </csc> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> |
29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> | 29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> |
30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> | 30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> |
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
32 | <include name="*.dll"/> | 32 | <include name="*.dll"/> |
33 | <include name="*.exe"/> | 33 | <include name="*.exe"/> |
34 | </fileset> | 34 | </fileset> |
35 | </copy> | 35 | </copy> |
36 | </target> | 36 | </target> |
37 | <target name="clean"> | 37 | <target name="clean"> |
38 | <delete dir="${bin.dir}" failonerror="false" /> | 38 | <delete dir="${bin.dir}" failonerror="false" /> |
39 | <delete dir="${obj.dir}" failonerror="false" /> | 39 | <delete dir="${obj.dir}" failonerror="false" /> |
40 | </target> | 40 | </target> |
41 | <target name="doc" description="Creates documentation."> | 41 | <target name="doc" description="Creates documentation."> |
42 | </target> | 42 | </target> |
43 | </project> | 43 | </project> |
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj index efe9c79..d5bc3ef 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj | |||
@@ -1,97 +1,97 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{988F0AC4-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{B771F391-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Physics.PhysXPlugin</AssemblyName> | 12 | <AssemblyName>OpenSim.Physics.PhysXPlugin</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Physics.PhysXPlugin</RootNamespace> | 19 | <RootNamespace>OpenSim.Physics.PhysXPlugin</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\..\bin\Physics\</OutputPath> | 35 | <OutputPath>../../bin/Physics/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\..\bin\Physics\</OutputPath> | 53 | <OutputPath>../../bin/Physics/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="Axiom.MathLib.dll" > | 65 | <Reference Include="Axiom.MathLib.dll" > |
66 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> | 66 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="PhysX_Wrapper_Dotnet.dll" > | 69 | <Reference Include="PhysX_Wrapper_Dotnet.dll" > |
70 | <HintPath>..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath> | 70 | <HintPath>..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | </ItemGroup> | 73 | </ItemGroup> |
74 | <ItemGroup> | 74 | <ItemGroup> |
75 | <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> | 75 | <ProjectReference Include="../Manager/OpenSim.Physics.Manager.csproj"> |
76 | <Name>OpenSim.Physics.Manager</Name> | 76 | <Name>OpenSim.Physics.Manager</Name> |
77 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 77 | <Project>{DA1FDCE5-0000-0000-0000-000000000000}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </ProjectReference> | 80 | </ProjectReference> |
81 | </ItemGroup> | 81 | </ItemGroup> |
82 | <ItemGroup> | 82 | <ItemGroup> |
83 | <Compile Include="AssemblyInfo.cs"> | 83 | <Compile Include="AssemblyInfo.cs"> |
84 | <SubType>Code</SubType> | 84 | <SubType>Code</SubType> |
85 | </Compile> | 85 | </Compile> |
86 | <Compile Include="PhysXPlugin.cs"> | 86 | <Compile Include="PhysXPlugin.cs"> |
87 | <SubType>Code</SubType> | 87 | <SubType>Code</SubType> |
88 | </Compile> | 88 | </Compile> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 90 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
91 | <PropertyGroup> | 91 | <PropertyGroup> |
92 | <PreBuildEvent> | 92 | <PreBuildEvent> |
93 | </PreBuildEvent> | 93 | </PreBuildEvent> |
94 | <PostBuildEvent> | 94 | <PostBuildEvent> |
95 | </PostBuildEvent> | 95 | </PostBuildEvent> |
96 | </PropertyGroup> | 96 | </PropertyGroup> |
97 | </Project> | 97 | </Project> |
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build index 5ab70bb..3ae7013 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build | |||
@@ -1,43 +1,43 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Physics.PhysXPlugin" default="build"> | 2 | <project name="OpenSim.Physics.PhysXPlugin" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="PhysXPlugin.cs" /> | 15 | <include name="PhysXPlugin.cs" /> |
16 | </sources> | 16 | </sources> |
17 | <references basedir="${project::get-base-directory()}"> | 17 | <references basedir="${project::get-base-directory()}"> |
18 | <lib> | 18 | <lib> |
19 | <include name="${project::get-base-directory()}" /> | 19 | <include name="${project::get-base-directory()}" /> |
20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
21 | </lib> | 21 | </lib> |
22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
23 | <include name="../../bin/Axiom.MathLib.dll" /> | 23 | <include name="../../bin/Axiom.MathLib.dll" /> |
24 | <include name="../../bin/PhysX_Wrapper_Dotnet.dll" /> | 24 | <include name="../../bin/PhysX_Wrapper_Dotnet.dll" /> |
25 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> | 25 | <include name="../../bin/OpenSim.Physics.Manager.dll" /> |
26 | </references> | 26 | </references> |
27 | </csc> | 27 | </csc> |
28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> | 28 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> |
29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> | 29 | <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> |
30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> | 30 | <copy todir="${project::get-base-directory()}/../../bin/Physics/"> |
31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 31 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
32 | <include name="*.dll"/> | 32 | <include name="*.dll"/> |
33 | <include name="*.exe"/> | 33 | <include name="*.exe"/> |
34 | </fileset> | 34 | </fileset> |
35 | </copy> | 35 | </copy> |
36 | </target> | 36 | </target> |
37 | <target name="clean"> | 37 | <target name="clean"> |
38 | <delete dir="${bin.dir}" failonerror="false" /> | 38 | <delete dir="${bin.dir}" failonerror="false" /> |
39 | <delete dir="${obj.dir}" failonerror="false" /> | 39 | <delete dir="${obj.dir}" failonerror="false" /> |
40 | </target> | 40 | </target> |
41 | <target name="doc" description="Creates documentation."> | 41 | <target name="doc" description="Creates documentation."> |
42 | </target> | 42 | </target> |
43 | </project> | 43 | </project> |
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index df66b48..7841e96 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -1,192 +1,186 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{58019DB8-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | 10 | <AssemblyKeyContainerName> |
11 | <AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 12 | <AssemblyName>OpenSim.RegionServer</AssemblyName> |
13 | <AssemblyName>OpenSim.RegionServer</AssemblyName> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultClientScript>JScript</DefaultClientScript> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 16 | <DelaySign>false</DelaySign> |
17 | <DelaySign>false</DelaySign> | 17 | <OutputType>Library</OutputType> |
18 | <OutputType>Library</OutputType> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <AppDesignerFolder> | 19 | <RootNamespace>OpenSim.RegionServer</RootNamespace> |
20 | </AppDesignerFolder> | 20 | <StartupObject></StartupObject> |
21 | <RootNamespace>OpenSim.RegionServer</RootNamespace> | 21 | <FileUpgradeFlags> |
22 | <StartupObject> | 22 | </FileUpgradeFlags> |
23 | </StartupObject> | 23 | </PropertyGroup> |
24 | <FileUpgradeFlags> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | </FileUpgradeFlags> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | </PropertyGroup> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 28 | <ConfigurationOverrideFile> |
29 | <BaseAddress>285212672</BaseAddress> | 29 | </ConfigurationOverrideFile> |
30 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <ConfigurationOverrideFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | </ConfigurationOverrideFile> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <DocumentationFile> | 34 | <Optimize>True</Optimize> |
35 | </DocumentationFile> | 35 | <OutputPath>../bin/</OutputPath> |
36 | <DebugSymbols>True</DebugSymbols> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <FileAlignment>4096</FileAlignment> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <Optimize>False</Optimize> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <OutputPath>..\bin\</OutputPath> | 39 | <WarningLevel>4</WarningLevel> |
40 | <RegisterForComInterop>False</RegisterForComInterop> | 40 | <NoWarn></NoWarn> |
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 41 | </PropertyGroup> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <WarningLevel>4</WarningLevel> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <NoWarn> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | </NoWarn> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | </PropertyGroup> | 46 | <ConfigurationOverrideFile> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 47 | </ConfigurationOverrideFile> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <BaseAddress>285212672</BaseAddress> | 49 | <DocumentationFile></DocumentationFile> |
50 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <ConfigurationOverrideFile> | 51 | <FileAlignment>4096</FileAlignment> |
52 | </ConfigurationOverrideFile> | 52 | <Optimize>False</Optimize> |
53 | <DefineConstants>TRACE</DefineConstants> | 53 | <OutputPath>../bin/</OutputPath> |
54 | <DocumentationFile> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | </DocumentationFile> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <DebugSymbols>False</DebugSymbols> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <FileAlignment>4096</FileAlignment> | 57 | <WarningLevel>4</WarningLevel> |
58 | <Optimize>True</Optimize> | 58 | <NoWarn></NoWarn> |
59 | <OutputPath>..\bin\</OutputPath> | 59 | </PropertyGroup> |
60 | <RegisterForComInterop>False</RegisterForComInterop> | 60 | <ItemGroup> |
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 61 | <Reference Include="System" > |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 62 | <HintPath>System.dll</HintPath> |
63 | <WarningLevel>4</WarningLevel> | 63 | <Private>False</Private> |
64 | <NoWarn> | 64 | </Reference> |
65 | </NoWarn> | 65 | <Reference Include="System.Xml" > |
66 | </PropertyGroup> | 66 | <HintPath>System.Xml.dll</HintPath> |
67 | <ItemGroup> | 67 | <Private>False</Private> |
68 | <Reference Include="System"> | 68 | </Reference> |
69 | <HintPath>System.dll</HintPath> | 69 | <Reference Include="libsecondlife.dll" > |
70 | <Private>False</Private> | 70 | <HintPath>..\bin\libsecondlife.dll</HintPath> |
71 | </Reference> | 71 | <Private>False</Private> |
72 | <Reference Include="System.Data" /> | 72 | </Reference> |
73 | <Reference Include="System.Xml"> | 73 | <Reference Include="Axiom.MathLib.dll" > |
74 | <HintPath>System.Xml.dll</HintPath> | 74 | <HintPath>..\bin\Axiom.MathLib.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | <Reference Include="libsecondlife.dll"> | 77 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 78 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </Reference> | 80 | </Reference> |
81 | <Reference Include="Axiom.MathLib.dll"> | 81 | </ItemGroup> |
82 | <HintPath>..\bin\Axiom.MathLib.dll</HintPath> | 82 | <ItemGroup> |
83 | <Private>False</Private> | 83 | <ProjectReference Include="../OpenSim.Framework/OpenSim.Framework.csproj"> |
84 | </Reference> | 84 | <Name>OpenSim.Framework</Name> |
85 | <Reference Include="Db4objects.Db4o.dll"> | 85 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> |
86 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
87 | <Private>False</Private> | 87 | <Private>False</Private> |
88 | </Reference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | <ProjectReference Include="../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> |
90 | <ItemGroup> | 90 | <Name>OpenSim.Framework.Console</Name> |
91 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | 91 | <Project>{16759386-0000-0000-0000-000000000000}</Project> |
92 | <Name>OpenSim.Framework</Name> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 93 | <Private>False</Private> |
94 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 94 | </ProjectReference> |
95 | <Private>False</Private> | 95 | <ProjectReference Include="../OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj"> |
96 | </ProjectReference> | 96 | <Name>OpenSim.Physics.Manager</Name> |
97 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 97 | <Project>{DA1FDCE5-0000-0000-0000-000000000000}</Project> |
98 | <Name>OpenSim.Framework.Console</Name> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
99 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 99 | <Private>False</Private> |
100 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 100 | </ProjectReference> |
101 | <Private>False</Private> | 101 | <ProjectReference Include="../Servers/OpenSim.Servers.csproj"> |
102 | </ProjectReference> | 102 | <Name>OpenSim.Servers</Name> |
103 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 103 | <Project>{111F9E8F-0000-0000-0000-000000000000}</Project> |
104 | <Name>OpenSim.Physics.Manager</Name> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
105 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 105 | <Private>False</Private> |
106 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 106 | </ProjectReference> |
107 | <Private>False</Private> | 107 | </ItemGroup> |
108 | </ProjectReference> | 108 | <ItemGroup> |
109 | <ProjectReference Include="..\Servers\OpenSim.Servers.csproj"> | 109 | <Compile Include="AgentAssetUpload.cs"> |
110 | <Name>OpenSim.Servers</Name> | 110 | <SubType>Code</SubType> |
111 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 111 | </Compile> |
112 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 112 | <Compile Include="ConsoleCmds.cs"> |
113 | <Private>False</Private> | 113 | <SubType>Code</SubType> |
114 | </ProjectReference> | 114 | </Compile> |
115 | </ItemGroup> | 115 | <Compile Include="Grid.cs"> |
116 | <ItemGroup> | 116 | <SubType>Code</SubType> |
117 | <Compile Include="AgentAssetUpload.cs"> | 117 | </Compile> |
118 | <SubType>Code</SubType> | 118 | <Compile Include="OpenSimMain.cs"> |
119 | </Compile> | 119 | <SubType>Code</SubType> |
120 | <Compile Include="ConsoleCmds.cs"> | 120 | </Compile> |
121 | <SubType>Code</SubType> | 121 | <Compile Include="OpenSimNetworkHandler.cs"> |
122 | </Compile> | 122 | <SubType>Code</SubType> |
123 | <Compile Include="Grid.cs"> | 123 | </Compile> |
124 | <SubType>Code</SubType> | 124 | <Compile Include="PacketServer.cs"> |
125 | </Compile> | 125 | <SubType>Code</SubType> |
126 | <Compile Include="OpenSimMain.cs"> | 126 | </Compile> |
127 | <SubType>Code</SubType> | 127 | <Compile Include="QueItem.cs"> |
128 | </Compile> | 128 | <SubType>Code</SubType> |
129 | <Compile Include="OpenSimNetworkHandler.cs"> | 129 | </Compile> |
130 | <SubType>Code</SubType> | 130 | <Compile Include="SimClient.cs"> |
131 | </Compile> | 131 | <SubType>Code</SubType> |
132 | <Compile Include="PacketServer.cs" /> | 132 | </Compile> |
133 | <Compile Include="QueItem.cs"> | 133 | <Compile Include="SimConsole.cs"> |
134 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
135 | </Compile> | 135 | </Compile> |
136 | <Compile Include="SimClient.cs"> | 136 | <Compile Include="VersionInfo.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | <Compile Include="SimConsole.cs"> | 139 | <Compile Include="Assets/AssetCache.cs"> |
140 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
141 | </Compile> | 141 | </Compile> |
142 | <Compile Include="VersionInfo.cs"> | 142 | <Compile Include="Assets/InventoryCache.cs"> |
143 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
144 | </Compile> | 144 | </Compile> |
145 | <Compile Include="Assets\AssetCache.cs"> | 145 | <Compile Include="CAPS/AdminWebFront.cs"> |
146 | <SubType>Code</SubType> | 146 | <SubType>Code</SubType> |
147 | </Compile> | 147 | </Compile> |
148 | <Compile Include="Assets\InventoryCache.cs"> | 148 | <Compile Include="types/Mesh.cs"> |
149 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
150 | </Compile> | 150 | </Compile> |
151 | <Compile Include="CAPS\AdminWebFront.cs"> | 151 | <Compile Include="types/Triangle.cs"> |
152 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
153 | </Compile> | 153 | </Compile> |
154 | <Compile Include="types\Mesh.cs"> | 154 | <Compile Include="world/Avatar.cs"> |
155 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
156 | </Compile> | 156 | </Compile> |
157 | <Compile Include="types\Triangle.cs"> | 157 | <Compile Include="world/AvatarAnimations.cs"> |
158 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
159 | </Compile> | 159 | </Compile> |
160 | <Compile Include="world\Avatar.cs"> | 160 | <Compile Include="world/Entity.cs"> |
161 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
162 | </Compile> | 162 | </Compile> |
163 | <Compile Include="world\AvatarAnimations.cs"> | 163 | <Compile Include="world/Primitive.cs"> |
164 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
165 | </Compile> | 165 | </Compile> |
166 | <Compile Include="world\Entity.cs"> | 166 | <Compile Include="world/ScriptEngine.cs"> |
167 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
168 | </Compile> | 168 | </Compile> |
169 | <Compile Include="world\Primitive.cs"> | 169 | <Compile Include="world/SurfacePatch.cs"> |
170 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
171 | </Compile> | 171 | </Compile> |
172 | <Compile Include="world\ScriptEngine.cs"> | 172 | <Compile Include="world/World.cs"> |
173 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
174 | </Compile> | 174 | </Compile> |
175 | <Compile Include="world\SurfacePatch.cs"> | 175 | <Compile Include="world/scripting/IScript.cs"> |
176 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
177 | </Compile> | 177 | </Compile> |
178 | <Compile Include="world\World.cs"> | 178 | </ItemGroup> |
179 | <SubType>Code</SubType> | 179 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
180 | </Compile> | 180 | <PropertyGroup> |
181 | <Compile Include="world\scripting\IScript.cs"> | 181 | <PreBuildEvent> |
182 | <SubType>Code</SubType> | 182 | </PreBuildEvent> |
183 | </Compile> | 183 | <PostBuildEvent> |
184 | </ItemGroup> | 184 | </PostBuildEvent> |
185 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 185 | </PropertyGroup> |
186 | <PropertyGroup> | 186 | </Project> |
187 | <PreBuildEvent> | ||
188 | </PreBuildEvent> | ||
189 | <PostBuildEvent> | ||
190 | </PostBuildEvent> | ||
191 | </PropertyGroup> | ||
192 | </Project> \ No newline at end of file | ||
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 6f86970..2bb8fa9 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -1,69 +1,69 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.RegionServer" default="build"> | 2 | <project name="OpenSim.RegionServer" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.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="AgentAssetUpload.cs" /> | 14 | <include name="AgentAssetUpload.cs" /> |
15 | <include name="ConsoleCmds.cs" /> | 15 | <include name="ConsoleCmds.cs" /> |
16 | <include name="Grid.cs" /> | 16 | <include name="Grid.cs" /> |
17 | <include name="OpenSimMain.cs" /> | 17 | <include name="OpenSimMain.cs" /> |
18 | <include name="OpenSimNetworkHandler.cs" /> | 18 | <include name="OpenSimNetworkHandler.cs" /> |
19 | <include name="PacketServer.cs" /> | 19 | <include name="PacketServer.cs" /> |
20 | <include name="QueItem.cs" /> | 20 | <include name="QueItem.cs" /> |
21 | <include name="SimClient.cs" /> | 21 | <include name="SimClient.cs" /> |
22 | <include name="SimConsole.cs" /> | 22 | <include name="SimConsole.cs" /> |
23 | <include name="VersionInfo.cs" /> | 23 | <include name="VersionInfo.cs" /> |
24 | <include name="Assets/AssetCache.cs" /> | 24 | <include name="Assets/AssetCache.cs" /> |
25 | <include name="Assets/InventoryCache.cs" /> | 25 | <include name="Assets/InventoryCache.cs" /> |
26 | <include name="CAPS/AdminWebFront.cs" /> | 26 | <include name="CAPS/AdminWebFront.cs" /> |
27 | <include name="types/Mesh.cs" /> | 27 | <include name="types/Mesh.cs" /> |
28 | <include name="types/Triangle.cs" /> | 28 | <include name="types/Triangle.cs" /> |
29 | <include name="world/Avatar.cs" /> | 29 | <include name="world/Avatar.cs" /> |
30 | <include name="world/AvatarAnimations.cs" /> | 30 | <include name="world/AvatarAnimations.cs" /> |
31 | <include name="world/Entity.cs" /> | 31 | <include name="world/Entity.cs" /> |
32 | <include name="world/Primitive.cs" /> | 32 | <include name="world/Primitive.cs" /> |
33 | <include name="world/ScriptEngine.cs" /> | 33 | <include name="world/ScriptEngine.cs" /> |
34 | <include name="world/SurfacePatch.cs" /> | 34 | <include name="world/SurfacePatch.cs" /> |
35 | <include name="world/World.cs" /> | 35 | <include name="world/World.cs" /> |
36 | <include name="world/scripting/IScript.cs" /> | 36 | <include name="world/scripting/IScript.cs" /> |
37 | </sources> | 37 | </sources> |
38 | <references basedir="${project::get-base-directory()}"> | 38 | <references basedir="${project::get-base-directory()}"> |
39 | <lib> | 39 | <lib> |
40 | <include name="${project::get-base-directory()}" /> | 40 | <include name="${project::get-base-directory()}" /> |
41 | <include name="${project::get-base-directory()}/${build.dir}" /> | 41 | <include name="${project::get-base-directory()}/${build.dir}" /> |
42 | </lib> | 42 | </lib> |
43 | <include name="System.dll" /> | 43 | <include name="System.dll" /> |
44 | <include name="System.Xml.dll" /> | 44 | <include name="System.Xml.dll" /> |
45 | <include name="../bin/libsecondlife.dll" /> | 45 | <include name="../bin/libsecondlife.dll" /> |
46 | <include name="../bin/Axiom.MathLib.dll" /> | 46 | <include name="../bin/Axiom.MathLib.dll" /> |
47 | <include name="../bin/Db4objects.Db4o.dll" /> | 47 | <include name="../bin/Db4objects.Db4o.dll" /> |
48 | <include name="../bin/OpenSim.Framework.dll" /> | 48 | <include name="../bin/OpenSim.Framework.dll" /> |
49 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 49 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
50 | <include name="../bin/OpenSim.Physics.Manager.dll" /> | 50 | <include name="../bin/OpenSim.Physics.Manager.dll" /> |
51 | <include name="../bin/OpenSim.Servers.dll" /> | 51 | <include name="../bin/OpenSim.Servers.dll" /> |
52 | </references> | 52 | </references> |
53 | </csc> | 53 | </csc> |
54 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 54 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
55 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 55 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
56 | <copy todir="${project::get-base-directory()}/../bin/"> | 56 | <copy todir="${project::get-base-directory()}/../bin/"> |
57 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 57 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
58 | <include name="*.dll"/> | 58 | <include name="*.dll"/> |
59 | <include name="*.exe"/> | 59 | <include name="*.exe"/> |
60 | </fileset> | 60 | </fileset> |
61 | </copy> | 61 | </copy> |
62 | </target> | 62 | </target> |
63 | <target name="clean"> | 63 | <target name="clean"> |
64 | <delete dir="${bin.dir}" failonerror="false" /> | 64 | <delete dir="${bin.dir}" failonerror="false" /> |
65 | <delete dir="${obj.dir}" failonerror="false" /> | 65 | <delete dir="${obj.dir}" failonerror="false" /> |
66 | </target> | 66 | </target> |
67 | <target name="doc" description="Creates documentation."> | 67 | <target name="doc" description="Creates documentation."> |
68 | </target> | 68 | </target> |
69 | </project> | 69 | </project> |
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index b1f4fb7..b366e35 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj | |||
@@ -1,110 +1,110 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{E1B79ECF-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{4D4E187D-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Storage.LocalStorageDb4o</AssemblyName> | 12 | <AssemblyName>OpenSim.Storage.LocalStorageDb4o</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Storage.LocalStorageDb4o</RootNamespace> | 19 | <RootNamespace>OpenSim.Storage.LocalStorageDb4o</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\..\bin\</OutputPath> | 35 | <OutputPath>../../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>../../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Xml" > | 65 | <Reference Include="System.Xml" > |
66 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="Db4objects.Db4o.dll" > | 69 | <Reference Include="Db4objects.Db4o.dll" > |
70 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 70 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | </ItemGroup> | 77 | </ItemGroup> |
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> | 79 | <ProjectReference Include="../../OpenSim.Framework/OpenSim.Framework.csproj"> |
80 | <Name>OpenSim.Framework</Name> | 80 | <Name>OpenSim.Framework</Name> |
81 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 81 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> |
82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
83 | <Private>False</Private> | 83 | <Private>False</Private> |
84 | </ProjectReference> | 84 | </ProjectReference> |
85 | <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 85 | <ProjectReference Include="../../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> |
86 | <Name>OpenSim.Framework.Console</Name> | 86 | <Name>OpenSim.Framework.Console</Name> |
87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 87 | <Project>{16759386-0000-0000-0000-000000000000}</Project> |
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
89 | <Private>False</Private> | 89 | <Private>False</Private> |
90 | </ProjectReference> | 90 | </ProjectReference> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
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"> | 96 | <Compile Include="Db4LocalStorage.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="UUIDQuery.cs"> | 99 | <Compile Include="UUIDQuery.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | </ItemGroup> | 102 | </ItemGroup> |
103 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 103 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
104 | <PropertyGroup> | 104 | <PropertyGroup> |
105 | <PreBuildEvent> | 105 | <PreBuildEvent> |
106 | </PreBuildEvent> | 106 | </PreBuildEvent> |
107 | <PostBuildEvent> | 107 | <PostBuildEvent> |
108 | </PostBuildEvent> | 108 | </PostBuildEvent> |
109 | </PropertyGroup> | 109 | </PropertyGroup> |
110 | </Project> | 110 | </Project> |
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index 550eaa5..c9ae660 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build | |||
@@ -1,46 +1,46 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Storage.LocalStorageDb4o" default="build"> | 2 | <project name="OpenSim.Storage.LocalStorageDb4o" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="Db4LocalStorage.cs" /> | 15 | <include name="Db4LocalStorage.cs" /> |
16 | <include name="UUIDQuery.cs" /> | 16 | <include name="UUIDQuery.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
20 | <include name="${project::get-base-directory()}" /> | 20 | <include name="${project::get-base-directory()}" /> |
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | 21 | <include name="${project::get-base-directory()}/${build.dir}" /> |
22 | </lib> | 22 | </lib> |
23 | <include name="System.dll" /> | 23 | <include name="System.dll" /> |
24 | <include name="System.Xml.dll" /> | 24 | <include name="System.Xml.dll" /> |
25 | <include name="../../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../../bin/libsecondlife.dll" /> | 26 | <include name="../../bin/libsecondlife.dll" /> |
27 | <include name="../../bin/OpenSim.Framework.dll" /> | 27 | <include name="../../bin/OpenSim.Framework.dll" /> |
28 | <include name="../../bin/OpenSim.Framework.Console.dll" /> | 28 | <include name="../../bin/OpenSim.Framework.Console.dll" /> |
29 | </references> | 29 | </references> |
30 | </csc> | 30 | </csc> |
31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 31 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 32 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
33 | <copy todir="${project::get-base-directory()}/../../bin/"> | 33 | <copy todir="${project::get-base-directory()}/../../bin/"> |
34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 34 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
35 | <include name="*.dll"/> | 35 | <include name="*.dll"/> |
36 | <include name="*.exe"/> | 36 | <include name="*.exe"/> |
37 | </fileset> | 37 | </fileset> |
38 | </copy> | 38 | </copy> |
39 | </target> | 39 | </target> |
40 | <target name="clean"> | 40 | <target name="clean"> |
41 | <delete dir="${bin.dir}" failonerror="false" /> | 41 | <delete dir="${bin.dir}" failonerror="false" /> |
42 | <delete dir="${obj.dir}" failonerror="false" /> | 42 | <delete dir="${obj.dir}" failonerror="false" /> |
43 | </target> | 43 | </target> |
44 | <target name="doc" description="Creates documentation."> | 44 | <target name="doc" description="Creates documentation."> |
45 | </target> | 45 | </target> |
46 | </project> | 46 | </project> |
diff --git a/OpenSim.build b/OpenSim.build index b012a1b..6195d2d 100644 --- a/OpenSim.build +++ b/OpenSim.build | |||
@@ -1,110 +1,110 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim" default="build"> | 2 | <project name="OpenSim" default="build"> |
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | 3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> |
4 | 4 | ||
5 | <property name="bin.dir" value="bin" /> | 5 | <property name="bin.dir" value="bin" /> |
6 | <property name="obj.dir" value="obj" /> | 6 | <property name="obj.dir" value="obj" /> |
7 | <property name="doc.dir" value="doc" /> | 7 | <property name="doc.dir" value="doc" /> |
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | 8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> |
9 | 9 | <property name="project.config" value="Release" /> | |
10 | <target name="Debug" description=""> | 10 | |
11 | <property name="project.config" value="Debug" /> | 11 | <target name="Release" description=""> |
12 | <property name="build.debug" value="true" /> | 12 | <property name="project.config" value="Release" /> |
13 | </target> | 13 | <property name="build.debug" value="false" /> |
14 | 14 | </target> | |
15 | <property name="project.config" value="Release" /> | 15 | |
16 | 16 | ||
17 | <target name="Release" description=""> | 17 | <target name="Debug" description=""> |
18 | <property name="project.config" value="Release" /> | 18 | <property name="project.config" value="Debug" /> |
19 | <property name="build.debug" value="false" /> | 19 | <property name="build.debug" value="true" /> |
20 | </target> | 20 | </target> |
21 | 21 | ||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | 22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> |
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | 23 | <property name="nant.settings.currentframework" value="net-1.1" /> |
24 | </target> | 24 | </target> |
25 | 25 | ||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | 26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> |
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | 27 | <property name="nant.settings.currentframework" value="net-2.0" /> |
28 | </target> | 28 | </target> |
29 | 29 | ||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | 30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> |
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | 31 | <property name="nant.settings.currentframework" value="mono-2.0" /> |
32 | </target> | 32 | </target> |
33 | 33 | ||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | 34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> |
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | 35 | <property name="nant.settings.currentframework" value="mono-1.0" /> |
36 | </target> | 36 | </target> |
37 | 37 | ||
38 | <target name="init" description=""> | 38 | <target name="init" description=""> |
39 | <call target="${project.config}" /> | 39 | <call target="${project.config}" /> |
40 | <sysinfo /> | 40 | <sysinfo /> |
41 | <echo message="Platform ${sys.os.platform}" /> | 41 | <echo message="Platform ${sys.os.platform}" /> |
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | 42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> |
43 | </target> | 43 | </target> |
44 | 44 | ||
45 | <target name="clean" description=""> | 45 | <target name="clean" description=""> |
46 | <echo message="Deleting all builds from all configurations" /> | 46 | <echo message="Deleting all builds from all configurations" /> |
47 | <delete dir="${bin.dir}" failonerror="false" /> | 47 | <delete dir="${bin.dir}" failonerror="false" /> |
48 | <delete dir="${obj.dir}" failonerror="false" /> | 48 | <delete dir="${obj.dir}" failonerror="false" /> |
49 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" /> | 49 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> |
50 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> | 50 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> |
51 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> | 51 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> |
52 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> | 52 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" /> |
53 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> | 53 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> |
54 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> | 54 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> |
55 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> | 55 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> |
56 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> | 56 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> |
57 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> | 57 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> |
58 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> | 58 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> |
59 | <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> | 59 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> |
60 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> | 60 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> |
61 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> | 61 | <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> |
62 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> | 62 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> |
63 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> | 63 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> |
64 | </target> | 64 | </target> |
65 | 65 | ||
66 | <target name="build" depends="init" description=""> | 66 | <target name="build" depends="init" description=""> |
67 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> | 67 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> |
68 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> | 68 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> |
69 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> | 69 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> |
70 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" /> | 70 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" /> |
71 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> | 71 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> |
72 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> | 72 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> |
73 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> | 73 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> |
74 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> | 74 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> |
75 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> | 75 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> |
76 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> | 76 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> |
77 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> | 77 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> |
78 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> | 78 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> |
79 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> | 79 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> |
80 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> | 80 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> |
81 | <nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> | 81 | <nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> |
82 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> | 82 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> |
83 | </target> | 83 | </target> |
84 | 84 | ||
85 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | 85 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> |
86 | 86 | ||
87 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | 87 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> |
88 | 88 | ||
89 | <target name="package" depends="clean, doc" description="Builds all" /> | 89 | <target name="package" depends="clean, doc" description="Builds all" /> |
90 | 90 | ||
91 | <target name="doc" depends="build-release"> | 91 | <target name="doc" depends="build-release"> |
92 | <echo message="Generating all documentation from all builds" /> | 92 | <echo message="Generating all documentation from all builds" /> |
93 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" /> | 93 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> |
94 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> | 94 | <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> |
95 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> | 95 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> |
96 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> | 96 | <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" /> |
97 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> | 97 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> |
98 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> | 98 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> |
99 | <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> | 99 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> |
100 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> | 100 | <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> |
101 | <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> | 101 | <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> |
102 | <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> | 102 | <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> |
103 | <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> | 103 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> |
104 | <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> | 104 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> |
105 | <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> | 105 | <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> |
106 | <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> | 106 | <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> |
107 | <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> | 107 | <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> |
108 | </target> | 108 | </target> |
109 | 109 | ||
110 | </project> | 110 | </project> |
diff --git a/OpenSim.sln b/OpenSim.sln index b6b12b0..184ca2e 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,103 +1,133 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual Studio 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework/OpenSim.Framework.csproj", "{7404933D-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console/OpenSim.Framework.Console.csproj", "{16759386-0000-0000-0000-000000000000}" |
6 | EndProject | 6 | EndProject |
7 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{83C87BE6-0000-0000-0000-000000000000}" | 7 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj", "{38FBC3BB-0000-0000-0000-000000000000}" |
8 | EndProject | 8 | EndProject |
9 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}" | 9 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers/OpenSim.Servers.csproj", "{111F9E8F-0000-0000-0000-000000000000}" |
10 | EndProject | 10 | EndProject |
11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}" | 11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj", "{DA1FDCE5-0000-0000-0000-000000000000}" |
12 | EndProject | 12 | EndProject |
13 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{E1B79ECF-0000-0000-0000-000000000000}" | 13 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj", "{43258694-0000-0000-0000-000000000000}" |
14 | EndProject | 14 | EndProject |
15 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" | 15 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer/OpenSim.RegionServer.csproj", "{58019DB8-0000-0000-0000-000000000000}" |
16 | EndProject | 16 | EndProject |
17 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" | 17 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj", "{CB5EADE7-0000-0000-0000-000000000000}" |
18 | EndProject | 18 | EndProject |
19 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}" | 19 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer/OpenGridServices.UserServer.csproj", "{890187AE-0000-0000-0000-000000000000}" |
20 | EndProject | 20 | EndProject |
21 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{4F874463-0000-0000-0000-000000000000}" | 21 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer/OpenGridServices.GridServer.csproj", "{53A65EE9-0000-0000-0000-000000000000}" |
22 | EndProject | 22 | EndProject |
23 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" | 23 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj", "{A86B5F7E-0000-0000-0000-000000000000}" |
24 | EndProject | 24 | EndProject |
25 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}" | 25 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj", "{B771F391-0000-0000-0000-000000000000}" |
26 | EndProject | 26 | EndProject |
27 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}" | 27 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim/OpenSim.csproj", "{17ED9A0D-0000-0000-0000-000000000000}" |
28 | EndProject | 28 | EndProject |
29 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}" | 29 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj", "{4D4E187D-0000-0000-0000-000000000000}" |
30 | EndProject | 30 | EndProject |
31 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}" | 31 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj", "{6EB57A93-0000-0000-0000-000000000000}" |
32 | EndProject | 32 | EndProject |
33 | Global | 33 | Global |
34 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 34 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
35 | Debug|Any CPU = Debug|Any CPU | 35 | Release|Any CPU = Release|Any CPU |
36 | Release|Any CPU = Release|Any CPU | 36 | Debug|Any CPU = Debug|Any CPU |
37 | EndGlobalSection | 37 | EndGlobalSection |
38 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 38 | GlobalSection(ProjectDependencies) = postSolution |
39 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 39 | ({38FBC3BB-0000-0000-0000-000000000000}).2 = ({DA1FDCE5-0000-0000-0000-000000000000}) |
40 | {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 40 | ({111F9E8F-0000-0000-0000-000000000000}).2 = ({7404933D-0000-0000-0000-000000000000}) |
41 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 41 | ({111F9E8F-0000-0000-0000-000000000000}).3 = ({16759386-0000-0000-0000-000000000000}) |
42 | {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 42 | ({DA1FDCE5-0000-0000-0000-000000000000}).3 = ({7404933D-0000-0000-0000-000000000000}) |
43 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 43 | ({DA1FDCE5-0000-0000-0000-000000000000}).4 = ({16759386-0000-0000-0000-000000000000}) |
44 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 44 | ({43258694-0000-0000-0000-000000000000}).2 = ({DA1FDCE5-0000-0000-0000-000000000000}) |
45 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 45 | ({58019DB8-0000-0000-0000-000000000000}).5 = ({7404933D-0000-0000-0000-000000000000}) |
46 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 46 | ({58019DB8-0000-0000-0000-000000000000}).6 = ({16759386-0000-0000-0000-000000000000}) |
47 | {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 47 | ({58019DB8-0000-0000-0000-000000000000}).7 = ({DA1FDCE5-0000-0000-0000-000000000000}) |
48 | {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 48 | ({58019DB8-0000-0000-0000-000000000000}).8 = ({111F9E8F-0000-0000-0000-000000000000}) |
49 | {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 49 | ({CB5EADE7-0000-0000-0000-000000000000}).5 = ({7404933D-0000-0000-0000-000000000000}) |
50 | {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 50 | ({CB5EADE7-0000-0000-0000-000000000000}).6 = ({16759386-0000-0000-0000-000000000000}) |
51 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 51 | ({890187AE-0000-0000-0000-000000000000}).3 = ({7404933D-0000-0000-0000-000000000000}) |
52 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 52 | ({890187AE-0000-0000-0000-000000000000}).4 = ({16759386-0000-0000-0000-000000000000}) |
53 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 53 | ({53A65EE9-0000-0000-0000-000000000000}).3 = ({7404933D-0000-0000-0000-000000000000}) |
54 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 54 | ({53A65EE9-0000-0000-0000-000000000000}).4 = ({16759386-0000-0000-0000-000000000000}) |
55 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 55 | ({A86B5F7E-0000-0000-0000-000000000000}).4 = ({7404933D-0000-0000-0000-000000000000}) |
56 | {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 56 | ({A86B5F7E-0000-0000-0000-000000000000}).5 = ({16759386-0000-0000-0000-000000000000}) |
57 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 57 | ({B771F391-0000-0000-0000-000000000000}).3 = ({DA1FDCE5-0000-0000-0000-000000000000}) |
58 | {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 58 | ({17ED9A0D-0000-0000-0000-000000000000}).5 = ({7404933D-0000-0000-0000-000000000000}) |
59 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 59 | ({17ED9A0D-0000-0000-0000-000000000000}).6 = ({16759386-0000-0000-0000-000000000000}) |
60 | {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 60 | ({17ED9A0D-0000-0000-0000-000000000000}).7 = ({DA1FDCE5-0000-0000-0000-000000000000}) |
61 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 61 | ({17ED9A0D-0000-0000-0000-000000000000}).8 = ({111F9E8F-0000-0000-0000-000000000000}) |
62 | {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 62 | ({17ED9A0D-0000-0000-0000-000000000000}).9 = ({58019DB8-0000-0000-0000-000000000000}) |
63 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 63 | ({4D4E187D-0000-0000-0000-000000000000}).4 = ({7404933D-0000-0000-0000-000000000000}) |
64 | {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 64 | ({4D4E187D-0000-0000-0000-000000000000}).5 = ({16759386-0000-0000-0000-000000000000}) |
65 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 65 | ({6EB57A93-0000-0000-0000-000000000000}).3 = ({7404933D-0000-0000-0000-000000000000}) |
66 | {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 66 | ({6EB57A93-0000-0000-0000-000000000000}).4 = ({16759386-0000-0000-0000-000000000000}) |
67 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 67 | EndGlobalSection |
68 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 68 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
69 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 69 | {7404933D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
70 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 70 | {7404933D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
71 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 71 | {7404933D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
72 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 72 | {7404933D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
73 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 73 | {16759386-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
74 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 74 | {16759386-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
75 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 75 | {16759386-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
76 | {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 76 | {16759386-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
77 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 77 | {38FBC3BB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
78 | {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 78 | {38FBC3BB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
79 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 79 | {38FBC3BB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
80 | {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 80 | {38FBC3BB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
81 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 81 | {111F9E8F-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
82 | {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 82 | {111F9E8F-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
83 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 83 | {111F9E8F-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
84 | {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 84 | {111F9E8F-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
85 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 85 | {DA1FDCE5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
86 | {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 86 | {DA1FDCE5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
87 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 87 | {DA1FDCE5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
88 | {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 88 | {DA1FDCE5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
89 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 89 | {43258694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
90 | {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 90 | {43258694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
91 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 91 | {43258694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
92 | {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 92 | {43258694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
93 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 93 | {58019DB8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
94 | {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 94 | {58019DB8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
95 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 95 | {58019DB8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
96 | {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 96 | {58019DB8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
97 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 97 | {CB5EADE7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
98 | {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 98 | {CB5EADE7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
99 | EndGlobalSection | 99 | {CB5EADE7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
100 | GlobalSection(SolutionProperties) = preSolution | 100 | {CB5EADE7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
101 | HideSolutionNode = FALSE | 101 | {890187AE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
102 | EndGlobalSection | 102 | {890187AE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
103 | EndGlobal | 103 | {890187AE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
104 | {890187AE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
105 | {53A65EE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
106 | {53A65EE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
107 | {53A65EE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
108 | {53A65EE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
109 | {A86B5F7E-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
110 | {A86B5F7E-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
111 | {A86B5F7E-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
112 | {A86B5F7E-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
113 | {B771F391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
114 | {B771F391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
115 | {B771F391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
116 | {B771F391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
117 | {17ED9A0D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
118 | {17ED9A0D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
119 | {17ED9A0D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
120 | {17ED9A0D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
121 | {4D4E187D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
122 | {4D4E187D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
123 | {4D4E187D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
124 | {4D4E187D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
125 | {6EB57A93-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
126 | {6EB57A93-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
127 | {6EB57A93-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
128 | {6EB57A93-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
129 | EndGlobalSection | ||
130 | GlobalSection(SolutionProperties) = preSolution | ||
131 | HideSolutionNode = FALSE | ||
132 | EndGlobalSection | ||
133 | EndGlobal | ||
diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj index f56206f..05b4209 100644 --- a/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim.csproj | |||
@@ -1,126 +1,126 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{17ED9A0D-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim</AssemblyName> | 12 | <AssemblyName>OpenSim</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Exe</OutputType> | 17 | <OutputType>Exe</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim</RootNamespace> | 19 | <RootNamespace>OpenSim</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Xml" > | 65 | <Reference Include="System.Xml" > |
66 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="libsecondlife.dll" > | 69 | <Reference Include="libsecondlife.dll" > |
70 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="Axiom.MathLib.dll" > | 73 | <Reference Include="Axiom.MathLib.dll" > |
74 | <HintPath>..\bin\Axiom.MathLib.dll</HintPath> | 74 | <HintPath>..\bin\Axiom.MathLib.dll</HintPath> |
75 | <Private>False</Private> | 75 | <Private>False</Private> |
76 | </Reference> | 76 | </Reference> |
77 | <Reference Include="Db4objects.Db4o.dll" > | 77 | <Reference Include="Db4objects.Db4o.dll" > |
78 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </Reference> | 80 | </Reference> |
81 | </ItemGroup> | 81 | </ItemGroup> |
82 | <ItemGroup> | 82 | <ItemGroup> |
83 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | 83 | <ProjectReference Include="../OpenSim.Framework/OpenSim.Framework.csproj"> |
84 | <Name>OpenSim.Framework</Name> | 84 | <Name>OpenSim.Framework</Name> |
85 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 85 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> |
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
87 | <Private>False</Private> | 87 | <Private>False</Private> |
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 89 | <ProjectReference Include="../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> |
90 | <Name>OpenSim.Framework.Console</Name> | 90 | <Name>OpenSim.Framework.Console</Name> |
91 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 91 | <Project>{16759386-0000-0000-0000-000000000000}</Project> |
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Private>False</Private> | 93 | <Private>False</Private> |
94 | </ProjectReference> | 94 | </ProjectReference> |
95 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 95 | <ProjectReference Include="../OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj"> |
96 | <Name>OpenSim.Physics.Manager</Name> | 96 | <Name>OpenSim.Physics.Manager</Name> |
97 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 97 | <Project>{DA1FDCE5-0000-0000-0000-000000000000}</Project> |
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
99 | <Private>False</Private> | 99 | <Private>False</Private> |
100 | </ProjectReference> | 100 | </ProjectReference> |
101 | <ProjectReference Include="..\Servers\OpenSim.Servers.csproj"> | 101 | <ProjectReference Include="../Servers/OpenSim.Servers.csproj"> |
102 | <Name>OpenSim.Servers</Name> | 102 | <Name>OpenSim.Servers</Name> |
103 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 103 | <Project>{111F9E8F-0000-0000-0000-000000000000}</Project> |
104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
105 | <Private>False</Private> | 105 | <Private>False</Private> |
106 | </ProjectReference> | 106 | </ProjectReference> |
107 | <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> | 107 | <ProjectReference Include="../OpenSim.RegionServer/OpenSim.RegionServer.csproj"> |
108 | <Name>OpenSim.RegionServer</Name> | 108 | <Name>OpenSim.RegionServer</Name> |
109 | <Project>{632E1BFD-0000-0000-0000-000000000000}</Project> | 109 | <Project>{58019DB8-0000-0000-0000-000000000000}</Project> |
110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
111 | <Private>False</Private> | 111 | <Private>False</Private> |
112 | </ProjectReference> | 112 | </ProjectReference> |
113 | </ItemGroup> | 113 | </ItemGroup> |
114 | <ItemGroup> | 114 | <ItemGroup> |
115 | <Compile Include="RegionServer.cs"> | 115 | <Compile Include="RegionServer.cs"> |
116 | <SubType>Code</SubType> | 116 | <SubType>Code</SubType> |
117 | </Compile> | 117 | </Compile> |
118 | </ItemGroup> | 118 | </ItemGroup> |
119 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 119 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
120 | <PropertyGroup> | 120 | <PropertyGroup> |
121 | <PreBuildEvent> | 121 | <PreBuildEvent> |
122 | </PreBuildEvent> | 122 | </PreBuildEvent> |
123 | <PostBuildEvent> | 123 | <PostBuildEvent> |
124 | </PostBuildEvent> | 124 | </PostBuildEvent> |
125 | </PropertyGroup> | 125 | </PropertyGroup> |
126 | </Project> | 126 | </Project> |
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build index deb4cfb..7db7cc1 100644 --- a/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim.exe.build | |||
@@ -1,48 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim" default="build"> | 2 | <project name="OpenSim" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> | 10 | <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> |
11 | <resources prefix="OpenSim" dynamicprefix="true" > | 11 | <resources prefix="OpenSim" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="RegionServer.cs" /> | 14 | <include name="RegionServer.cs" /> |
15 | </sources> | 15 | </sources> |
16 | <references basedir="${project::get-base-directory()}"> | 16 | <references basedir="${project::get-base-directory()}"> |
17 | <lib> | 17 | <lib> |
18 | <include name="${project::get-base-directory()}" /> | 18 | <include name="${project::get-base-directory()}" /> |
19 | <include name="${project::get-base-directory()}/${build.dir}" /> | 19 | <include name="${project::get-base-directory()}/${build.dir}" /> |
20 | </lib> | 20 | </lib> |
21 | <include name="System.dll" /> | 21 | <include name="System.dll" /> |
22 | <include name="System.Xml.dll" /> | 22 | <include name="System.Xml.dll" /> |
23 | <include name="../bin/libsecondlife.dll" /> | 23 | <include name="../bin/libsecondlife.dll" /> |
24 | <include name="../bin/Axiom.MathLib.dll" /> | 24 | <include name="../bin/Axiom.MathLib.dll" /> |
25 | <include name="../bin/Db4objects.Db4o.dll" /> | 25 | <include name="../bin/Db4objects.Db4o.dll" /> |
26 | <include name="../bin/OpenSim.Framework.dll" /> | 26 | <include name="../bin/OpenSim.Framework.dll" /> |
27 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 27 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
28 | <include name="../bin/OpenSim.Physics.Manager.dll" /> | 28 | <include name="../bin/OpenSim.Physics.Manager.dll" /> |
29 | <include name="../bin/OpenSim.Servers.dll" /> | 29 | <include name="../bin/OpenSim.Servers.dll" /> |
30 | <include name="../bin/OpenSim.RegionServer.dll" /> | 30 | <include name="../bin/OpenSim.RegionServer.dll" /> |
31 | </references> | 31 | </references> |
32 | </csc> | 32 | </csc> |
33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
34 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 34 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
35 | <copy todir="${project::get-base-directory()}/../bin/"> | 35 | <copy todir="${project::get-base-directory()}/../bin/"> |
36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
37 | <include name="*.dll"/> | 37 | <include name="*.dll"/> |
38 | <include name="*.exe"/> | 38 | <include name="*.exe"/> |
39 | </fileset> | 39 | </fileset> |
40 | </copy> | 40 | </copy> |
41 | </target> | 41 | </target> |
42 | <target name="clean"> | 42 | <target name="clean"> |
43 | <delete dir="${bin.dir}" failonerror="false" /> | 43 | <delete dir="${bin.dir}" failonerror="false" /> |
44 | <delete dir="${obj.dir}" failonerror="false" /> | 44 | <delete dir="${obj.dir}" failonerror="false" /> |
45 | </target> | 45 | </target> |
46 | <target name="doc" description="Creates documentation."> | 46 | <target name="doc" description="Creates documentation."> |
47 | </target> | 47 | </target> |
48 | </project> | 48 | </project> |
diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build index 395fb31..743b826 100644 --- a/Prebuild/Prebuild.build +++ b/Prebuild/Prebuild.build | |||
@@ -1,67 +1,67 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="Prebuild" default="build"> | 2 | <project name="Prebuild" default="build"> |
3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> | 3 | <echo message="Using '${nant.settings.currentframework}' Framework"/> |
4 | 4 | ||
5 | <property name="bin.dir" value="bin" /> | 5 | <property name="bin.dir" value="bin" /> |
6 | <property name="obj.dir" value="obj" /> | 6 | <property name="obj.dir" value="obj" /> |
7 | <property name="doc.dir" value="doc" /> | 7 | <property name="doc.dir" value="doc" /> |
8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> | 8 | <property name="project.main.dir" value="${project::get-base-directory()}" /> |
9 | 9 | <property name="project.config" value="Release" /> | |
10 | <target name="Debug" description=""> | 10 | |
11 | <property name="project.config" value="Debug" /> | 11 | <target name="Release" description=""> |
12 | <property name="build.debug" value="true" /> | 12 | <property name="project.config" value="Release" /> |
13 | </target> | 13 | <property name="build.debug" value="false" /> |
14 | 14 | </target> | |
15 | <property name="project.config" value="Release" /> | 15 | |
16 | 16 | ||
17 | <target name="Release" description=""> | 17 | <target name="Debug" description=""> |
18 | <property name="project.config" value="Release" /> | 18 | <property name="project.config" value="Debug" /> |
19 | <property name="build.debug" value="false" /> | 19 | <property name="build.debug" value="true" /> |
20 | </target> | 20 | </target> |
21 | 21 | ||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | 22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> |
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | 23 | <property name="nant.settings.currentframework" value="net-1.1" /> |
24 | </target> | 24 | </target> |
25 | 25 | ||
26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> | 26 | <target name="net-2.0" description="Sets framework to .NET 2.0"> |
27 | <property name="nant.settings.currentframework" value="net-2.0" /> | 27 | <property name="nant.settings.currentframework" value="net-2.0" /> |
28 | </target> | 28 | </target> |
29 | 29 | ||
30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> | 30 | <target name="mono-2.0" description="Sets framework to mono 2.0"> |
31 | <property name="nant.settings.currentframework" value="mono-2.0" /> | 31 | <property name="nant.settings.currentframework" value="mono-2.0" /> |
32 | </target> | 32 | </target> |
33 | 33 | ||
34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> | 34 | <target name="mono-1.0" description="Sets framework to mono 1.0"> |
35 | <property name="nant.settings.currentframework" value="mono-1.0" /> | 35 | <property name="nant.settings.currentframework" value="mono-1.0" /> |
36 | </target> | 36 | </target> |
37 | 37 | ||
38 | <target name="init" description=""> | 38 | <target name="init" description=""> |
39 | <call target="${project.config}" /> | 39 | <call target="${project.config}" /> |
40 | <sysinfo /> | 40 | <sysinfo /> |
41 | <echo message="Platform ${sys.os.platform}" /> | 41 | <echo message="Platform ${sys.os.platform}" /> |
42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> | 42 | <property name="build.dir" value="${bin.dir}/${project.config}" /> |
43 | </target> | 43 | </target> |
44 | 44 | ||
45 | <target name="clean" description=""> | 45 | <target name="clean" description=""> |
46 | <echo message="Deleting all builds from all configurations" /> | 46 | <echo message="Deleting all builds from all configurations" /> |
47 | <delete dir="${bin.dir}" failonerror="false" /> | 47 | <delete dir="${bin.dir}" failonerror="false" /> |
48 | <delete dir="${obj.dir}" failonerror="false" /> | 48 | <delete dir="${obj.dir}" failonerror="false" /> |
49 | <nant buildfile="src/Prebuild.exe.build" target="clean" /> | 49 | <nant buildfile="src/Prebuild.exe.build" target="clean" /> |
50 | </target> | 50 | </target> |
51 | 51 | ||
52 | <target name="build" depends="init" description=""> | 52 | <target name="build" depends="init" description=""> |
53 | <nant buildfile="src/Prebuild.exe.build" target="build" /> | 53 | <nant buildfile="src/Prebuild.exe.build" target="build" /> |
54 | </target> | 54 | </target> |
55 | 55 | ||
56 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | 56 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> |
57 | 57 | ||
58 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> | 58 | <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> |
59 | 59 | ||
60 | <target name="package" depends="clean, doc" description="Builds all" /> | 60 | <target name="package" depends="clean, doc" description="Builds all" /> |
61 | 61 | ||
62 | <target name="doc" depends="build-release"> | 62 | <target name="doc" depends="build-release"> |
63 | <echo message="Generating all documentation from all builds" /> | 63 | <echo message="Generating all documentation from all builds" /> |
64 | <nant buildfile="src/Prebuild.exe.build" target="doc" /> | 64 | <nant buildfile="src/Prebuild.exe.build" target="doc" /> |
65 | </target> | 65 | </target> |
66 | 66 | ||
67 | </project> | 67 | </project> |
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index 449896b..5145290 100644 --- a/Prebuild/Prebuild.sln +++ b/Prebuild/Prebuild.sln | |||
@@ -1,19 +1,19 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual Studio 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src/Prebuild.csproj", "{B6D9A5CB-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Global | 5 | Global |
6 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 6 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
7 | Debug|Any CPU = Debug|Any CPU | 7 | Release|Any CPU = Release|Any CPU |
8 | Release|Any CPU = Release|Any CPU | 8 | Debug|Any CPU = Debug|Any CPU |
9 | EndGlobalSection | 9 | EndGlobalSection |
10 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 10 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
11 | {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 11 | {B6D9A5CB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
12 | {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 12 | {B6D9A5CB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
13 | {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 13 | {B6D9A5CB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
14 | {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 14 | {B6D9A5CB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
15 | EndGlobalSection | 15 | EndGlobalSection |
16 | GlobalSection(SolutionProperties) = preSolution | 16 | GlobalSection(SolutionProperties) = preSolution |
17 | HideSolutionNode = FALSE | 17 | HideSolutionNode = FALSE |
18 | EndGlobalSection | 18 | EndGlobalSection |
19 | EndGlobal | 19 | EndGlobal |
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index 55efffa..0fdd022 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj | |||
@@ -1,205 +1,205 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{92E80C1C-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{B6D9A5CB-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon>App.ico</ApplicationIcon> | 9 | <ApplicationIcon>App.ico</ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>prebuild</AssemblyName> | 12 | <AssemblyName>prebuild</AssemblyName> |
13 | <AssemblyOriginatorKeyFile>Prebuild.snk</AssemblyOriginatorKeyFile> | 13 | <AssemblyOriginatorKeyFile>Prebuild.snk</AssemblyOriginatorKeyFile> |
14 | <SignAssembly>true</SignAssembly> | 14 | <SignAssembly>true</SignAssembly> |
15 | <DefaultClientScript>JScript</DefaultClientScript> | 15 | <DefaultClientScript>JScript</DefaultClientScript> |
16 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 16 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
17 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 17 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
18 | <DelaySign>false</DelaySign> | 18 | <DelaySign>false</DelaySign> |
19 | <OutputType>Exe</OutputType> | 19 | <OutputType>Exe</OutputType> |
20 | <AppDesignerFolder></AppDesignerFolder> | 20 | <AppDesignerFolder></AppDesignerFolder> |
21 | <RootNamespace>Prebuild</RootNamespace> | 21 | <RootNamespace>Prebuild</RootNamespace> |
22 | <StartupObject>Prebuild.Prebuild</StartupObject> | 22 | <StartupObject>Prebuild.Prebuild</StartupObject> |
23 | <FileUpgradeFlags> | 23 | <FileUpgradeFlags> |
24 | </FileUpgradeFlags> | 24 | </FileUpgradeFlags> |
25 | </PropertyGroup> | 25 | </PropertyGroup> |
26 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 26 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
27 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 27 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
28 | <BaseAddress>285212672</BaseAddress> | 28 | <BaseAddress>285212672</BaseAddress> |
29 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 29 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
30 | <ConfigurationOverrideFile> | 30 | <ConfigurationOverrideFile> |
31 | </ConfigurationOverrideFile> | 31 | </ConfigurationOverrideFile> |
32 | <DefineConstants>DEBUG;TRACE</DefineConstants> | 32 | <DefineConstants>TRACE</DefineConstants> |
33 | <DocumentationFile></DocumentationFile> | 33 | <DocumentationFile></DocumentationFile> |
34 | <DebugSymbols>True</DebugSymbols> | 34 | <DebugSymbols>False</DebugSymbols> |
35 | <FileAlignment>4096</FileAlignment> | 35 | <FileAlignment>4096</FileAlignment> |
36 | <Optimize>False</Optimize> | 36 | <Optimize>True</Optimize> |
37 | <OutputPath>..\..\bin\</OutputPath> | 37 | <OutputPath>../../bin/</OutputPath> |
38 | <RegisterForComInterop>False</RegisterForComInterop> | 38 | <RegisterForComInterop>False</RegisterForComInterop> |
39 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 39 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
40 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 40 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
41 | <WarningLevel>4</WarningLevel> | 41 | <WarningLevel>4</WarningLevel> |
42 | <NoWarn>1595</NoWarn> | 42 | <NoWarn>1595</NoWarn> |
43 | </PropertyGroup> | 43 | </PropertyGroup> |
44 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 44 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
45 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 45 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
46 | <BaseAddress>285212672</BaseAddress> | 46 | <BaseAddress>285212672</BaseAddress> |
47 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 47 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
48 | <ConfigurationOverrideFile> | 48 | <ConfigurationOverrideFile> |
49 | </ConfigurationOverrideFile> | 49 | </ConfigurationOverrideFile> |
50 | <DefineConstants>TRACE</DefineConstants> | 50 | <DefineConstants>DEBUG;TRACE</DefineConstants> |
51 | <DocumentationFile></DocumentationFile> | 51 | <DocumentationFile></DocumentationFile> |
52 | <DebugSymbols>False</DebugSymbols> | 52 | <DebugSymbols>True</DebugSymbols> |
53 | <FileAlignment>4096</FileAlignment> | 53 | <FileAlignment>4096</FileAlignment> |
54 | <Optimize>True</Optimize> | 54 | <Optimize>False</Optimize> |
55 | <OutputPath>..\..\bin\</OutputPath> | 55 | <OutputPath>../../bin/</OutputPath> |
56 | <RegisterForComInterop>False</RegisterForComInterop> | 56 | <RegisterForComInterop>False</RegisterForComInterop> |
57 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 57 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
58 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 58 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
59 | <WarningLevel>4</WarningLevel> | 59 | <WarningLevel>4</WarningLevel> |
60 | <NoWarn>1595</NoWarn> | 60 | <NoWarn>1595</NoWarn> |
61 | </PropertyGroup> | 61 | </PropertyGroup> |
62 | <ItemGroup> | 62 | <ItemGroup> |
63 | <Reference Include="System.EnterpriseServices" > | 63 | <Reference Include="System.EnterpriseServices" > |
64 | <HintPath>System.EnterpriseServices.dll</HintPath> | 64 | <HintPath>System.EnterpriseServices.dll</HintPath> |
65 | <Private>False</Private> | 65 | <Private>False</Private> |
66 | </Reference> | 66 | </Reference> |
67 | <Reference Include="System.Xml" > | 67 | <Reference Include="System.Xml" > |
68 | <HintPath>System.Xml.dll</HintPath> | 68 | <HintPath>System.Xml.dll</HintPath> |
69 | <Private>False</Private> | 69 | <Private>False</Private> |
70 | </Reference> | 70 | </Reference> |
71 | <Reference Include="System" > | 71 | <Reference Include="System" > |
72 | <HintPath>System.dll</HintPath> | 72 | <HintPath>System.dll</HintPath> |
73 | <Private>False</Private> | 73 | <Private>False</Private> |
74 | </Reference> | 74 | </Reference> |
75 | </ItemGroup> | 75 | </ItemGroup> |
76 | <ItemGroup> | 76 | <ItemGroup> |
77 | </ItemGroup> | 77 | </ItemGroup> |
78 | <ItemGroup> | 78 | <ItemGroup> |
79 | <EmbeddedResource Include="App.ico"> | 79 | <EmbeddedResource Include="App.ico"> |
80 | </EmbeddedResource> | 80 | </EmbeddedResource> |
81 | <EmbeddedResource Include="data\prebuild-1.7.xsd"> | 81 | <EmbeddedResource Include="data/prebuild-1.7.xsd"> |
82 | </EmbeddedResource> | 82 | </EmbeddedResource> |
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"> | 86 | <Compile Include="Core/FatalException.cs"> |
87 | <SubType>Code</SubType> | 87 | <SubType>Code</SubType> |
88 | </Compile> | 88 | </Compile> |
89 | <Compile Include="Core\Kernel.cs"> | 89 | <Compile Include="Core/Kernel.cs"> |
90 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
91 | </Compile> | 91 | </Compile> |
92 | <Compile Include="Core\UnknownLanguageException.cs"> | 92 | <Compile Include="Core/UnknownLanguageException.cs"> |
93 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
94 | </Compile> | 94 | </Compile> |
95 | <Compile Include="Core\WarningException.cs"> | 95 | <Compile Include="Core/WarningException.cs"> |
96 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
97 | </Compile> | 97 | </Compile> |
98 | <Compile Include="Core\Attributes\DataNodeAttribute.cs"> | 98 | <Compile Include="Core/Attributes/DataNodeAttribute.cs"> |
99 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
100 | </Compile> | 100 | </Compile> |
101 | <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> | 101 | <Compile Include="Core/Attributes/OptionNodeAttribute.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
104 | <Compile Include="Core\Attributes\TargetAttribute.cs"> | 104 | <Compile Include="Core/Attributes/TargetAttribute.cs"> |
105 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
106 | </Compile> | 106 | </Compile> |
107 | <Compile Include="Core\Interfaces\IDataNode.cs"> | 107 | <Compile Include="Core/Interfaces/IDataNode.cs"> |
108 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
109 | </Compile> | 109 | </Compile> |
110 | <Compile Include="Core\Interfaces\ITarget.cs"> | 110 | <Compile Include="Core/Interfaces/ITarget.cs"> |
111 | <SubType>Code</SubType> | 111 | <SubType>Code</SubType> |
112 | </Compile> | 112 | </Compile> |
113 | <Compile Include="Core\Nodes\ConfigurationNode.cs"> | 113 | <Compile Include="Core/Nodes/ConfigurationNode.cs"> |
114 | <SubType>Code</SubType> | 114 | <SubType>Code</SubType> |
115 | </Compile> | 115 | </Compile> |
116 | <Compile Include="Core\Nodes\DataNode.cs"> | 116 | <Compile Include="Core/Nodes/DataNode.cs"> |
117 | <SubType>Code</SubType> | 117 | <SubType>Code</SubType> |
118 | </Compile> | 118 | </Compile> |
119 | <Compile Include="Core\Nodes\ExcludeNode.cs"> | 119 | <Compile Include="Core/Nodes/ExcludeNode.cs"> |
120 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
121 | </Compile> | 121 | </Compile> |
122 | <Compile Include="Core\Nodes\FileNode.cs"> | 122 | <Compile Include="Core/Nodes/FileNode.cs"> |
123 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
124 | </Compile> | 124 | </Compile> |
125 | <Compile Include="Core\Nodes\FilesNode.cs"> | 125 | <Compile Include="Core/Nodes/FilesNode.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="Core\Nodes\MatchNode.cs"> | 128 | <Compile Include="Core/Nodes/MatchNode.cs"> |
129 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
130 | </Compile> | 130 | </Compile> |
131 | <Compile Include="Core\Nodes\OptionsNode.cs"> | 131 | <Compile Include="Core/Nodes/OptionsNode.cs"> |
132 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
133 | </Compile> | 133 | </Compile> |
134 | <Compile Include="Core\Nodes\ProcessNode.cs"> | 134 | <Compile Include="Core/Nodes/ProcessNode.cs"> |
135 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
136 | </Compile> | 136 | </Compile> |
137 | <Compile Include="Core\Nodes\ProjectNode.cs"> | 137 | <Compile Include="Core/Nodes/ProjectNode.cs"> |
138 | <SubType>Code</SubType> | 138 | <SubType>Code</SubType> |
139 | </Compile> | 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\ReferencePathNode.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\SolutionNode.cs"> | 146 | <Compile Include="Core/Nodes/SolutionNode.cs"> |
147 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
148 | </Compile> | 148 | </Compile> |
149 | <Compile Include="Core\Parse\IfContext.cs"> | 149 | <Compile Include="Core/Parse/IfContext.cs"> |
150 | <SubType>Code</SubType> | 150 | <SubType>Code</SubType> |
151 | </Compile> | 151 | </Compile> |
152 | <Compile Include="Core\Parse\Preprocessor.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\DebugTarget.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\MonoDevelopTarget.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\NAntTarget.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\SharpDevelopTarget.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\VS2002Target.cs"> | 173 | <Compile Include="Core/Targets/VS2002Target.cs"> |
174 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
175 | </Compile> | 175 | </Compile> |
176 | <Compile Include="Core\Targets\VS2003Target.cs"> | 176 | <Compile Include="Core/Targets/VS2003Target.cs"> |
177 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
178 | </Compile> | 178 | </Compile> |
179 | <Compile Include="Core\Targets\VS2005Target.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\CommandLineCollection.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\CurrentDirectory.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\Helper.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\Log.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"> |
195 | <SubType>Code</SubType> | 195 | <SubType>Code</SubType> |
196 | </Compile> | 196 | </Compile> |
197 | </ItemGroup> | 197 | </ItemGroup> |
198 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 198 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
199 | <PropertyGroup> | 199 | <PropertyGroup> |
200 | <PreBuildEvent> | 200 | <PreBuildEvent> |
201 | </PreBuildEvent> | 201 | </PreBuildEvent> |
202 | <PostBuildEvent> | 202 | <PostBuildEvent> |
203 | </PostBuildEvent> | 203 | </PostBuildEvent> |
204 | </PropertyGroup> | 204 | </PropertyGroup> |
205 | </Project> | 205 | </Project> |
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build index 43f5516..628e7e1 100644 --- a/Prebuild/src/Prebuild.exe.build +++ b/Prebuild/src/Prebuild.exe.build | |||
@@ -1,80 +1,80 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="Prebuild" default="build"> | 2 | <project name="Prebuild" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> | 10 | <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> |
11 | <resources prefix="Prebuild" dynamicprefix="true" > | 11 | <resources prefix="Prebuild" dynamicprefix="true" > |
12 | <include name="App.ico" /> | 12 | <include name="App.ico" /> |
13 | <include name="data/prebuild-1.7.xsd" /> | 13 | <include name="data/prebuild-1.7.xsd" /> |
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/FatalException.cs" /> |
18 | <include name="Core/Kernel.cs" /> | 18 | <include name="Core/Kernel.cs" /> |
19 | <include name="Core/UnknownLanguageException.cs" /> | 19 | <include name="Core/UnknownLanguageException.cs" /> |
20 | <include name="Core/WarningException.cs" /> | 20 | <include name="Core/WarningException.cs" /> |
21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> | 21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> |
22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> | 22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> |
23 | <include name="Core/Attributes/TargetAttribute.cs" /> | 23 | <include name="Core/Attributes/TargetAttribute.cs" /> |
24 | <include name="Core/Interfaces/IDataNode.cs" /> | 24 | <include name="Core/Interfaces/IDataNode.cs" /> |
25 | <include name="Core/Interfaces/ITarget.cs" /> | 25 | <include name="Core/Interfaces/ITarget.cs" /> |
26 | <include name="Core/Nodes/ConfigurationNode.cs" /> | 26 | <include name="Core/Nodes/ConfigurationNode.cs" /> |
27 | <include name="Core/Nodes/DataNode.cs" /> | 27 | <include name="Core/Nodes/DataNode.cs" /> |
28 | <include name="Core/Nodes/ExcludeNode.cs" /> | 28 | <include name="Core/Nodes/ExcludeNode.cs" /> |
29 | <include name="Core/Nodes/FileNode.cs" /> | 29 | <include name="Core/Nodes/FileNode.cs" /> |
30 | <include name="Core/Nodes/FilesNode.cs" /> | 30 | <include name="Core/Nodes/FilesNode.cs" /> |
31 | <include name="Core/Nodes/MatchNode.cs" /> | 31 | <include name="Core/Nodes/MatchNode.cs" /> |
32 | <include name="Core/Nodes/OptionsNode.cs" /> | 32 | <include name="Core/Nodes/OptionsNode.cs" /> |
33 | <include name="Core/Nodes/ProcessNode.cs" /> | 33 | <include name="Core/Nodes/ProcessNode.cs" /> |
34 | <include name="Core/Nodes/ProjectNode.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/ReferencePathNode.cs" /> | 36 | <include name="Core/Nodes/ReferencePathNode.cs" /> |
37 | <include name="Core/Nodes/SolutionNode.cs" /> | 37 | <include name="Core/Nodes/SolutionNode.cs" /> |
38 | <include name="Core/Parse/IfContext.cs" /> | 38 | <include name="Core/Parse/IfContext.cs" /> |
39 | <include name="Core/Parse/Preprocessor.cs" /> | 39 | <include name="Core/Parse/Preprocessor.cs" /> |
40 | <include name="Core/Targets/AutotoolsTarget.cs" /> | 40 | <include name="Core/Targets/AutotoolsTarget.cs" /> |
41 | <include name="Core/Targets/DebugTarget.cs" /> | 41 | <include name="Core/Targets/DebugTarget.cs" /> |
42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> | 42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> |
43 | <include name="Core/Targets/NAntTarget.cs" /> | 43 | <include name="Core/Targets/NAntTarget.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | 44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> |
45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> | 45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> |
46 | <include name="Core/Targets/VS2002Target.cs" /> | 46 | <include name="Core/Targets/VS2002Target.cs" /> |
47 | <include name="Core/Targets/VS2003Target.cs" /> | 47 | <include name="Core/Targets/VS2003Target.cs" /> |
48 | <include name="Core/Targets/VS2005Target.cs" /> | 48 | <include name="Core/Targets/VS2005Target.cs" /> |
49 | <include name="Core/Utilities/CommandLineCollection.cs" /> | 49 | <include name="Core/Utilities/CommandLineCollection.cs" /> |
50 | <include name="Core/Utilities/CurrentDirectory.cs" /> | 50 | <include name="Core/Utilities/CurrentDirectory.cs" /> |
51 | <include name="Core/Utilities/Helper.cs" /> | 51 | <include name="Core/Utilities/Helper.cs" /> |
52 | <include name="Core/Utilities/Log.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()}"> |
56 | <lib> | 56 | <lib> |
57 | <include name="${project::get-base-directory()}" /> | 57 | <include name="${project::get-base-directory()}" /> |
58 | <include name="${project::get-base-directory()}/${build.dir}" /> | 58 | <include name="${project::get-base-directory()}/${build.dir}" /> |
59 | </lib> | 59 | </lib> |
60 | <include name="System.EnterpriseServices.dll" /> | 60 | <include name="System.EnterpriseServices.dll" /> |
61 | <include name="System.Xml.dll" /> | 61 | <include name="System.Xml.dll" /> |
62 | <include name="System.dll" /> | 62 | <include name="System.dll" /> |
63 | </references> | 63 | </references> |
64 | </csc> | 64 | </csc> |
65 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> | 65 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
66 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> | 66 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
67 | <copy todir="${project::get-base-directory()}/../../bin/"> | 67 | <copy todir="${project::get-base-directory()}/../../bin/"> |
68 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 68 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
69 | <include name="*.dll"/> | 69 | <include name="*.dll"/> |
70 | <include name="*.exe"/> | 70 | <include name="*.exe"/> |
71 | </fileset> | 71 | </fileset> |
72 | </copy> | 72 | </copy> |
73 | </target> | 73 | </target> |
74 | <target name="clean"> | 74 | <target name="clean"> |
75 | <delete dir="${bin.dir}" failonerror="false" /> | 75 | <delete dir="${bin.dir}" failonerror="false" /> |
76 | <delete dir="${obj.dir}" failonerror="false" /> | 76 | <delete dir="${obj.dir}" failonerror="false" /> |
77 | </target> | 77 | </target> |
78 | <target name="doc" description="Creates documentation."> | 78 | <target name="doc" description="Creates documentation."> |
79 | </target> | 79 | </target> |
80 | </project> | 80 | </project> |
diff --git a/Servers/OpenSim.Servers.csproj b/Servers/OpenSim.Servers.csproj index 652d9ce..9d92bf2 100644 --- a/Servers/OpenSim.Servers.csproj +++ b/Servers/OpenSim.Servers.csproj | |||
@@ -1,115 +1,115 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{111F9E8F-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.Servers</AssemblyName> | 12 | <AssemblyName>OpenSim.Servers</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenSim.Servers</RootNamespace> | 19 | <RootNamespace>OpenSim.Servers</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 23 | </PropertyGroup> |
24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
26 | <BaseAddress>285212672</BaseAddress> | 26 | <BaseAddress>285212672</BaseAddress> |
27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
28 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>False</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>True</Optimize> |
35 | <OutputPath>..\bin\</OutputPath> | 35 | <OutputPath>../bin/</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 40 | <NoWarn></NoWarn> |
41 | </PropertyGroup> | 41 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
44 | <BaseAddress>285212672</BaseAddress> | 44 | <BaseAddress>285212672</BaseAddress> |
45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>True</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>False</Optimize> |
53 | <OutputPath>..\bin\</OutputPath> | 53 | <OutputPath>../bin/</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 58 | <NoWarn></NoWarn> |
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="System" > | 61 | <Reference Include="System" > |
62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System.Xml" > | 65 | <Reference Include="System.Xml" > |
66 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
67 | <Private>False</Private> | 67 | <Private>False</Private> |
68 | </Reference> | 68 | </Reference> |
69 | <Reference Include="libsecondlife.dll" > | 69 | <Reference Include="libsecondlife.dll" > |
70 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | </ItemGroup> | 73 | </ItemGroup> |
74 | <ItemGroup> | 74 | <ItemGroup> |
75 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | 75 | <ProjectReference Include="../OpenSim.Framework/OpenSim.Framework.csproj"> |
76 | <Name>OpenSim.Framework</Name> | 76 | <Name>OpenSim.Framework</Name> |
77 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 77 | <Project>{7404933D-0000-0000-0000-000000000000}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </ProjectReference> | 80 | </ProjectReference> |
81 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 81 | <ProjectReference Include="../OpenSim.Framework.Console/OpenSim.Framework.Console.csproj"> |
82 | <Name>OpenSim.Framework.Console</Name> | 82 | <Name>OpenSim.Framework.Console</Name> |
83 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 83 | <Project>{16759386-0000-0000-0000-000000000000}</Project> |
84 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 84 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
85 | <Private>False</Private> | 85 | <Private>False</Private> |
86 | </ProjectReference> | 86 | </ProjectReference> |
87 | </ItemGroup> | 87 | </ItemGroup> |
88 | <ItemGroup> | 88 | <ItemGroup> |
89 | <Compile Include="BaseHttpServer.cs"> | 89 | <Compile Include="BaseHttpServer.cs"> |
90 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
91 | </Compile> | 91 | </Compile> |
92 | <Compile Include="IRestHandler.cs"> | 92 | <Compile Include="IRestHandler.cs"> |
93 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
94 | </Compile> | 94 | </Compile> |
95 | <Compile Include="LocalUserProfileManager.cs"> | 95 | <Compile Include="LocalUserProfileManager.cs"> |
96 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
97 | </Compile> | 97 | </Compile> |
98 | <Compile Include="LoginResponse.cs"> | 98 | <Compile Include="LoginResponse.cs"> |
99 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
100 | </Compile> | 100 | </Compile> |
101 | <Compile Include="LoginServer.cs"> | 101 | <Compile Include="LoginServer.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
104 | <Compile Include="XmlRpcMethod.cs"> | 104 | <Compile Include="XmlRpcMethod.cs"> |
105 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
106 | </Compile> | 106 | </Compile> |
107 | </ItemGroup> | 107 | </ItemGroup> |
108 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 108 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
109 | <PropertyGroup> | 109 | <PropertyGroup> |
110 | <PreBuildEvent> | 110 | <PreBuildEvent> |
111 | </PreBuildEvent> | 111 | </PreBuildEvent> |
112 | <PostBuildEvent> | 112 | <PostBuildEvent> |
113 | </PostBuildEvent> | 113 | </PostBuildEvent> |
114 | </PropertyGroup> | 114 | </PropertyGroup> |
115 | </Project> | 115 | </Project> |
diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build index 1d4b496..74d1072 100644 --- a/Servers/OpenSim.Servers.dll.build +++ b/Servers/OpenSim.Servers.dll.build | |||
@@ -1,48 +1,48 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Servers" default="build"> | 2 | <project name="OpenSim.Servers" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.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="BaseHttpServer.cs" /> | 14 | <include name="BaseHttpServer.cs" /> |
15 | <include name="IRestHandler.cs" /> | 15 | <include name="IRestHandler.cs" /> |
16 | <include name="LocalUserProfileManager.cs" /> | 16 | <include name="LocalUserProfileManager.cs" /> |
17 | <include name="LoginResponse.cs" /> | 17 | <include name="LoginResponse.cs" /> |
18 | <include name="LoginServer.cs" /> | 18 | <include name="LoginServer.cs" /> |
19 | <include name="XmlRpcMethod.cs" /> | 19 | <include name="XmlRpcMethod.cs" /> |
20 | </sources> | 20 | </sources> |
21 | <references basedir="${project::get-base-directory()}"> | 21 | <references basedir="${project::get-base-directory()}"> |
22 | <lib> | 22 | <lib> |
23 | <include name="${project::get-base-directory()}" /> | 23 | <include name="${project::get-base-directory()}" /> |
24 | <include name="${project::get-base-directory()}/${build.dir}" /> | 24 | <include name="${project::get-base-directory()}/${build.dir}" /> |
25 | </lib> | 25 | </lib> |
26 | <include name="System.dll" /> | 26 | <include name="System.dll" /> |
27 | <include name="System.Xml.dll" /> | 27 | <include name="System.Xml.dll" /> |
28 | <include name="../bin/OpenSim.Framework.dll" /> | 28 | <include name="../bin/OpenSim.Framework.dll" /> |
29 | <include name="../bin/OpenSim.Framework.Console.dll" /> | 29 | <include name="../bin/OpenSim.Framework.Console.dll" /> |
30 | <include name="../bin/libsecondlife.dll" /> | 30 | <include name="../bin/libsecondlife.dll" /> |
31 | </references> | 31 | </references> |
32 | </csc> | 32 | </csc> |
33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 33 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
34 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 34 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
35 | <copy todir="${project::get-base-directory()}/../bin/"> | 35 | <copy todir="${project::get-base-directory()}/../bin/"> |
36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 36 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
37 | <include name="*.dll"/> | 37 | <include name="*.dll"/> |
38 | <include name="*.exe"/> | 38 | <include name="*.exe"/> |
39 | </fileset> | 39 | </fileset> |
40 | </copy> | 40 | </copy> |
41 | </target> | 41 | </target> |
42 | <target name="clean"> | 42 | <target name="clean"> |
43 | <delete dir="${bin.dir}" failonerror="false" /> | 43 | <delete dir="${bin.dir}" failonerror="false" /> |
44 | <delete dir="${obj.dir}" failonerror="false" /> | 44 | <delete dir="${obj.dir}" failonerror="false" /> |
45 | </target> | 45 | </target> |
46 | <target name="doc" description="Creates documentation."> | 46 | <target name="doc" description="Creates documentation."> |
47 | </target> | 47 | </target> |
48 | </project> | 48 | </project> |
diff --git a/prebuild.xml b/prebuild.xml index 5ef2438..4557159 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -140,6 +140,7 @@ | |||
140 | <Reference name="OpenSim.Framework"/> | 140 | <Reference name="OpenSim.Framework"/> |
141 | <Reference name="OpenSim.Framework.Console"/> | 141 | <Reference name="OpenSim.Framework.Console"/> |
142 | <Reference name="libsecondlife.dll"/> | 142 | <Reference name="libsecondlife.dll"/> |
143 | <Reference name="Db4objects.Db4o.dll"/> | ||
143 | 144 | ||
144 | <Files> | 145 | <Files> |
145 | <Match pattern="*.cs" recurse="true"/> | 146 | <Match pattern="*.cs" recurse="true"/> |