Melanie
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
John Hurliman
18a9ac6b39
Fix unit test SceneSetupHelpers to load the mock simulation data store
2010-09-12 15:04:51 -07:00
John Hurliman
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
John Hurliman
0db1ed0b5a
* 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
2010-09-12 14:20:26 -07:00
Jeff Ames
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
Jeff Ames
20cd1da6bf
Add copyright headers.
2010-09-12 12:54:31 -04:00
John Hurliman
16d782eaa2
Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
2010-09-12 00:30:13 -07:00
John Hurliman
007912d6f4
Shuffling fields and properties around in Scene to make Scene.cs more readable
2010-09-11 23:41:48 -07:00
John Hurliman
e2544584ad
Changed all string references of "IRegionDataStore" to "ISimulationDataStore"
2010-09-11 22:02:34 -07:00
John Hurliman
109b517583
Fixed the naming mess around data connectors for simulation data
2010-09-11 20:43:06 -07:00
John Hurliman
47ac9f97b1
Re-enabled asset last access time logging in MySQL
2010-09-11 18:29:38 -07:00
John Hurliman
a9acc6730d
Removing .svn directories under Prebuild/ from source control
2010-09-11 18:26:59 -07:00
Melanie
47a5e2633c
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:24:14 +01:00
Melanie
d264f0d301
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-11 20:22:53 +01:00
Melanie
5e5260ad1b
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:22:10 +01:00
Diva Canto
d5c7a8d28c
All these files want to be committed. All white space junk. grr.
2010-09-10 21:18:23 -07:00
Diva Canto
51a5af93d0
White space junk.
2010-09-10 18:48:32 -07:00
Justin Clark-Casey (justincc)
7e65590a55
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
2010-09-11 01:13:08 +01:00
Justin Clark-Casey (justincc)
220f82a0f0
Make it clear that the "create region" command will reference ini files in the regions directory (usually Regions/)
...
Also convert some tabs into spaces.
2010-09-11 00:27:52 +01:00
randomhuman
30306a775a
Made it impossible to create a user with names containing spaces and prevented passwords from being echoed after enter is pressed.
2010-09-10 23:19:18 +01:00
Justin Clark-Casey (justincc)
29708e47a5
Merge branch 'prebuild-update'
2010-09-10 22:38:56 +01:00
Justin Clark-Casey (justincc)
a7f4e10f42
Remove parenthesis around the release flavour to get the version string back under 27 chars
...
Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client
2010-09-10 21:56:04 +01:00
John Hurliman
b597a295c4
Second pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:41:36 -07:00
John Hurliman
dd277a0d02
First pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:04:12 -07:00
John Hurliman
9609faa8eb
* Run SimianGrid session updates asynchronously instead of from the main heartbeat thread
...
* Minor dead code cleanup
2010-09-09 15:05:22 -07:00
John Hurliman
8415b98806
Over a dozen thread safety fixes in FriendsModule
2010-09-09 14:45:10 -07:00
John Hurliman
972ef92590
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 15:09:34 -07:00
John Hurliman
5dc9ea2f24
* Changed 11 calls for session info to the more optimized API method
2010-09-08 15:08:49 -07:00
Diva Canto
ae6682036d
Made the HG asset and inventory brokers use the Helo service in order to instantiate the right network connectors. Tested on Robust only.
2010-09-08 14:13:01 -07:00
Diva Canto
d301f3fd6a
Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule.
2010-09-08 14:12:01 -07:00
Diva Canto
8cc3d60e59
Added constructor that takes an URL to asset and inventory simian connectors.
2010-09-08 14:09:43 -07:00
Diva Canto
3fb4a17f10
No need for a config var for the HELO message on the server-side. It's robust.
2010-09-08 11:30:38 -07:00
Diva Canto
904d6b787a
First version of the Hypergrid HELO service that will enable different backends to interoperate.
2010-09-08 09:53:57 -07:00
Justin Clark-Casey (justincc)
b8d14fcc4a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 01:05:56 +01:00
Melanie Thielker
319007783c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-08 00:50:31 +02:00
Melanie Thielker
7a1b1dd419
Make AddRestoredSceneObject reset the IsDeleted flag so we can take an
...
object out of the scene and then put it back in.
2010-09-08 00:49:32 +02:00
John Hurliman
0bebe94231
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
2010-09-07 15:45:33 -07:00
John Hurliman
9be1c0ff44
* 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
2010-09-07 14:41:13 -07:00
John Hurliman
587bab79b4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 13:43:52 -07:00
John Hurliman
029c954804
* Added sanity checks to the SimianAssetServiceConnector so it will throw a sensible error message when it is misconfigured instead of a mysterious "Uri is empty" error
2010-09-07 13:43:36 -07:00
Melanie
b28d1b6ccd
Fix Simian regression
2010-09-07 20:21:05 +01:00
Melanie
342c64b7ac
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-07 20:20:16 +01:00
Melanie
50cc22c9e6
Fix Simian regression
2010-09-07 20:19:52 +01:00
John Hurliman
5ca4c238e0
SimianUserAccountServiceConnector was not initializing the user cache
2010-09-07 11:33:46 -07:00
John Hurliman
910aa48df3
Corrected SimianGrid.ini and HyperSimianGrid.ini configs to specify services in the way the ROBUST loader expects them (hopefully!)
2010-09-07 11:13:37 -07:00
Melanie Thielker
8ab4b277c1
Fix some issues with unlinking
2010-09-07 17:12:28 +02:00
Melanie
2684ca0838
Merge branch 'master' into careminster-presence-refactor
2010-09-07 11:51:26 +01:00
Melanie
8fda08d858
Make sure unlinked child prims get persisted
2010-09-07 11:48:28 +01:00
Justin Clark-Casey (justincc)
f7b28dd321
If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well
2010-09-07 03:41:29 +01:00
Justin Clark-Casey (justincc)
84ad9e4d4e
minor: comment out some excessive test logging
2010-09-07 02:05:44 +01:00