*Worked on prebuild and fixed some dependency issues

*Reworked RegionInfo (which required some configuration)
*This does compile; next step is to move over the different services to the new spots
OGSMerge
mingchen 2007-07-10 21:11:07 +00:00
parent d2854aea73
commit 57dc150a5e
65 changed files with 284 additions and 617 deletions

View File

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual C# Express 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
@ -71,259 +71,153 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Region\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({438A9556-0000-0000-0000-000000000000}).5 = ({A45242A2-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({438A9556-0000-0000-0000-000000000000}).7 = ({36B72A9B-0000-0000-0000-000000000000}) {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({438A9556-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000}) {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({438A9556-0000-0000-0000-000000000000}).9 = ({586E2916-0000-0000-0000-000000000000}) {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({438A9556-0000-0000-0000-000000000000}).10 = ({61FCCDB3-0000-0000-0000-000000000000}) {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({438A9556-0000-0000-0000-000000000000}).11 = ({DC3698B2-0000-0000-0000-000000000000}) {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({438A9556-0000-0000-0000-000000000000}).12 = ({BFB5D807-0000-0000-0000-000000000000}) {CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({438A9556-0000-0000-0000-000000000000}).13 = ({4806E378-0000-0000-0000-000000000000}) {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({438A9556-0000-0000-0000-000000000000}).14 = ({DCBA491C-0000-0000-0000-000000000000}) {CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({438A9556-0000-0000-0000-000000000000}).15 = ({F4FF31EB-0000-0000-0000-000000000000}) {A45242A2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({438A9556-0000-0000-0000-000000000000}).16 = ({C9E0F891-0000-0000-0000-000000000000}) {A45242A2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({8ACA2445-0000-0000-0000-000000000000}).2 = ({A45242A2-0000-0000-0000-000000000000}) {A45242A2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({8ACA2445-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) {A45242A2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({A45242A2-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({A45242A2-0000-0000-0000-000000000000}).1 = ({A7CD0630-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000}) {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({E5F1A03B-0000-0000-0000-000000000000}).0 = ({A45242A2-0000-0000-0000-000000000000}) {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({E5F1A03B-0000-0000-0000-000000000000}).1 = ({F22B4FF8-0000-0000-0000-000000000000}) {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({60FCC3A6-0000-0000-0000-000000000000}).0 = ({A45242A2-0000-0000-0000-000000000000}) {2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({60FCC3A6-0000-0000-0000-000000000000}).1 = ({C14E4DD8-0000-0000-0000-000000000000}) {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({F22B4FF8-0000-0000-0000-000000000000}).0 = ({A45242A2-0000-0000-0000-000000000000}) {2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({F22B4FF8-0000-0000-0000-000000000000}).1 = ({2CC71860-0000-0000-0000-000000000000}) {6251A10E-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({F22B4FF8-0000-0000-0000-000000000000}).2 = ({6251A10E-0000-0000-0000-000000000000}) {6251A10E-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({F22B4FF8-0000-0000-0000-000000000000}).3 = ({FE7B9CD5-0000-0000-0000-000000000000}) {6251A10E-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({F22B4FF8-0000-0000-0000-000000000000}).4 = ({E5E729AD-0000-0000-0000-000000000000}) {6251A10E-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({FE7B9CD5-0000-0000-0000-000000000000}).0 = ({6251A10E-0000-0000-0000-000000000000}) {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({E5E729AD-0000-0000-0000-000000000000}).0 = ({6251A10E-0000-0000-0000-000000000000}) {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({C14E4DD8-0000-0000-0000-000000000000}).0 = ({A45242A2-0000-0000-0000-000000000000}) {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({C14E4DD8-0000-0000-0000-000000000000}).1 = ({2CC71860-0000-0000-0000-000000000000}) {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({C14E4DD8-0000-0000-0000-000000000000}).2 = ({6251A10E-0000-0000-0000-000000000000}) {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({C14E4DD8-0000-0000-0000-000000000000}).3 = ({FE7B9CD5-0000-0000-0000-000000000000}) {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({C14E4DD8-0000-0000-0000-000000000000}).4 = ({E5E729AD-0000-0000-0000-000000000000}) {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({DCF71AE6-0000-0000-0000-000000000000}).0 = ({A45242A2-0000-0000-0000-000000000000}) {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({DCF71AE6-0000-0000-0000-000000000000}).1 = ({2CC71860-0000-0000-0000-000000000000}) {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({DCF71AE6-0000-0000-0000-000000000000}).2 = ({6251A10E-0000-0000-0000-000000000000}) {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({DCF71AE6-0000-0000-0000-000000000000}).3 = ({FE7B9CD5-0000-0000-0000-000000000000}) {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({DCF71AE6-0000-0000-0000-000000000000}).4 = ({E5E729AD-0000-0000-0000-000000000000}) {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({2FC96F92-0000-0000-0000-000000000000}).0 = ({A45242A2-0000-0000-0000-000000000000}) {F22B4FF8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({2FC96F92-0000-0000-0000-000000000000}).1 = ({DCF71AE6-0000-0000-0000-000000000000}) {F22B4FF8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) {F22B4FF8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({39038E85-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) {F22B4FF8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({39038E85-0000-0000-0000-000000000000}).2 = ({2CC71860-0000-0000-0000-000000000000}) {FE7B9CD5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({39038E85-0000-0000-0000-000000000000}).3 = ({61FCCDB3-0000-0000-0000-000000000000}) {FE7B9CD5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) {FE7B9CD5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) {FE7B9CD5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000}) {E5E729AD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({DC3698B2-0000-0000-0000-000000000000}).6 = ({61FCCDB3-0000-0000-0000-000000000000}) {E5E729AD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({DC3698B2-0000-0000-0000-000000000000}).7 = ({F4FF31EB-0000-0000-0000-000000000000}) {E5E729AD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({DC3698B2-0000-0000-0000-000000000000}).8 = ({C9E0F891-0000-0000-0000-000000000000}) {E5E729AD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) {C14E4DD8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000}) {C14E4DD8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000}) {C14E4DD8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000}) {C14E4DD8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) {DCF71AE6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000}) {DCF71AE6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) {DCF71AE6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) {DCF71AE6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000}) {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({DCBA491C-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({DCBA491C-0000-0000-0000-000000000000}).5 = ({CB52B7E7-0000-0000-0000-000000000000}) {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({DCBA491C-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({DCBA491C-0000-0000-0000-000000000000}).8 = ({2CC71860-0000-0000-0000-000000000000}) {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({DCBA491C-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000}) {61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({DCBA491C-0000-0000-0000-000000000000}).10 = ({39038E85-0000-0000-0000-000000000000}) {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({DCBA491C-0000-0000-0000-000000000000}).11 = ({F4FF31EB-0000-0000-0000-000000000000}) {61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({DCBA491C-0000-0000-0000-000000000000}).12 = ({C9E0F891-0000-0000-0000-000000000000}) {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) {39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) {39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000}) {DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) {DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000}) {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000}) {BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) {BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000}) {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000}) {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000}) {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000}) {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({24B12448-0000-0000-0000-000000000000}).5 = ({586E2916-0000-0000-0000-000000000000}) {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({24B12448-0000-0000-0000-000000000000}).6 = ({61FCCDB3-0000-0000-0000-000000000000}) {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({24B12448-0000-0000-0000-000000000000}).7 = ({39038E85-0000-0000-0000-000000000000}) {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({24B12448-0000-0000-0000-000000000000}).8 = ({DC3698B2-0000-0000-0000-000000000000}) {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({24B12448-0000-0000-0000-000000000000}).9 = ({BFB5D807-0000-0000-0000-000000000000}) {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({24B12448-0000-0000-0000-000000000000}).10 = ({DCBA491C-0000-0000-0000-000000000000}) {98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({24B12448-0000-0000-0000-000000000000}).11 = ({241A8CDD-0000-0000-0000-000000000000}) {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({24B12448-0000-0000-0000-000000000000}).12 = ({F4FF31EB-0000-0000-0000-000000000000}) {98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
GlobalSection(ProjectConfigurationPlatforms) = postSolution {15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB52B7E7-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB52B7E7-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A45242A2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A45242A2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{A45242A2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A45242A2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2CC71860-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2CC71860-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6251A10E-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6251A10E-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{6251A10E-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection
{6251A10E-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU GlobalSection(SolutionProperties) = preSolution
{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU HideSolutionNode = FALSE
{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection
{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{F22B4FF8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F22B4FF8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F22B4FF8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F22B4FF8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{FE7B9CD5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE7B9CD5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE7B9CD5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE7B9CD5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{E5E729AD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5E729AD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5E729AD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5E729AD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{C14E4DD8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C14E4DD8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C14E4DD8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C14E4DD8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{DCF71AE6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DCF71AE6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DCF71AE6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DCF71AE6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{61FCCDB3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61FCCDB3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{39038E85-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{39038E85-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DC3698B2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DC3698B2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFB5D807-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFB5D807-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{98C7B681-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{98C7B681-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{15B4FEF3-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{15B4FEF3-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F4FF31EB-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F4FF31EB-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90620634-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90620634-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90620634-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{43DB702D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43DB702D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{477B9270-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{477B9270-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9E0F891-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9E0F891-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal EndGlobal

View File

@ -78,6 +78,12 @@
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Configuration\OpenSim.Framework.Configuration.csproj">
<Name>OpenSim.Framework.Configuration</Name>
<Project>{A45242A2-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj"> <ProjectReference Include="..\Data\OpenSim.Framework.Data.csproj">
<Name>OpenSim.Framework.Data</Name> <Name>OpenSim.Framework.Data</Name>
<Project>{36B72A9B-0000-0000-0000-000000000000}</Project> <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -68,12 +68,6 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\General\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name>
<Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{A7CD0630-0000-0000-0000-000000000000}</Project> <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -187,10 +187,10 @@
<Compile Include="Types\AssetBase.cs"> <Compile Include="Types\AssetBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\RegionInfo.cs"> <Compile Include="Types\NetworkServersInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\NetworkServersInfo.cs"> <Compile Include="Types\RegionInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -132,6 +132,7 @@ namespace OpenSim.Framework.Types
{ {
estateSettings = new EstateSettings(); estateSettings = new EstateSettings();
this.setConfigurationDescription("REGION INFORMATION"); this.setConfigurationDescription("REGION INFORMATION");
this.addConfigurationOption("SimUUID", "UUID of Simulator (Default is recommended, random UUID)", LLUUID.Random().ToString());
this.addConfigurationOption("SimName", "Simulator Name", "OpenSim Test"); this.addConfigurationOption("SimName", "Simulator Name", "OpenSim Test");
this.addConfigurationOption("SimLocationX", "Grid Location (X Axis)", "1000"); this.addConfigurationOption("SimLocationX", "Grid Location (X Axis)", "1000");
this.addConfigurationOption("SimLocationY", "Grid Location (Y Axis)", "1000"); this.addConfigurationOption("SimLocationY", "Grid Location (Y Axis)", "1000");
@ -144,215 +145,69 @@ namespace OpenSim.Framework.Types
this.addConfigurationOption("MasterAvatarFirst", "First Name of Master Avatar", "Test"); this.addConfigurationOption("MasterAvatarFirst", "First Name of Master Avatar", "Test");
this.addConfigurationOption("MasterAvatarLast", "Last Name of Master Avatar", "User"); this.addConfigurationOption("MasterAvatarLast", "Last Name of Master Avatar", "User");
} }
public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
: this()
{
m_regionLocX = regionLocX;
m_regionLocY = regionLocY;
m_internalEndPoint = internalEndPoint;
m_externalHostName = externalUri;
}
public override void handleConfigurationItem(string configuration_key, string configuration_value) public override void handleConfigurationItem(string configuration_key, string configuration_value)
{ {
switch (configuration_key) switch (configuration_key)
{ {
case "SimUUID":
this.SimUUID = new LLUUID(configuration_value);
break;
case "SimName": case "SimName":
this.RegionName = configuration_value;
break; break;
case "SimLocationX": case "SimLocationX":
this.m_regionLocX = Convert.ToUInt32(configuration_value);
break; break;
case "SimLocationY": case "SimLocationY":
this.m_regionLocY = Convert.ToUInt32(configuration_value);
break; break;
case "Datastore": case "Datastore":
this.DataStore = configuration_value;
break; break;
case "InternalIPAddress": case "InternalIPAddress":
break;
case "InternalIPPort": IPAddress address;
break; if (IPAddress.TryParse(configuration_value, out address))
case "ExternalHostName":
break;
case "TerrainFile":
break;
case "TerrainMultiplier":
break;
case "MasterAvatarFirst":
break;
case "MasterAvatarLast":
break;
}
}
public void InitConfig(bool sandboxMode, IGenericConfig configData)
{
this.isSandbox = sandboxMode;
try
{
string attri = "";
// Sim UUID
string simId = configData.GetAttribute("SimUUID");
if (String.IsNullOrEmpty( simId ))
{
this.SimUUID = LLUUID.Random();
}
else
{
this.SimUUID = new LLUUID(simId);
}
configData.SetAttribute("SimUUID", this.SimUUID.ToString());
this.RegionName = GetString(configData, "SimName", "OpenSim test", "Region Name");
//m_regionLocX = (uint) GetInt(configData, "SimLocationX", 1000, "Grid Location X");
attri = "";
attri = configData.GetAttribute("SimLocationX");
if (attri == "")
{
string location = MainLog.Instance.CmdPrompt("Grid Location X", "1000");
configData.SetAttribute("SimLocationX", location);
m_regionLocX = (uint)Convert.ToUInt32(location);
}
else
{
m_regionLocX = (uint)Convert.ToUInt32(attri);
}
// Sim/Grid location Y
attri = "";
attri = configData.GetAttribute("SimLocationY");
if (attri == "")
{
string location = MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
configData.SetAttribute("SimLocationY", location);
m_regionLocY = (uint)Convert.ToUInt32(location);
}
else
{
m_regionLocY = (uint)Convert.ToUInt32(attri);
}
m_regionHandle = null;
this.DataStore = GetString(configData, "Datastore", "localworld.yap", "Filename for local storage");
IPAddress internalAddress = GetIPAddress(configData, "InternalIPAddress", "0.0.0.0", "Internal IP Address for UDP client connections");
int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections");
m_internalEndPoint = new IPEndPoint(internalAddress, internalPort);
m_externalHostName = GetString(configData, "ExternalHostName", "127.0.0.1", "External Host Name");
estateSettings.terrainFile =
GetString(configData, "TerrainFile", "default.r32", "GENERAL SETTING: Default Terrain File");
attri = "";
attri = configData.GetAttribute("TerrainMultiplier");
if (attri == "")
{
string re = MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
}
else
{
this.estateSettings.terrainMultiplier = Convert.ToDouble(attri);
}
attri = "";
attri = configData.GetAttribute("MasterAvatarFirstName");
if (attri == "")
{
this.MasterAvatarFirstName = MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
}
else
{
this.MasterAvatarFirstName = attri;
}
attri = "";
attri = configData.GetAttribute("MasterAvatarLastName");
if (attri == "")
{
this.MasterAvatarLastName = MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
}
else
{
this.MasterAvatarLastName = attri;
}
if (isSandbox) //Sandbox Mode Specific Settings
{
attri = "";
attri = configData.GetAttribute("MasterAvatarSandboxPassword");
if (attri == "")
{ {
this.MasterAvatarSandboxPassword = MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test"); this.m_internalEndPoint = new IPEndPoint(address, 0);
//Should I store this?
configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
} }
else else
{ {
this.MasterAvatarSandboxPassword = attri; MainLog.Instance.Error("Invalid Internal IP Address. Using default (0.0.0.0).");
IPAddress.TryParse("0.0.0.0", out address);
this.m_internalEndPoint = new IPEndPoint(address, 0);
} }
} break;
case "InternalIPPort":
configData.Commit(); this.m_internalEndPoint.Port = Convert.ToInt32(configuration_value);
break;
case "ExternalHostName":
this.m_externalHostName = configuration_value;
break;
case "TerrainFile":
this.estateSettings.terrainFile = configuration_value;
break;
case "TerrainMultiplier":
this.estateSettings.terrainMultiplier = Convert.ToDouble(configuration_value);
break;
case "MasterAvatarFirst":
this.MasterAvatarFirstName = configuration_value;
break;
case "MasterAvatarLast":
this.MasterAvatarLastName = configuration_value;
break;
} }
catch (Exception e)
{
MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
MainLog.Instance.Warn(e.ToString());
}
MainLog.Instance.Verbose("Sim settings loaded:");
MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());
MainLog.Instance.Verbose("Name: " + this.RegionName);
MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());
MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() );
MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());
}
private uint GetInt(IGenericConfig configData, string p, int p_3, string p_4)
{
throw new Exception("The method or operation is not implemented.");
}
private string GetString(IGenericConfig configData, string attrName, string defaultvalue, string prompt)
{
string s = configData.GetAttribute(attrName);
if (String.IsNullOrEmpty( s ))
{
s = MainLog.Instance.CmdPrompt(prompt, defaultvalue);
configData.SetAttribute(attrName, s );
}
return s;
}
private IPAddress GetIPAddress(IGenericConfig configData, string attrName, string defaultvalue, string prompt)
{
string addressStr = configData.GetAttribute(attrName);
IPAddress address;
if (!IPAddress.TryParse(addressStr, out address))
{
address = MainLog.Instance.CmdPromptIPAddress(prompt, defaultvalue);
configData.SetAttribute(attrName, address.ToString());
}
return address;
} }
private int GetIPPort(IGenericConfig configData, string attrName, string defaultvalue, string prompt)
{
string portStr = configData.GetAttribute(attrName);
int port;
if (!int.TryParse(portStr, out port))
{
port = MainLog.Instance.CmdPromptIPPort(prompt, defaultvalue);
configData.SetAttribute(attrName, port.ToString());
}
return port;
}
} }
} }

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -66,10 +66,6 @@
<HintPath>..\..\..\bin\libsecondlife.dll</HintPath> <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenSim.Framework.GenericConfig.Xml" >
<HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" > <Reference Include="System" >
<HintPath>System.dll</HintPath> <HintPath>System.dll</HintPath>
<Private>False</Private> <Private>False</Private>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -3,7 +3,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<StartArguments>-loginserver -sandbox -accounts</StartArguments> <StartArguments>-loginserver -sandbox -accounts</StartArguments>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -38,7 +38,6 @@ using OpenSim.Framework.Data;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Types; using OpenSim.Framework.Types;
using OpenSim.GenericConfig;
using OpenSim.Physics.Manager; using OpenSim.Physics.Manager;
using OpenSim.Region.Caches; using OpenSim.Region.Caches;
using OpenSim.Region.ClientStack; using OpenSim.Region.ClientStack;
@ -176,12 +175,10 @@ namespace OpenSim
string path2 = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions"); string path2 = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Regions");
string path3 = Path.Combine(path2, "default.xml"); string path3 = Path.Combine(path2, "default.xml");
Console.WriteLine("Creating default region config file"); Console.WriteLine("Creating default region config file");
//TODO create default region regionDat.setConfigurationFilename(path3);
IGenericConfig defaultConfig = new XmlConfig(path3); configManager.addConfigurationMember((ConfigurationMember)regionDat);
defaultConfig.LoadData(); configManager.gatherConfiguration();
defaultConfig.Commit(); configManager.clearConfigurationMembers();
defaultConfig.Close();
defaultConfig = null;
configFiles = Directory.GetFiles(path, "*.xml"); configFiles = Directory.GetFiles(path, "*.xml");
} }
@ -272,107 +269,7 @@ namespace OpenSim
#endregion #endregion
private void SetupFromConfigFile(IGenericConfig configData)
{
// Log filename
string attri = "";
attri = configData.GetAttribute("LogFilename");
if (String.IsNullOrEmpty(attri))
{
}
else
{
m_logFilename = attri;
}
// SandBoxMode
attri = "";
attri = configData.GetAttribute("SandBox");
if ((attri == "") || ((attri != "false") && (attri != "true")))
{
this.m_sandbox = false;
configData.SetAttribute("SandBox", "false");
}
else
{
this.m_sandbox = Convert.ToBoolean(attri);
}
// LoginServer
attri = "";
attri = configData.GetAttribute("LoginServer");
if ((attri == "") || ((attri != "false") && (attri != "true")))
{
this.m_loginserver = false;
configData.SetAttribute("LoginServer", "false");
}
else
{
this.m_loginserver = Convert.ToBoolean(attri);
}
// Sandbox User accounts
attri = "";
attri = configData.GetAttribute("UserAccount");
if ((attri == "") || ((attri != "false") && (attri != "true")))
{
this.user_accounts = false;
configData.SetAttribute("UserAccounts", "false");
}
else if (attri == "true")
{
this.user_accounts = Convert.ToBoolean(attri);
}
// Grid mode hack to use local asset server
attri = "";
attri = configData.GetAttribute("LocalAssets");
if ((attri == "") || ((attri != "false") && (attri != "true")))
{
this.gridLocalAsset = false;
configData.SetAttribute("LocalAssets", "false");
}
else if (attri == "true")
{
this.gridLocalAsset = Convert.ToBoolean(attri);
}
attri = "";
attri = configData.GetAttribute("PhysicsEngine");
switch (attri)
{
default:
m_log.Warn("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
Environment.Exit(1);
break;
case "":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
ScenePresence.PhysicsEngineFlying = false;
break;
case "basicphysics":
this.m_physicsEngine = "basicphysics";
configData.SetAttribute("PhysicsEngine", "basicphysics");
ScenePresence.PhysicsEngineFlying = false;
break;
case "RealPhysX":
this.m_physicsEngine = "RealPhysX";
ScenePresence.PhysicsEngineFlying = true;
break;
case "OpenDynamicsEngine":
this.m_physicsEngine = "OpenDynamicsEngine";
ScenePresence.PhysicsEngineFlying = true;
break;
}
configData.Commit();
}
/// <summary> /// <summary>
/// Performs any last-minute sanity checking and shuts down the region server /// Performs any last-minute sanity checking and shuts down the region server

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -90,6 +90,12 @@
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Framework\Configuration\OpenSim.Framework.Configuration.csproj">
<Name>OpenSim.Framework.Configuration</Name>
<Project>{A45242A2-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{A7CD0630-0000-0000-0000-000000000000}</Project> <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
@ -134,9 +140,6 @@
<Compile Include="UDPServer.cs"> <Compile Include="UDPServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="RegionApplicationBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.cs"> <Compile Include="ClientView.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -152,6 +155,9 @@
<Compile Include="ClientView.ProcessPackets.cs"> <Compile Include="ClientView.ProcessPackets.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="RegionApplicationBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Assets\InventoryCache.cs"> <Compile Include="Assets\InventoryCache.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -41,7 +41,6 @@ namespace OpenSim.Region.ClientStack
{ {
public class RegionApplicationBase public class RegionApplicationBase
{ {
protected IGenericConfig localConfig;
protected PhysicsManager physManager; protected PhysicsManager physManager;
protected AssetCache AssetCache; protected AssetCache AssetCache;
protected InventoryCache InventoryCache; protected InventoryCache InventoryCache;

View File

@ -84,6 +84,12 @@
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Framework\Configuration\OpenSim.Framework.Configuration.csproj">
<Name>OpenSim.Framework.Configuration</Name>
<Project>{A45242A2-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj"> <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj">
<Name>OpenSim.Framework.Data</Name> <Name>OpenSim.Framework.Data</Name>
<Project>{36B72A9B-0000-0000-0000-000000000000}</Project> <Project>{36B72A9B-0000-0000-0000-000000000000}</Project>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -96,6 +96,12 @@
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Framework\Configuration\OpenSim.Framework.Configuration.csproj">
<Name>OpenSim.Framework.Configuration</Name>
<Project>{A45242A2-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{A7CD0630-0000-0000-0000-000000000000}</Project> <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -74,10 +74,6 @@
<HintPath>Microsoft.JScript.dll</HintPath> <HintPath>Microsoft.JScript.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenSim.Framework.GenericConfig.Xml" >
<HintPath>OpenSim.Framework.GenericConfig.Xml.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" > <Reference Include="System" >
<HintPath>System.dll</HintPath> <HintPath>System.dll</HintPath>
<Private>False</Private> <Private>False</Private>
@ -104,6 +100,12 @@
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Framework\Configuration\OpenSim.Framework.Configuration.csproj">
<Name>OpenSim.Framework.Configuration</Name>
<Project>{A45242A2-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{A7CD0630-0000-0000-0000-000000000000}</Project> <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -92,6 +92,12 @@
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Framework\Configuration\OpenSim.Framework.Configuration.csproj">
<Name>OpenSim.Framework.Configuration</Name>
<Project>{A45242A2-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{A7CD0630-0000-0000-0000-000000000000}</Project> <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\;C:\Sugilite\bin\Physics\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\;C:\OGSMerge\bin\Physics\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -56,5 +56,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.*")] [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.*")] [assembly: AssemblyFileVersion("1.0.0.0")]

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ReferencePath>C:\Sugilite\bin\</ReferencePath> <ReferencePath>C:\OGSMerge\bin\</ReferencePath>
<LastOpenVersion>8.0.50727</LastOpenVersion> <LastOpenVersion>8.0.50727</LastOpenVersion>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
<ProjectTrust>0</ProjectTrust> <ProjectTrust>0</ProjectTrust>

BIN
bin/Prebuild.exe Normal file

Binary file not shown.

View File

@ -1,3 +0,0 @@
<Root>
<Config SimUUID="16d2a66f6917440eaf5bc39794385417" SimName="OpenSim test" SimLocationX="1000" SimLocationY="1000" Datastore="localworld.yap" InternalIPAddress="0.0.0.0" InternalIPPort="9000" ExternalHostName="127.0.0.1" TerrainFile="default.r32" TerrainMultiplier="60" MasterAvatarFirstName="Test" MasterAvatarLastName="User" MasterAvatarSandboxPassword="test" />
</Root>

Binary file not shown.

View File

@ -406,7 +406,6 @@
<ReferencePath>../../../bin/</ReferencePath> <ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/> <Reference name="System"/>
<Reference name="System.Xml"/> <Reference name="System.Xml"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Files> <Files>
@ -508,7 +507,6 @@
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Data"/> <Reference name="OpenSim.Framework.Data"/>
<Reference name="OpenSim.Framework.GenericConfig.Xml"/>
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
<Reference name="Db4objects.Db4o.dll"/> <Reference name="Db4objects.Db4o.dll"/>
@ -534,7 +532,8 @@
<ReferencePath>../../../bin/</ReferencePath> <ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/> <Reference name="System"/>
<Reference name="System.Xml"/> <Reference name="System.Xml"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework" />
<Reference name="OpenSim.Framework.Configuration" />
<Reference name="OpenSim.Framework.Data" /> <Reference name="OpenSim.Framework.Data" />
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
@ -563,6 +562,7 @@
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Configuration" />
<Reference name="OpenSim.Framework.Communications" /> <Reference name="OpenSim.Framework.Communications" />
<Reference name="OpenSim.Framework.Data" /> <Reference name="OpenSim.Framework.Data" />
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
@ -588,6 +588,7 @@
<ReferencePath>../../../../bin/</ReferencePath> <ReferencePath>../../../../bin/</ReferencePath>
<Reference name="System"/> <Reference name="System"/>
<Reference name="System.Xml"/> <Reference name="System.Xml"/>
<Reference name="OpenSim.Framework.Configuration" />
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework.UserManagement" /> <Reference name="OpenSim.Framework.UserManagement" />
<Reference name="OpenSim.Framework.Data" /> <Reference name="OpenSim.Framework.Data" />
@ -619,6 +620,7 @@
<Reference name="Db4objects.Db4o.dll"/> <Reference name="Db4objects.Db4o.dll"/>
<Reference name="OpenSim.Region.Terrain.BasicTerrain"/> <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Configuration"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Region.Physics.Manager"/> <Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
@ -653,7 +655,7 @@
<Reference name="OpenSim.Region.Terrain.BasicTerrain"/> <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.GenericConfig.Xml"/> <Reference name="OpenSim.Framework.Configuration" />
<Reference name="OpenSim.Region.Physics.Manager"/> <Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Region.Caches"/> <Reference name="OpenSim.Region.Caches"/>
@ -929,6 +931,7 @@
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Region.GridInterfaces.Local"/> <Reference name="OpenSim.Region.GridInterfaces.Local"/>
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Configuration" />
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Region.Communications.Local"/> <Reference name="OpenSim.Region.Communications.Local"/>
<Reference name="OpenSim.Region.Caches"/> <Reference name="OpenSim.Region.Caches"/>