aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorgareth2007-05-07 16:32:30 +0000
committergareth2007-05-07 16:32:30 +0000
commit3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1 (patch)
tree5d6b1009685278b214100a7901bd4feaeed584da
parentUpdated to have uniform build number (diff)
downloadopensim-SC-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.zip
opensim-SC-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.gz
opensim-SC-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.bz2
opensim-SC-3de3d8bb3ba9b0781a2078c8698816ae5b72f7b1.tar.xz
Merged 0.1-prestable back into trunk :(
Diffstat
-rw-r--r--OpenGrid.Framework.Data.DB4o/DB4oGridData.cs22
-rw-r--r--OpenGrid.Framework.Data.DB4o/DB4oManager.cs68
-rw-r--r--OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj38
-rw-r--r--OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj34
-rw-r--r--OpenGrid.Framework.Data/UserProfileData.cs43
-rw-r--r--OpenGridServices.GridServer/GridManager.cs43
-rw-r--r--OpenGridServices.GridServer/Main.cs6
-rw-r--r--OpenSim.Framework.Console/ConsoleBase.cs4
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build1
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build1
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs137
-rw-r--r--OpenSim.build89
-rwxr-xr-xreleng/makerel.sh4
13 files changed, 323 insertions, 167 deletions
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
index c853b50..caf7eb0 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
@@ -9,20 +9,20 @@ namespace OpenGrid.Framework.Data.DB4o
9{ 9{
10 class DB4oGridData : IGridData 10 class DB4oGridData : IGridData
11 { 11 {
12 DB4oManager manager; 12 DB4oGridManager manager;
13 13
14 public void Initialise() { 14 public void Initialise() {
15 manager = new DB4oManager("gridserver.yap"); 15 manager = new DB4oGridManager("gridserver.yap");
16 } 16 }
17 17
18 public SimProfileData GetProfileByHandle(ulong handle) { 18 public SimProfileData GetProfileByHandle(ulong handle) {
19 lock (manager.profiles) 19 lock (manager.simProfiles)
20 { 20 {
21 foreach (LLUUID UUID in manager.profiles.Keys) 21 foreach (LLUUID UUID in manager.simProfiles.Keys)
22 { 22 {
23 if (manager.profiles[UUID].regionHandle == handle) 23 if (manager.simProfiles[UUID].regionHandle == handle)
24 { 24 {
25 return manager.profiles[UUID]; 25 return manager.simProfiles[UUID];
26 } 26 }
27 } 27 }
28 } 28 }
@@ -31,17 +31,17 @@ namespace OpenGrid.Framework.Data.DB4o
31 31
32 public SimProfileData GetProfileByLLUUID(LLUUID uuid) 32 public SimProfileData GetProfileByLLUUID(LLUUID uuid)
33 { 33 {
34 lock (manager.profiles) 34 lock (manager.simProfiles)
35 { 35 {
36 if (manager.profiles.ContainsKey(uuid)) 36 if (manager.simProfiles.ContainsKey(uuid))
37 return manager.profiles[uuid]; 37 return manager.simProfiles[uuid];
38 } 38 }
39 throw new Exception("Unable to find profile with UUID (" + uuid.ToStringHyphenated() + ")"); 39 throw new Exception("Unable to find profile with UUID (" + uuid.ToStringHyphenated() + ")");
40 } 40 }
41 41
42 public DataResponse AddProfile(SimProfileData profile) 42 public DataResponse AddProfile(SimProfileData profile)
43 { 43 {
44 lock (manager.profiles) 44 lock (manager.simProfiles)
45 { 45 {
46 if (manager.AddRow(profile)) 46 if (manager.AddRow(profile))
47 { 47 {
@@ -55,7 +55,7 @@ namespace OpenGrid.Framework.Data.DB4o
55 } 55 }
56 56
57 public bool AuthenticateSim(LLUUID uuid, ulong handle, string key) { 57 public bool AuthenticateSim(LLUUID uuid, ulong handle, string key) {
58 if (manager.profiles[uuid].regionRecvKey == key) 58 if (manager.simProfiles[uuid].regionRecvKey == key)
59 return true; 59 return true;
60 return false; 60 return false;
61 } 61 }
diff --git a/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
index 3ebcee2..aaa6e91 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ b/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
@@ -7,19 +7,19 @@ using libsecondlife;
7 7
8namespace OpenGrid.Framework.Data.DB4o 8namespace OpenGrid.Framework.Data.DB4o
9{ 9{
10 class DB4oManager 10 class DB4oGridManager
11 { 11 {
12 public Dictionary<LLUUID, SimProfileData> profiles = new Dictionary<LLUUID, SimProfileData>(); 12 public Dictionary<LLUUID, SimProfileData> simProfiles = new Dictionary<LLUUID, SimProfileData>();
13 string dbfl; 13 string dbfl;
14 14
15 public DB4oManager(string db4odb) 15 public DB4oGridManager(string db4odb)
16 { 16 {
17 dbfl = db4odb; 17 dbfl = db4odb;
18 IObjectContainer database; 18 IObjectContainer database;
19 database = Db4oFactory.OpenFile(dbfl); 19 database = Db4oFactory.OpenFile(dbfl);
20 IObjectSet result = database.Get(typeof(SimProfileData)); 20 IObjectSet result = database.Get(typeof(SimProfileData));
21 foreach(SimProfileData row in result) { 21 foreach(SimProfileData row in result) {
22 profiles.Add(row.UUID, row); 22 simProfiles.Add(row.UUID, row);
23 } 23 }
24 database.Close(); 24 database.Close();
25 } 25 }
@@ -31,7 +31,65 @@ namespace OpenGrid.Framework.Data.DB4o
31 /// <returns>Successful?</returns> 31 /// <returns>Successful?</returns>
32 public bool AddRow(SimProfileData row) 32 public bool AddRow(SimProfileData row)
33 { 33 {
34 profiles.Add(row.UUID, row); 34 if (simProfiles.ContainsKey(row.UUID))
35 {
36 simProfiles[row.UUID] = row;
37 }
38 else
39 {
40 simProfiles.Add(row.UUID, row);
41 }
42
43 try
44 {
45 IObjectContainer database;
46 database = Db4oFactory.OpenFile(dbfl);
47 database.Set(row);
48 database.Close();
49 return true;
50 }
51 catch (Exception e)
52 {
53 return false;
54 }
55 }
56
57
58 }
59
60 class DB4oUserManager
61 {
62 public Dictionary<LLUUID, UserProfileData> userProfiles = new Dictionary<LLUUID, UserProfileData>();
63 string dbfl;
64
65 public DB4oUserManager(string db4odb)
66 {
67 dbfl = db4odb;
68 IObjectContainer database;
69 database = Db4oFactory.OpenFile(dbfl);
70 IObjectSet result = database.Get(typeof(UserProfileData));
71 foreach (UserProfileData row in result)
72 {
73 userProfiles.Add(row.UUID, row);
74 }
75 database.Close();
76 }
77
78 /// <summary>
79 /// Adds a new profile to the database (Warning: Probably slow.)
80 /// </summary>
81 /// <param name="row">The profile to add</param>
82 /// <returns>Successful?</returns>
83 public bool AddRow(UserProfileData row)
84 {
85 if (userProfiles.ContainsKey(row.UUID))
86 {
87 userProfiles[row.UUID] = row;
88 }
89 else
90 {
91 userProfiles.Add(row.UUID, row);
92 }
35 93
36 try 94 try
37 { 95 {
diff --git a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index 45a2d44..6ef93c2 100644
--- a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
@@ -1,4 +1,4 @@
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>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{39BD9497-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>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName> 13 <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>
@@ -15,9 +16,11 @@
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>
20 </AppDesignerFolder>
19 <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace> 21 <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,26 +61,27 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="System" > 68 <Reference Include="System">
62 <HintPath>System.dll</HintPath> 69 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System.Xml" > 72 <Reference Include="System.Xml">
66 <HintPath>System.Xml.dll</HintPath> 73 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="System.Data" > 76 <Reference Include="System.Data">
70 <HintPath>System.Data.dll</HintPath> 77 <HintPath>System.Data.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="libsecondlife.dll" > 80 <Reference Include="libsecondlife.dll">
74 <HintPath>..\bin\libsecondlife.dll</HintPath> 81 <HintPath>..\bin\libsecondlife.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
77 <Reference Include="Db4objects.Db4o.dll" > 84 <Reference Include="Db4objects.Db4o.dll">
78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> 85 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
79 <Private>False</Private> 86 <Private>False</Private>
80 </Reference> 87 </Reference>
@@ -84,7 +91,7 @@
84 <Name>OpenGrid.Framework.Data</Name> 91 <Name>OpenGrid.Framework.Data</Name>
85 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 92 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 93 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 94 <Private>False</Private>
88 </ProjectReference> 95 </ProjectReference>
89 </ItemGroup> 96 </ItemGroup>
90 <ItemGroup> 97 <ItemGroup>
@@ -94,6 +101,7 @@
94 <Compile Include="DB4oManager.cs"> 101 <Compile Include="DB4oManager.cs">
95 <SubType>Code</SubType> 102 <SubType>Code</SubType>
96 </Compile> 103 </Compile>
104 <Compile Include="DB4oUserData.cs" />
97 <Compile Include="Properties\AssemblyInfo.cs"> 105 <Compile Include="Properties\AssemblyInfo.cs">
98 <SubType>Code</SubType> 106 <SubType>Code</SubType>
99 </Compile> 107 </Compile>
@@ -105,4 +113,4 @@
105 <PostBuildEvent> 113 <PostBuildEvent>
106 </PostBuildEvent> 114 </PostBuildEvent>
107 </PropertyGroup> 115 </PropertyGroup>
108</Project> 116</Project> \ No newline at end of file
diff --git a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index bba6720..e64663d 100644
--- a/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -1,4 +1,4 @@
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>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{62CDF671-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>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenGrid.Framework.Data</AssemblyName> 13 <AssemblyName>OpenGrid.Framework.Data</AssemblyName>
@@ -15,9 +16,11 @@
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>
20 </AppDesignerFolder>
19 <RootNamespace>OpenGrid.Framework.Data</RootNamespace> 21 <RootNamespace>OpenGrid.Framework.Data</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,22 +61,23 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="System" > 68 <Reference Include="System">
62 <HintPath>System.dll</HintPath> 69 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System.Xml" > 72 <Reference Include="System.Xml">
66 <HintPath>System.Xml.dll</HintPath> 73 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="System.Data" > 76 <Reference Include="System.Data">
70 <HintPath>System.Data.dll</HintPath> 77 <HintPath>System.Data.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="libsecondlife.dll" > 80 <Reference Include="libsecondlife.dll">
74 <HintPath>..\bin\libsecondlife.dll</HintPath> 81 <HintPath>..\bin\libsecondlife.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
@@ -84,6 +91,7 @@
84 <Compile Include="SimProfileData.cs"> 91 <Compile Include="SimProfileData.cs">
85 <SubType>Code</SubType> 92 <SubType>Code</SubType>
86 </Compile> 93 </Compile>
94 <Compile Include="UserData.cs" />
87 <Compile Include="UserProfileData.cs"> 95 <Compile Include="UserProfileData.cs">
88 <SubType>Code</SubType> 96 <SubType>Code</SubType>
89 </Compile> 97 </Compile>
@@ -98,4 +106,4 @@
98 <PostBuildEvent> 106 <PostBuildEvent>
99 </PostBuildEvent> 107 </PostBuildEvent>
100 </PropertyGroup> 108 </PropertyGroup>
101</Project> 109</Project> \ No newline at end of file
diff --git a/OpenGrid.Framework.Data/UserProfileData.cs b/OpenGrid.Framework.Data/UserProfileData.cs
index d99394e..3a54828 100644
--- a/OpenGrid.Framework.Data/UserProfileData.cs
+++ b/OpenGrid.Framework.Data/UserProfileData.cs
@@ -7,27 +7,42 @@ namespace OpenGrid.Framework.Data
7{ 7{
8 public class UserProfileData 8 public class UserProfileData
9 { 9 {
10 string username; // The configurable part of the users username 10 public LLUUID UUID;
11 string surname; // The users surname (can be used to indicate user class - eg 'Test User' or 'Test Admin') 11 public string username; // The configurable part of the users username
12 public string surname; // The users surname (can be used to indicate user class - eg 'Test User' or 'Test Admin')
12 13
13 ulong homeRegion; // RegionHandle of home 14 public string passwordHash; // Hash of the users password
14 LLVector3 homeLocation; // Home Location inside the sim
15 15
16 int created; // UNIX Epoch Timestamp (User Creation) 16 public ulong homeRegion; // RegionHandle of home
17 int lastLogin; // UNIX Epoch Timestamp (Last Login Time) 17 public LLVector3 homeLocation; // Home Location inside the sim
18 18
19 string userInventoryURI; // URI to inventory server for this user 19 public int created; // UNIX Epoch Timestamp (User Creation)
20 string userAssetURI; // URI to asset server for this user 20 public int lastLogin; // UNIX Epoch Timestamp (Last Login Time)
21 21
22 uint profileCanDoMask; // Profile window "I can do" mask 22 public string userInventoryURI; // URI to inventory server for this user
23 uint profileWantDoMask; // Profile window "I want to" mask 23 public string userAssetURI; // URI to asset server for this user
24 24
25 string profileAboutText; // My about window text 25 public uint profileCanDoMask; // Profile window "I can do" mask
26 string profileFirstText; // First Life Text 26 public uint profileWantDoMask; // Profile window "I want to" mask
27 27
28 LLUUID profileImage; // My avatars profile image 28 public string profileAboutText; // My about window text
29 LLUUID profileFirstImage; // First-life image 29 public string profileFirstText; // First Life Text
30 30
31 public LLUUID profileImage; // My avatars profile image
32 public LLUUID profileFirstImage; // First-life image
33 public UserAgentData currentAgent; // The users last agent
34 }
35
36 public class UserAgentData
37 {
38 public string agentIP; // The IP of the agent
39 public uint agentPort; // The port of the agent
40 public bool agentOnline; // The online status of the agent
41 public LLUUID sessionID; // The session ID for the agent
42 public LLUUID secureSessionID; // The secure session ID for the agent
43 public LLUUID regionID; // The region ID the agent occupies
44 public uint loginTime; // EPOCH based Timestamp
45 public uint logoutTime; // Timestamp or 0 if N/A
31 46
32 } 47 }
33} 48}
diff --git a/OpenGridServices.GridServer/GridManager.cs b/OpenGridServices.GridServer/GridManager.cs
index 8cff0d3..e41f3d5 100644
--- a/OpenGridServices.GridServer/GridManager.cs
+++ b/OpenGridServices.GridServer/GridManager.cs
@@ -16,6 +16,7 @@ namespace OpenGridServices.GridServer
16 class GridManager 16 class GridManager
17 { 17 {
18 Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>(); 18 Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
19 public string defaultRecvKey;
19 20
20 /// <summary> 21 /// <summary>
21 /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded. 22 /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.
@@ -23,27 +24,26 @@ namespace OpenGridServices.GridServer
23 /// <param name="FileName">The filename to the grid server plugin DLL</param> 24 /// <param name="FileName">The filename to the grid server plugin DLL</param>
24 public void AddPlugin(string FileName) 25 public void AddPlugin(string FileName)
25 { 26 {
27 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Storage: Attempting to load " + FileName);
26 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 28 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
27 29
30 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
28 foreach (Type pluginType in pluginAssembly.GetTypes()) 31 foreach (Type pluginType in pluginAssembly.GetTypes())
29 { 32 {
30 if (pluginType.IsPublic) 33 if (!pluginType.IsAbstract)
31 { 34 {
32 if (!pluginType.IsAbstract) 35 Type typeInterface = pluginType.GetInterface("IGridData", true);
33 { 36
34 Type typeInterface = pluginType.GetInterface("IGridData", true); 37 if (typeInterface != null)
35 38 {
36 if (typeInterface != null) 39 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
37 { 40 plug.Initialise();
38 IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 41 this._plugins.Add(plug.getName(), plug);
39 plug.Initialise(); 42 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Storage: Added IGridData Interface");
40 this._plugins.Add(plug.getName(),plug); 43 }
41 44
42 } 45 typeInterface = null;
43 46 }
44 typeInterface = null;
45 }
46 }
47 } 47 }
48 48
49 pluginAssembly = null; 49 pluginAssembly = null;
@@ -63,7 +63,7 @@ namespace OpenGridServices.GridServer
63 } 63 }
64 catch (Exception e) 64 catch (Exception e)
65 { 65 {
66 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("getRegionPlugin UUID " + kvp.Key + " is made of fail: " + e.ToString()); 66 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
67 } 67 }
68 } 68 }
69 return null; 69 return null;
@@ -84,7 +84,7 @@ namespace OpenGridServices.GridServer
84 } 84 }
85 catch (Exception e) 85 catch (Exception e)
86 { 86 {
87 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("getRegionPlugin Handle " + kvp.Key + " is made of fail: " + e.ToString()); 87 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
88 } 88 }
89 } 89 }
90 return null; 90 return null;
@@ -269,6 +269,7 @@ namespace OpenGridServices.GridServer
269 TheSim = new SimProfileData(); 269 TheSim = new SimProfileData();
270 LLUUID UUID = new LLUUID(param); 270 LLUUID UUID = new LLUUID(param);
271 TheSim.UUID = UUID; 271 TheSim.UUID = UUID;
272 TheSim.regionRecvKey = defaultRecvKey;
272 } 273 }
273 274
274 XmlDocument doc = new XmlDocument(); 275 XmlDocument doc = new XmlDocument();
@@ -320,11 +321,13 @@ namespace OpenGridServices.GridServer
320 321
321 try 322 try
322 { 323 {
324 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Attempting to add a new region to the grid - " + _plugins.Count + " storage provider(s) registered.");
323 foreach (KeyValuePair<string, IGridData> kvp in _plugins) 325 foreach (KeyValuePair<string, IGridData> kvp in _plugins)
324 { 326 {
325 try 327 try
326 { 328 {
327 kvp.Value.AddProfile(TheSim); 329 kvp.Value.AddProfile(TheSim);
330 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("New sim added to grid (" + TheSim.regionName + ")");
328 } 331 }
329 catch (Exception e) 332 catch (Exception e)
330 { 333 {
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index f7cfe71..ba6c60d 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -47,6 +47,7 @@ namespace OpenGridServices.GridServer
47 public class OpenGrid_Main : BaseServer, conscmd_callback 47 public class OpenGrid_Main : BaseServer, conscmd_callback
48 { 48 {
49 private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll"; 49 private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
50 private string GridDll = "OpenGrid.Framework.Data.DB4o.dll";
50 public GridConfig Cfg; 51 public GridConfig Cfg;
51 52
52 public static OpenGrid_Main thegrid; 53 public static OpenGrid_Main thegrid;
@@ -94,9 +95,10 @@ namespace OpenGridServices.GridServer
94 Cfg = this.LoadConfigDll(this.ConfigDll); 95 Cfg = this.LoadConfigDll(this.ConfigDll);
95 Cfg.InitConfig(); 96 Cfg.InitConfig();
96 97
97 m_console.WriteLine("Main.cs:Startup() - Connecting to MySql Server"); 98 m_console.WriteLine("Main.cs:Startup() - Connecting to Storage Server");
98 m_gridManager = new GridManager(); 99 m_gridManager = new GridManager();
99 m_gridManager.AddPlugin("OpenGrid.Framework.Data.MySQL.dll"); // Made of win 100 m_gridManager.AddPlugin(GridDll); // Made of win
101 m_gridManager.defaultRecvKey = Cfg.SimRecvKey;
100 102
101 m_console.WriteLine("Main.cs:Startup() - Starting HTTP process"); 103 m_console.WriteLine("Main.cs:Startup() - Starting HTTP process");
102 BaseHttpServer httpServer = new BaseHttpServer(8001); 104 BaseHttpServer httpServer = new BaseHttpServer(8001);
diff --git a/OpenSim.Framework.Console/ConsoleBase.cs b/OpenSim.Framework.Console/ConsoleBase.cs
index 39d2b28..dd8054a 100644
--- a/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/OpenSim.Framework.Console/ConsoleBase.cs
@@ -43,6 +43,7 @@ namespace OpenSim.Framework.Console
43 public void Write(string format, params object[] args) 43 public void Write(string format, params object[] args)
44 { 44 {
45 Log.Write(format, args); 45 Log.Write(format, args);
46 Log.Flush();
46 if(!disableOutput) 47 if(!disableOutput)
47 { 48 {
48 System.Console.Write(format, args); 49 System.Console.Write(format, args);
@@ -53,7 +54,8 @@ namespace OpenSim.Framework.Console
53 public void WriteLine(string format, params object[] args) 54 public void WriteLine(string format, params object[] args)
54 { 55 {
55 Log.WriteLine(format, args); 56 Log.WriteLine(format, args);
56 if(!disableOutput) 57 Log.Flush();
58 if(!disableOutput)
57 { 59 {
58 System.Console.WriteLine(format, args); 60 System.Console.WriteLine(format, args);
59 } 61 }
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index aa405fb..69ea10a 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -22,7 +22,6 @@
22 <include name="UserProfileManager.cs" /> 22 <include name="UserProfileManager.cs" />
23 <include name="UserProfileManagerBase.cs" /> 23 <include name="UserProfileManagerBase.cs" />
24 <include name="Util.cs" /> 24 <include name="Util.cs" />
25 <include name="VersionInfo.cs" />
26 <include name="Interfaces/IAssetServer.cs" /> 25 <include name="Interfaces/IAssetServer.cs" />
27 <include name="Interfaces/IConfig.cs" /> 26 <include name="Interfaces/IConfig.cs" />
28 <include name="Interfaces/IGenericConfig.cs" /> 27 <include name="Interfaces/IGenericConfig.cs" />
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index d41d664..871d639 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -19,6 +19,7 @@
19 <include name="QueItem.cs" /> 19 <include name="QueItem.cs" />
20 <include name="RegionInfo.cs" /> 20 <include name="RegionInfo.cs" />
21 <include name="SimClient.cs" /> 21 <include name="SimClient.cs" />
22 <include name="VersionInfo.cs" />
22 <include name="Assets/AssetCache.cs" /> 23 <include name="Assets/AssetCache.cs" />
23 <include name="Assets/InventoryCache.cs" /> 24 <include name="Assets/InventoryCache.cs" />
24 <include name="CAPS/AdminWebFront.cs" /> 25 <include name="CAPS/AdminWebFront.cs" />
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 61441b2..1fd24b7 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -150,12 +150,28 @@ namespace OpenSim
150 m_console.WriteLine("Starting in Grid mode"); 150 m_console.WriteLine("Starting in Grid mode");
151 } 151 }
152 152
153 GridServers.Initialise(); 153 try
154 {
155 GridServers.Initialise();
156 }
157 catch (Exception e)
158 {
159 m_console.WriteLine(e.Message + "\nSorry, could not setup the grid interface");
160 Environment.Exit(1);
161 }
154 162
155 startuptime = DateTime.Now; 163 startuptime = DateTime.Now;
156 164
157 AssetCache = new AssetCache(GridServers.AssetServer); 165 try
158 InventoryCache = new InventoryCache(); 166 {
167 AssetCache = new AssetCache(GridServers.AssetServer);
168 InventoryCache = new InventoryCache();
169 }
170 catch (Exception e)
171 {
172 m_console.WriteLine(e.Message + "\nSorry, could not setup local cache");
173 Environment.Exit(1);
174 }
159 175
160 PacketServer packetServer = new PacketServer(this); 176 PacketServer packetServer = new PacketServer(this);
161 177
@@ -189,9 +205,17 @@ namespace OpenSim
189 { 205 {
190 // The grid server has told us who we are 206 // The grid server has told us who we are
191 // We must obey the grid server. 207 // We must obey the grid server.
192 regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString()); 208 try
193 regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString()); 209 {
194 regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString(); 210 regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString());
211 regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString());
212 regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString();
213 }
214 catch (Exception e)
215 {
216 m_console.WriteLine(e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!");
217 Environment.Exit(1);
218 }
195 } 219 }
196 220
197 } 221 }
@@ -234,6 +258,7 @@ namespace OpenSim
234 if (gridServer.GetName() == "Remote") 258 if (gridServer.GetName() == "Remote")
235 { 259 {
236 // should startup the OGS protocol server here 260 // should startup the OGS protocol server here
261 // Are we actually using this?
237 OGSServer = new OpenGridProtocolServer(this.regionData.IPListenPort - 500); // Changed so we can have more than one OGSServer per machine. 262 OGSServer = new OpenGridProtocolServer(this.regionData.IPListenPort - 500); // Changed so we can have more than one OGSServer per machine.
238 263
239 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server 264 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
@@ -347,7 +372,7 @@ namespace OpenSim
347 // SandBoxMode 372 // SandBoxMode
348 string attri = ""; 373 string attri = "";
349 attri = configData.GetAttribute("SandBox"); 374 attri = configData.GetAttribute("SandBox");
350 if (attri == "") 375 if ((attri == "") || ((attri != "false") && (attri != "true")))
351 { 376 {
352 this.m_sandbox = false; 377 this.m_sandbox = false;
353 configData.SetAttribute("SandBox", "false"); 378 configData.SetAttribute("SandBox", "false");
@@ -360,7 +385,7 @@ namespace OpenSim
360 // LoginServer 385 // LoginServer
361 attri = ""; 386 attri = "";
362 attri = configData.GetAttribute("LoginServer"); 387 attri = configData.GetAttribute("LoginServer");
363 if (attri == "") 388 if ((attri == "") || ((attri != "false") && (attri != "true")))
364 { 389 {
365 this.m_loginserver = false; 390 this.m_loginserver = false;
366 configData.SetAttribute("LoginServer", "false"); 391 configData.SetAttribute("LoginServer", "false");
@@ -373,12 +398,12 @@ namespace OpenSim
373 // Sandbox User accounts 398 // Sandbox User accounts
374 attri = ""; 399 attri = "";
375 attri = configData.GetAttribute("UserAccount"); 400 attri = configData.GetAttribute("UserAccount");
376 if (attri == "") 401 if ((attri == "") || ((attri != "false") && (attri != "true")))
377 { 402 {
378 this.user_accounts = false; 403 this.user_accounts = false;
379 configData.SetAttribute("UserAccounts", "false"); 404 configData.SetAttribute("UserAccounts", "false");
380 } 405 }
381 else 406 else if (attri == "true")
382 { 407 {
383 this.user_accounts = Convert.ToBoolean(attri); 408 this.user_accounts = Convert.ToBoolean(attri);
384 } 409 }
@@ -386,70 +411,96 @@ namespace OpenSim
386 // Grid mode hack to use local asset server 411 // Grid mode hack to use local asset server
387 attri = ""; 412 attri = "";
388 attri = configData.GetAttribute("LocalAssets"); 413 attri = configData.GetAttribute("LocalAssets");
389 if (attri == "") 414 if ((attri == "") || ((attri != "false") && (attri != "true")))
390 { 415 {
391 this.gridLocalAsset = false; 416 this.gridLocalAsset = false;
392 configData.SetAttribute("LocalAssets", "false"); 417 configData.SetAttribute("LocalAssets", "false");
393 } 418 }
394 else 419 else if (attri == "true")
395 { 420 {
396 this.gridLocalAsset = Convert.ToBoolean(attri); 421 this.gridLocalAsset = Convert.ToBoolean(attri);
397 } 422 }
398 423
399 // Grid mode hack to use local asset server 424
400 attri = ""; 425 attri = "";
401 attri = configData.GetAttribute("PhysicsEngine"); 426 attri = configData.GetAttribute("PhysicsEngine");
402 if (attri == "") 427 switch (attri)
403 {
404 this.m_physicsEngine = "basicphysics";
405 configData.SetAttribute("PhysicsEngine", "basicphysics");
406 }
407 else
408 { 428 {
409 this.m_physicsEngine = attri; 429 default:
410 if ((attri == "RealPhysX") || (attri == "OpenDynamicsEngine")) 430 m_console.WriteLine("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
411 { 431 Environment.Exit(1);
412 OpenSim.world.Avatar.PhysicsEngineFlying = true; 432 break;
413 } 433
414 else 434 case "":
415 { 435 this.m_physicsEngine = "basicphysics";
436 configData.SetAttribute("PhysicsEngine", "basicphysics");
416 OpenSim.world.Avatar.PhysicsEngineFlying = false; 437 OpenSim.world.Avatar.PhysicsEngineFlying = false;
417 } 438 break;
439
440 case "basicphysics":
441 this.m_physicsEngine = "basicphysics";
442 configData.SetAttribute("PhysicsEngine", "basicphysics");
443 OpenSim.world.Avatar.PhysicsEngineFlying = false;
444 break;
445
446 case "RealPhysX":
447 this.m_physicsEngine = "RealPhysX";
448 OpenSim.world.Avatar.PhysicsEngineFlying = true;
449 break;
450
451 case "OpenDynamicsEngine":
452 this.m_physicsEngine = "OpenDynamicsEngine";
453 OpenSim.world.Avatar.PhysicsEngineFlying = true;
454 break;
418 } 455 }
456
419 configData.Commit(); 457 configData.Commit();
420 } 458 }
421 catch (Exception e) 459 catch (Exception e)
422 { 460 {
423 Console.WriteLine(e.Message); 461 Console.WriteLine(e.Message);
462 Console.WriteLine("\nSorry, a fatal error occurred while trying to initialise the configuration data");
463 Console.WriteLine("Can not continue starting up");
464 Environment.Exit(1);
424 } 465 }
425 } 466 }
426 467
427 private SimConfig LoadConfigDll(string dllName) 468 private SimConfig LoadConfigDll(string dllName)
428 { 469 {
429 Assembly pluginAssembly = Assembly.LoadFrom(dllName); 470 try
430 SimConfig config = null;
431
432 foreach (Type pluginType in pluginAssembly.GetTypes())
433 { 471 {
434 if (pluginType.IsPublic) 472 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
473 SimConfig config = null;
474
475 foreach (Type pluginType in pluginAssembly.GetTypes())
435 { 476 {
436 if (!pluginType.IsAbstract) 477 if (pluginType.IsPublic)
437 { 478 {
438 Type typeInterface = pluginType.GetInterface("ISimConfig", true); 479 if (!pluginType.IsAbstract)
439
440 if (typeInterface != null)
441 { 480 {
442 ISimConfig plug = (ISimConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 481 Type typeInterface = pluginType.GetInterface("ISimConfig", true);
443 config = plug.GetConfigObject();
444 break;
445 }
446 482
447 typeInterface = null; 483 if (typeInterface != null)
484 {
485 ISimConfig plug = (ISimConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
486 config = plug.GetConfigObject();
487 break;
488 }
489
490 typeInterface = null;
491 }
448 } 492 }
449 } 493 }
494 pluginAssembly = null;
495 return config;
496 }
497 catch (Exception e)
498 {
499 m_console.WriteLine(e.Message + "\nSorry, a fatal error occurred while trying to load the config DLL");
500 m_console.WriteLine("Can not continue starting up");
501 Environment.Exit(1);
502 return null;
450 } 503 }
451 pluginAssembly = null;
452 return config;
453 } 504 }
454 505
455 private void OnReceivedData(IAsyncResult result) 506 private void OnReceivedData(IAsyncResult result)
diff --git a/OpenSim.build b/OpenSim.build
index 67b2120..e9ba612 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -46,31 +46,34 @@
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="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
50 <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" />
51 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
52 <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />
53 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
54 <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" />
55 <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="clean" />
56 <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" />
57 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
58 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
59 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> 49 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
60 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" /> 50 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
61 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
62 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
63 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
64 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
65 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
66 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> 51 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
52 <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" />
53 <nant buildfile="OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" />
67 <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="clean" /> 54 <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="clean" />
68 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
69 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
70 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> 55 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
71 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> 56 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
72 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
73 <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" /> 57 <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
58 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
59 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
60 <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" />
61 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
62 <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />
63 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
64 <nant buildfile="OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" />
65 <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" />
66 <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
67 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
68 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
69 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
70 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
71 <nant buildfile="OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />
72 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
73 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
74 <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="clean" />
75 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
76 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
74 </target> 77 </target>
75 78
76 <target name="build" depends="init" description=""> 79 <target name="build" depends="init" description="">
@@ -85,6 +88,9 @@
85 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> 88 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
86 <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" /> 89 <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="build" />
87 <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" /> 90 <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="build" />
91 <nant buildfile="OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="build" />
92 <nant buildfile="OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="build" />
93 <nant buildfile="OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="build" />
88 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> 94 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
89 <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" /> 95 <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="build" />
90 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> 96 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
@@ -109,31 +115,34 @@
109 115
110 <target name="doc" depends="build-release"> 116 <target name="doc" depends="build-release">
111 <echo message="Generating all documentation from all builds" /> 117 <echo message="Generating all documentation from all builds" />
112 <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
113 <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" />
114 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
115 <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />
116 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
117 <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" />
118 <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="doc" />
119 <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" />
120 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
121 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
122 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> 118 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
123 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" /> 119 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
124 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
125 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
126 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
127 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
128 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
129 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> 120 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
121 <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" />
122 <nant buildfile="OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" />
130 <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="doc" /> 123 <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="doc" />
131 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
132 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
133 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> 124 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
134 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> 125 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
135 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
136 <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" /> 126 <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
127 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
128 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
129 <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" />
130 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
131 <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />
132 <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
133 <nant buildfile="OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" />
134 <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" />
135 <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
136 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
137 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
138 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
139 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
140 <nant buildfile="OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />
141 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
142 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
143 <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="doc" />
144 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
145 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
137 </target> 146 </target>
138 147
139</project> 148</project>
diff --git a/releng/makerel.sh b/releng/makerel.sh
index 75d1f8c..bf87543 100755
--- a/releng/makerel.sh
+++ b/releng/makerel.sh
@@ -5,8 +5,8 @@
5export OPENSIMMAJOR=0 5export OPENSIMMAJOR=0
6export OPENSIMMINOR=1 6export OPENSIMMINOR=1
7export BUILD=`date +%s` 7export BUILD=`date +%s`
8export BRANCH=DEVEL 8export BRANCH=PRESTABLE
9export SVNURL=svn://openmetaverse.org/opensim/trunk 9export SVNURL=svn://openmetaverse.org/opensim/branches/0.1-prestable
10 10
11 11
12 12
generated by cgit v1.1 at 2024-12-15 22:39:10 +0000