From 1e44ec84bd90ec9078027d1d9d78e83c7d305f2a Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 31 Aug 2010 17:02:36 -0400
Subject: Build system upgrade:
Upgrading Prebuild.exe to correctly construct build solutions
for crossplatform tools such as xbuild, monodevelop and nant.
NOTE: Module prebuild files will need modification to work,
as the prebuild must correctly define the reference path for
all assemblies shipped in the OpenSimulator ./bin directory.
These include assemblies such as XMLRPC.dll, OpenMetaverse.dll,
Nini.dll, etc. . The entries should follow the form:
See the distributed prebuild.xml for further examples.
Crossplatform tools: xbuild and monodevelop use the
vs2008 OpenSim.sln and the .csproj files in each namespace.
Changes to the Prebuild.exe are against svn 322 and are included
in a patch attached to the mantis. And the dnpb source are
available@ svn co https://dnpb.svn.sourceforge.net/svnroot/dnpb dnpb
The patches are pending application by the dnpb team. After which,
the un-modified upstream Prebuild.exe will work as expected.
---
bin/Prebuild.exe | Bin 237568 -> 227840 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index eb4c224..ad84b98 100755
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ
--
cgit v1.1
From 910aa48df3efcb5c1baa6429b65dcfd05796e2ec Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 7 Sep 2010 11:13:37 -0700
Subject: Corrected SimianGrid.ini and HyperSimianGrid.ini configs to specify
services in the way the ROBUST loader expects them (hopefully!)
---
bin/config-include/HyperSimianGrid.ini | 12 ++++++------
bin/config-include/SimianGrid.ini | 16 ++++++++--------
2 files changed, 14 insertions(+), 14 deletions(-)
(limited to 'bin')
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 87ffe69..49ba2ca 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -21,13 +21,13 @@
Include-Common = "config-include/GridCommon.ini"
[Modules]
- GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
- PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
- UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
- AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+ GridServices = "SimianGridServiceConnector"
+ PresenceServices = "SimianPresenceServiceConnector"
+ UserAccountServices = "SimianUserAccountServiceConnector"
+ AuthenticationServices = "SimianAuthenticationServiceConnector"
AssetServices = "HGAssetBroker"
InventoryServices = "HGInventoryBroker"
- AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+ AvatarServices = "SimianAvatarServiceConnector"
NeighbourServices = "RemoteNeighbourServicesConnector"
SimulationServices = "RemoteSimulationConnectorModule"
@@ -74,4 +74,4 @@
ServicesConnectorModule = SimianGroupsServicesConnector
[Profiles]
- Module = SimianProfiles
+ Module = "SimianProfiles"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 65d4ea6..9b27cc7 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -21,13 +21,13 @@
Include-Common = "config-include/GridCommon.ini"
[Modules]
- GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
- PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
- UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
- AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
- AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
- InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
- AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+ GridServices = "SimianGridServiceConnector"
+ PresenceServices = "SimianPresenceServiceConnector"
+ UserAccountServices = "SimianUserAccountServiceConnector"
+ AuthenticationServices = "SimianAuthenticationServiceConnector"
+ AssetServices = "SimianAssetServiceConnector"
+ InventoryServices = "SimianInventoryServiceConnector"
+ AvatarServices = "SimianAvatarServiceConnector"
NeighbourServices = "RemoteNeighbourServicesConnector"
SimulationServices = "RemoteSimulationConnectorModule"
@@ -67,4 +67,4 @@
ServicesConnectorModule = SimianGroupsServicesConnector
[Profiles]
- Module = SimianProfiles
+ Module = "SimianProfiles"
--
cgit v1.1
From 9be1c0ff448d4ea650ca921937905653b4017d61 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 7 Sep 2010 14:41:13 -0700
Subject: * Cache null account responses in the
SimianUserAccountServiceConnector to avoid repeated requests for missing
avatar IDs * Updated to OpenMetaverse r3442 to fix a timezone issue with
ExpiringCache
---
bin/OpenMetaverse.StructuredData.dll | Bin 102400 -> 102400 bytes
bin/OpenMetaverse.dll | Bin 1691648 -> 1716224 bytes
bin/OpenMetaverseTypes.dll | Bin 106496 -> 114688 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index 54681e4..7909076 100644
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 59e39bb..12a2940 100644
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 01dc3d8..1329aa7 100644
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
--
cgit v1.1
From 0bebe94231c3b5aeaa24a0eeb38272a08b73473b Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 7 Sep 2010 15:45:33 -0700
Subject: Rolling back the recent libomv update but keeping the ExpiringCache
cleanups (as much as is possible). There was a report of non-finite avatar
positions after the update
---
bin/OpenMetaverse.StructuredData.dll | Bin 102400 -> 102400 bytes
bin/OpenMetaverse.dll | Bin 1716224 -> 1691648 bytes
bin/OpenMetaverseTypes.dll | Bin 114688 -> 106496 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index 7909076..54681e4 100644
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 12a2940..59e39bb 100644
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 1329aa7..01dc3d8 100644
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
--
cgit v1.1
From d301f3fd6ad65e3eb39cfaff65cd3fbb896fa5c1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 8 Sep 2010 14:12:01 -0700
Subject: Renamed the Helo server connector to a consistent name. Added this in
connector to both Robust.HG.ini.example and
HypergridServiceInConnectorModule.
---
bin/Robust.HG.ini.example | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'bin')
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index dae7a19..deceb86 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -21,7 +21,7 @@
; * [[@]/][:]
; *
[Startup]
-ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
; * This is common for all services, it's the network setup for the entire
; * server instance, if none if specified above
--
cgit v1.1
From 7e65590a55ba575d0086bdfc25addaf1051d799b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 11 Sep 2010 01:13:08 +0100
Subject: Update Prebuild.exe with Prebuild r323 + an existing OpenSim specific
nant hack to correctly clean up chosen OpenSim exes and dlls in bin/ on a
"nant clean"
Source code is included for reference. This can go away again once Prebuild is updated with a more general mechanism for cleaning up files.
The Prebuild source code here can be built with nant, or regnerated for other tools using the prebuild at {root}/bin/Prebuild.exe
---
bin/Prebuild.exe | Bin 227840 -> 228352 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'bin')
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index ad84b98..d79227c 100755
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ
--
cgit v1.1
From 0db1ed0b5a6f5bd104c6008f142d173c84263ce5 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Sun, 12 Sep 2010 14:20:26 -0700
Subject: * Added ISimulationDataService and IEstateDataService * Removed
StorageManager * CONFIG CHANGE: There are no more database settings in
OpenSim.ini. Check the config-include configuration files for region store
and estate store database settings
---
bin/OpenSim.ini.example | 27 -------------------------
bin/config-include/Grid.ini | 5 +++++
bin/config-include/GridCommon.ini.example | 21 +++++++++++++++++++
bin/config-include/GridHypergrid.ini | 6 ++++++
bin/config-include/HyperSimianGrid.ini | 6 ++++++
bin/config-include/SimianGrid.ini | 6 ++++++
bin/config-include/Standalone.ini | 6 ++++++
bin/config-include/StandaloneCommon.ini.example | 2 ++
8 files changed, 52 insertions(+), 27 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 08726ea..8d714ce 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -106,33 +106,6 @@
; ## PRIM STORAGE
; ##
- ; *** Prim Storage - only leave one storage_plugin uncommented ***
- ; --- Null stores nothing - effectively disabling persistence:
- ;storage_plugin = "OpenSim.Data.Null.dll"
-
- ; --- To use sqlite as region storage:
- ;
- ; PLEASE NOTE: Unfortunately, the current SQLite database plugin (necessary to use SQLite with Mono on Linux) is
- ; not compatible with the sqlite3 library installed on Mac OSX. If you're using Mono 2.4 you can still use the old sqlite
- ; library by uncommenting the SQLiteLegacy.dll storage plugin (and commenting out SQLite.dll). Unfortunately, the older library
- ; will not work with Mono 2.6 on Mac OSX so you will either need to replace the OSX sqlite3 system library or use MySQL instead
- ;
- ; You will also need to do the same thing in config-include/StandaloneCommon.ini if you are running in standalone mode
- storage_plugin = "OpenSim.Data.SQLite.dll"
- ;storage_plugin = "OpenSim.Data.SQLiteLegacy.dll"
- storage_connection_string="URI=file:OpenSim.db,version=3";
-
- ; --- To use MySQL storage, supply your own connection string (this is only an example):
- ; note that the supplied account needs create privilegies if you want it to auto-create needed tables.
- ;
- ; -->>> There are multiple connection strings defined in several places. Check it carefully!
- ;
- ; storage_plugin="OpenSim.Data.MySQL.dll"
- ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;";
- ; If you want to use a different database/server for estate data, then
- ; uncomment and change this connect string. Defaults to the above if not set
- ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
-
; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
; prevent frequently changing objects from heavily loading the region data store.
; If both of these values are set to zero then persistence of all changed objects will happen on every sweep.
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 9a75f19..4a6a082 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -27,6 +27,11 @@
SimulationServiceInConnector = true
LibraryModule = true
+[SimulationDataStore]
+ LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+ LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
[GridService]
LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index a19591b..c2cd5c3 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,3 +1,24 @@
+[DatabaseService]
+ ;
+ ; ### Choose the DB
+ ;
+
+ ; SQLite
+ Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+
+ ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX. You can still use the older
+ ; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite)
+ ; for more details
+ ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
+
+ ; MySql
+ ; Uncomment these lines if you want to use mysql storage
+ ; Change the connection string to your db details
+ ;StorageProvider = "OpenSim.Data.MySQL.dll"
+ ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+ ; Uncomment this line if you are using MySQL and want to use a different database for estates
+ ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+
[AssetService]
DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index ab29018..d69a945 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -30,6 +30,12 @@
SimulationServiceInConnector = true
LibraryModule = true
+[SimulationDataStore]
+ LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+ LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
[AssetService]
LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 49ba2ca..29b51de 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -41,6 +41,12 @@
AssetCaching = "FlotsamAssetCache"
+[SimulationDataStore]
+ LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+ LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
[Friends]
Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 9b27cc7..239ce30 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -41,6 +41,12 @@
AssetCaching = "FlotsamAssetCache"
+[SimulationDataStore]
+ LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+ LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
[Friends]
Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index eae9801..d74b50e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -22,6 +22,12 @@
LLLoginServiceInConnector = true
GridInfoServiceInConnector = true
+[SimulationDataStore]
+ LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+ LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
[AssetService]
LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f862960..96ef602 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -18,6 +18,8 @@
; Change the connection string to your db details
;StorageProvider = "OpenSim.Data.MySQL.dll"
;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
+ ; Uncomment this line if you are using MySQL and want to use a different database for estates
+ ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
[AssetService]
DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
--
cgit v1.1