Melanie
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
Melanie
757929012e
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:11:47 +01:00
Melanie
71cd4d6e84
Revert "remove long unused OpenSim/Framework/Configuration/* projects"
...
This reverts commit cdd3f17b2b
.
2010-08-04 01:10:01 +01:00
Melanie
3302e8ddc4
Merge branch 'master' into careminster-presence-refactor
2010-07-31 00:57:50 +01:00
Justin Clark-Casey (justincc)
c6bc1d28ec
move ChannelDigger from its own project into the main terrain module with the rest of the effects
2010-07-30 20:34:14 +01:00
Justin Clark-Casey (justincc)
cdd3f17b2b
remove long unused OpenSim/Framework/Configuration/* projects
2010-07-30 20:19:46 +01:00
Justin Clark-Casey (justincc)
9682e0c733
Implement media texture persistence over server restarts for sqlite
...
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-26 23:34:19 +01:00
Tom Grimshaw
f3e902092a
Add System.Core assembly reference to two projects so that TimeZoneInfo can be used
2010-07-04 12:51:48 -07:00
Melanie
c5878b6610
Merge branch 'master' into careminster-presence-refactor
2010-06-04 21:11:15 +01:00
Melanie
5270e54268
Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the
...
needed libraries
2010-06-01 14:20:39 +01:00
Melanie Thielker
84e30bee6d
Revert "Meta7 Communities : Authorization service added, skeleton, not yet functional"
...
This reverts commit 31439293cc
.
2010-05-29 12:34:02 +02:00
Tom Grimshaw
31439293cc
Meta7 Communities : Authorization service added, skeleton, not yet functional
2010-05-29 03:56:34 -07:00
Melanie
97501495eb
Merge branch 'master' into careminster-presence-refactor
2010-05-26 17:19:02 +01:00
AlexRa
724305c37b
Prebuild: removed DB-specific test projects, added refs to Data.Tests
2010-05-23 11:48:13 +03:00
Melanie
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
AlexRa
d71c483bf0
Prebuild: added *.migrations as resources to MSSQL, SQLiteLegacy (just in case)
2010-05-19 21:49:20 +03:00
Melanie
4fee3f9548
Revert a revert? Am i mad? Don't answer that....!
...
Revert "Revert "Looks like the new files were never added to prebuild.xml""
This reverts commit f253758c2e
.
2010-05-18 23:15:29 +01:00
Melanie
f253758c2e
Revert "Looks like the new files were never added to prebuild.xml"
...
This reverts commit df49756e7b
.
2010-05-18 21:29:02 +01:00
Melanie
df49756e7b
Looks like the new files were never added to prebuild.xml
2010-05-18 21:15:58 +01:00
Melanie
9bc5098dd8
Merge branch 'master' into careminster-presence-refactor
2010-04-30 20:15:19 +01:00
Justin Clark-Casey (justincc)
89e79c1133
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 17:54:00 +01:00
Justin Clark-Casey (justincc)
cc67de5b86
rename SQLiteNG to SQLite and SQLite to SQLiteLegacy
...
this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG
MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone)
See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details
This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita.
2010-04-30 17:45:00 +01:00
Melanie
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
Diva Canto
2686573b1c
Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that makes the compilation in Windows happy again. Not sure if this is the right dll, Justin -- I grabbed it somewhere from mono 2.4.6 for Windows.
2010-04-26 15:03:47 -07:00
Diva Canto
2ac00b7f96
* Commenting SQLiteNG out of prebuild.xml, because it's making compile fail in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from!
...
* IRegionModule.cs wants to be committed too -- EOF.
2010-04-26 14:52:22 -07:00
Justin Clark-Casey (justincc)
5ee77886ac
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 19:05:32 +01:00
Justin Clark-Casey (justincc)
e84cc2f9db
Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll
...
Include the library so that Windows builds correctly
It appears that Windows is okay with either SQLite or SQLiteNG
Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite
2010-04-23 18:56:50 +01:00
Justin Clark-Casey (justincc)
a23bebdc0f
Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will shortly be changed to work under mono 2.6 and above
2010-04-23 17:17:15 +01:00
Diva Canto
c9da66728a
Renamed OpenSim.Server.exe to Robust.exe and corresponding .ini's and config.
2010-04-22 07:25:32 -07:00
Melanie
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
John Hurliman
2040649871
Adding the SimianGrid connectors
2010-03-11 11:19:02 -08:00
Melanie
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
Diva Canto
f5a088c9cc
Replaced BclExtras.dll with a newer version compiled for .NET 3.5. This solves the compilation errors that have been affecting build on Windows for the past day. Thanks lkalif for noticing the conflict.
2010-03-04 08:33:01 -08:00
Melanie
107a0a4905
Merge branch 'master' into careminster-presence-refactor
2010-03-04 11:02:01 +00:00
John Hurliman
61a63ff851
* Added three new helper utility files to OpenSim.Framework. MultipartForm is used for constructing multipart/form-data requests. UntrustedWebRequest places sanity checks and policy on requests to HTTP endpoints that are not in the same trust domain (useful for Hypergrid, OpenID, etc). WebUtil contains misc. functions for managing URLs and network streams
2010-03-03 14:38:00 -08:00
Diva Canto
d83b86e4bf
Fixed prebuild errors that have emerged with the merge
2010-03-03 09:34:51 -08:00
Melanie
028a87fe37
Merge branch 'master' into careminster-presence-refactor
...
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
Melanie
bef311dfb9
Merge branch 'master' into presence-refactor
...
This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor
branch remains for experimental work.
2010-03-02 04:46:13 +00:00
Jeff Ames
a5f78ac604
Formatting cleanup.
2010-03-01 11:59:22 +09:00
Melanie
2084e08ad7
Merge branch 'master' into careminster
2010-02-14 22:27:39 +00:00
Melanie
1d4d6c821a
Add missing refernce to prebuild (backport from presence-refactor)
2010-02-09 20:25:24 +00:00
Melanie
1dfcf68330
Add the friends service skel and correct some namespace issues
2010-02-09 07:05:38 +00:00
Diva Canto
ea33652e65
Fixed missing System.Xml from the new tool.
2010-02-08 15:15:14 -08:00
Melanie
c8f3bb56ff
Merge branch 'master' into careminster
2010-02-08 22:11:38 +00:00
Melanie
baaf660511
Merge branch 'master' into presence-refactor
...
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
Melanie
70a0d7aa46
Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched
...
in place of OpenSim, dump the config to stdout. Use -f xml, -f ini or -f mysql
to get a condensed ini file, an xml file suitable for webloading, or a set
of mysql insert statements.
2010-02-08 15:21:35 +00:00
Diva Canto
00f7d622cb
HG 1.5 is in place. Tested in standalone only.
2010-01-28 19:19:42 -08:00
Melanie
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
Diva Canto
48b03c2c61
Integrated the hyperlinking with the GridService.
2010-01-24 14:30:48 -08:00
Melanie
316503c398
Added some prebuild refs needed for mono building
2010-01-23 15:40:34 +00:00
Justin Clark-Casey (justincc)
1df69be9a6
Add first part of test for checking restore of task inventory items on oar load
...
Passes but not yet complete
2010-01-22 20:32:34 +00:00
Diva Canto
04e29c1bac
Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet.
2010-01-16 21:42:44 -08:00
Melanie
686660650b
Implement region registration with authentication
2010-01-15 21:57:31 +00:00
Melanie
ca75ad6743
Remove CreateCommsManagerPlugin
2010-01-11 05:13:47 +00:00
Diva Canto
5cf6d6fa79
All grid servers deleted, including user server. They served us well.
2010-01-10 20:17:37 -08:00
Diva Canto
2415d36bed
OpenSim.Region.Communications.* is no more. Thanks to everyone who contributed to these!
2010-01-10 19:50:09 -08:00
Diva Canto
b0bbe861cd
Moved OpenId authentication from user server to Server.Handlers.Authentication.
2010-01-10 17:15:02 -08:00
Diva Canto
53e83e5dbb
* Starting to clean the house...
...
* Fixed circular dependency
2010-01-10 16:20:59 -08:00
Diva Canto
1e1b2ab221
* OMG! All but one references to UserProfileCacheService have been rerouted!
...
* HG is seriously broken here
* Compiles. Untested.
2010-01-10 10:40:07 -08:00
Diva Canto
59a713cb23
Removed empty project OpenSim.Framework.Communications.Tests. The only test in there was login, and that is gone now.
2010-01-09 16:24:44 -08:00
Diva Canto
b63405c1a7
Inching ahead... This compiles, but very likely does not run.
2010-01-08 10:43:34 -08:00
Melanie
3c18c0189a
Avatar appearance skeleton
2010-01-04 00:56:39 +00:00
Diva Canto
8bed461957
Test client for remote user account connector and service. It seems to be working.
2010-01-02 20:16:21 -08:00
Diva Canto
08b507517b
Test client for remote presence connector, and for the service itself. Connector seems to work well.
2010-01-02 18:18:13 -08:00
Diva Canto
8a9677a531
The Library Service is now working. UserProfileCacheService.LibraryRoot is obsolete. Didn't delete it yet to avoid merge conflicts later -- want to stay out of core as much as possible.
2010-01-01 21:12:46 -08:00
Diva Canto
130c80efe0
A lot more beef on the login service. The LLLoginResponse is a MONSTER! Almost done...
2009-12-31 17:18:55 -08:00
Diva Canto
0ce9be653d
* Added the Login server handlers that were lost in yesterday's commit grief
...
* More beef to the LLLoginService
* Better design for handling local simulation service
2009-12-31 14:59:26 -08:00
Diva Canto
af29999d7d
No-op.
2009-12-30 21:29:29 -08:00
Diva Canto
c664307126
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-30 21:00:52 -08:00
Diva Canto
b29ae72460
First pass at the new login service. Still incomplete, but doesn't disrupt the existing code.
2009-12-30 21:00:16 -08:00
Melanie
3507005d9d
Remove CreateUserAccount. Rename SetUserAccount to StoreUserAccount.
...
Implement the fetch operations fully. Rename one last UserService file to
UserAccountService
2009-12-31 01:16:16 +00:00
Diva Canto
1d2a332b96
Unit tests for presence. They helped fix a couple of wrongnesses.
2009-12-30 14:17:18 -08:00
Diva Canto
be2f033626
More renames to make everything consistent. This is the UserAccountService.
2009-12-29 17:21:16 -08:00
Melanie
e3f60ce06f
Merge branch 'master' into careminster
2009-12-27 15:48:43 +00:00
Adam Frisby
8e18762e22
* Added prebuild for previous commit.
2009-12-27 15:03:26 +11:00
Kitto Flora
0a29842caf
Include ChOdePlugin
2009-12-22 00:20:04 -05:00
Justin Clark-Casey (justincc)
e5661e5609
Remove stub Python module and DLLs since this was never fully implemented
...
It may be possible to reintroduce this if someone wants to implement a Python hookup for OpenSim scripting (I'm sure it can't be too hard).
Might be possible to import wholesale from modrex
See http://opensimulator.org/mantis/view.php?id=4395
Thanks mpallari
2009-11-27 19:31:19 +00:00
Justin Clark-Casey (justincc)
f9807884a4
Add MIT/X11 licensed NDesk.Options ( http://www.ndesk.org/Options ) DLL to aid command line parsing
2009-11-25 15:28:43 +00:00
Melanie
f493249bc3
Add wildcard to prebuild include. Seems each file can only hold one project
2009-11-25 08:38:49 +00:00
Teravus Ovares (Dan Olivares)
44012d72e3
* Fix prebuild break
2009-11-10 23:04:13 -05:00
Teravus Ovares (Dan Olivares)
2e514bfb1b
* Move RegionCombinerModule to it's own project
...
* Moves the mono_metadata_token_from_dor message to a different module on loading.
2009-11-10 22:40:08 -05:00
Justin Clark-Casey (justincc)
9cb0c7c86e
Stop OpenSim.Grid.GridServer.exe from building to reduce user/developer confusion, since only the ROBUST grid service now works
...
GridServer dll still building for now due to unresolved dependencies with the remaining OpenSim.Grid.UserServer.exe
2009-11-10 18:58:28 +00:00
Melanie
d068d108ad
Remove the SECS loader
2009-10-27 21:11:10 +00:00
John Hurliman
27ee49f198
Updating prebuild.xml to reflect the removal of DotNetEngine
2009-10-27 13:44:23 -07:00
John Hurliman
322b39804d
Adding missing CSJ2K reference to OpenSim.Region.Physics.Meshing
2009-10-26 22:05:07 -07:00
John Hurliman
3639f68411
Added a missing reference to System.Core for OpenSim.Region.Framework
2009-10-25 01:20:54 -07:00
Melanie
d0019704e6
Adding the presence service skeleton
2009-10-23 09:47:45 +01:00
John Hurliman
96d53f11e5
Added VS2010 support to Prebuild and created runprebuild2010.bat
2009-10-22 17:03:13 -07:00
Melanie
8a336c6860
Add MaxPoolThreads in startup to limit the size of the thread pool used
...
for FireAndForget. This lets us limit concurrency to make OpenSim play nice
2009-10-22 02:28:53 +01:00
John Hurliman
fdce1be3db
* Removed OpenSim.Data.NHibernate
...
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
2009-10-19 16:52:27 -07:00
John Hurliman
dc11643c00
* Consolidated adding / removing ClientManager IClientAPIs to two places in Scene
...
* Added some missing implementations of IClientAPI.RemoteEndPoint
* Added a ClientManager.Remove(UUID) overload
* Removed a reference to a missing project from prebuild.xml
2009-10-13 17:33:45 -07:00
John Hurliman
23a334b9f5
* Rewrote ClientManager to remove Lindenisms from OpenSim core, improve performance by removing locks, and replace LLUDPClientCollection
...
* Removed the confusing (and LL-specific) shutdowncircuit parameter from IClientAPI.Close()
* Updated the LLUDP code to only use ClientManager instead of trying to synchronize ClientManager and m_clients
* Remove clients asynchronously since it is a very slow operation (including a 2000ms sleep)
2009-10-13 14:50:03 -07:00
John Hurliman
3a04d706c9
Fear the lockless LLUDP implementation!
2009-10-08 17:34:51 -07:00
John Hurliman
fa6027aa09
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-06 12:15:24 -07:00
John Hurliman
61b5372153
* Added missing references to prebuild.xml and commented out the LindenUDP tests until a new test harness is written
...
* Clients are no longer disconnected when a packet handler crashes. We'll see how this works out in practice
* Added documentation and cleanup, getting ready for the first public push
* Deleted an old LLUDP file
2009-10-06 12:13:16 -07:00
Diva Canto
3db4d38645
Removing dependencies on System.Runtime.Remoting.
2009-10-06 09:54:15 -07:00
Diva Canto
25e7697987
Fixed build order for Linux.
2009-10-03 16:33:10 -07:00
Diva Canto
b75b887798
Fixed interface between the Messaging server and the grid server.
2009-10-03 11:55:52 -07:00
Melanie
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
dr scofield (aka dirk husemann)
40cf840df2
adding testcase for LandDataSerializer; fixing LandDataSerializer ;-)
2009-10-01 09:47:45 +02:00
John Hurliman
f56dc5fcda
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
...
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
* Renamed IJ2KDecoder and J2KDecoder member names to follow standard naming conventions * Removed j2kDecodeCache cruft and replaced it with the OpenSim cache system * Rewrote the default layer boundary algorithm to use percentages instead of an exponent * Switched from an infinite in-memory cache to an expiring cache (10 minute timeout) * Slightly quieted logging errors for failed texture decodes
2009-09-30 19:26:53 +01:00
Melanie
f908e32f62
Revert "Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug"
...
This reverts commit 22cc31135e
.
2009-09-30 19:26:26 +01:00
Melanie
8d35cd9061
Remove more tests that don't apply to this build
2009-09-30 19:25:48 +01:00
Melanie
c1706e9a68
Remove the dll for the removed tests
2009-09-30 19:20:57 +01:00
John Hurliman
22cc31135e
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug
...
Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
2009-09-30 18:42:45 +01:00
dr scofield (aka dirk husemann)
de9be9c80a
adding skeleton test case for LandDataSerializer [w-i-p]
2009-09-30 17:00:02 +02:00
Melanie
ec464d9e87
More reordering
2009-09-28 23:19:30 +01:00
Melanie
01cfbac040
Reorder prebuild stuff to make panda eat bamboo in peace
2009-09-28 23:13:36 +01:00
Diva Canto
0766b6dc34
Fixed the connection from User server to GridServer.
2009-09-27 20:44:43 -07:00
Diva Canto
5d09c53a1a
Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules.
2009-09-27 10:14:10 -07:00
Diva Canto
dd3d52ae1f
Added test GridClient, which allowed me to remove a few bugs out of the new code.
2009-09-24 13:33:58 -07:00
Diva Canto
3c19bd5142
Unit tests for the grid service. Yey!
2009-09-23 20:35:16 -07:00
Diva Canto
34f4738159
Added HGGridConnector and related code.
2009-09-22 11:58:40 -07:00
Melanie
97ebdd4607
Adding Xml serialization of Dictionary<string, object> where object
...
is either another Dictionary<string, object> or a value that is
convertible to a string.
2009-09-19 16:57:15 +01:00
Melanie
5f9a193b43
Reorder prebuild and remove one unneeded backward reference
2009-09-19 16:04:36 +01:00
Diva Canto
8f133cb46b
Renamed the project lslc to OpenSim.Tools.lslc to conform to the naming conventions so far. Added copyright to it.
2009-09-18 19:28:58 -07:00
Diva Canto
4a55ff88c0
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-18 19:17:02 -07:00
Diva Canto
e736273815
First pass at the grid service.
2009-09-18 19:16:30 -07:00
Melanie
6779abf7f5
Remove The legacy inventory and asset servers. Bump interface version to 6
2009-09-17 23:39:58 +01:00
Melanie
df7904c58b
Add the Null storage implementation for the RegionData service. Standalones
...
have no regions table, so this is needed
2009-09-16 18:20:08 +01:00
Alan M Webb
d4c98ddffc
This fix adds a stand-alone compilation environment
...
for OpenSIm scripts. It makes it very easy to address
coding issues before going in-world to try a script
out. This is a HUGE time saver if you're doing
anything significant with scripts.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-16 16:43:51 +02:00
Diva Canto
6414db9068
OK, that didn't work. Those libs are used in OptionalModules after all.
2009-09-14 10:40:46 -07:00
Diva Canto
2f3cf540ca
Removed dependencies that OptionalModules had on IronPython and Puma. They are not used.
2009-09-14 10:28:28 -07:00
Rob Smart
16940097be
The stubs for an authorization service, at the moment the service will always grant access to an avatar entering the region if requested.
2009-09-10 17:51:28 -07:00
Melanie
11700ba4a4
Implement plain password authentication partway. Tested, but no user
...
functionality yet.
2009-09-04 07:03:43 +01:00
Melanie
f32de6fe88
Thank you, dslake, for a set of patches to improve OpenSim startup
...
and idle performance.
2009-09-02 03:33:31 +01:00
Teravus Ovares (Dan Olivares)
6f077d5e5f
* Another attempt at fixing the random spurious test error.
...
* This time it might be the listening socket thread from HttpServer aborting with a non blocking thread abort exception. Hopefully calling Stop() on MainServer.Instance will solve that.
2009-08-26 21:05:46 -04:00
Melanie
b7041d7adf
Add reference to OpenMetaverse.dll to UserServer.Modules to make MSVS happy
2009-08-26 15:26:00 +01:00
Teravus Ovares (Dan Olivares)
5f794d3e59
A slightly modified version of
...
http://opensimulator.org/mantis/view.php?id=4040 by jhurliman. The patch didn't match up, so I winged it here. My effort to manually merge the patch seems to make sense, so I'm going to commit it.
2009-08-25 17:36:04 -04:00
Melanie
b23160a871
Remove the AssetInventory server from core. It has fallen behind both
...
upstream and the reference implementation to the point where it is no
longer usable. It has no known users, and sinnce it doesn't work anymore,
it is safe to assume that no one has used it in a long time.
2009-08-20 21:45:49 +01:00
Melanie
2111c66f89
Graft the REST console onto the message server as well. What a dirty hack!
...
Works the same as the others.
2009-08-19 05:40:23 +01:00
Melanie
dd0234f500
Graft the REST console onto the grid server. Same procedure as with
...
the user server.
2009-08-19 05:15:25 +01:00
Melanie
99c7a43ffd
Add rest console support to the user server. Will ask new questions at
...
startup. To use, run it normally once, answering the questions, then
run again with -console=rest.
Also now supports -console=basic for a console that reads stdin
2009-08-19 04:39:02 +01:00
Justin Clark-Casey (justincc)
4a992388e3
Apply http://opensimulator.org/mantis/view.php?id=4016
...
Make previously hidden cookies available to code
Thanks jhurliman
2009-08-17 20:02:42 +01:00
Melanie
644db1e540
Add System.Xml reference to the console project
2009-08-17 09:40:38 +01:00
Melanie
cef16bec6d
Add the OpenSim.ConsoleClient app.
...
Usage: OpenSim.ConsoleClient -h <host> -p <port> -u <user> -P <pass>
host defaults to localhost, port defaults to 8003.
2009-08-17 08:45:20 +01:00
Melanie
002940dd5d
Filling in the blanks: The "meat" of the REST console
2009-08-17 05:00:30 +01:00
Kunnis
5dde4a4cfa
* More improvements to BasicAssetTest.cs
2009-08-16 14:26:43 -04:00
Teravus Ovares (Dan Olivares)
386aa470ea
* Kunnis' third patch in mantis: http://opensimulator.org/mantis/view.php?id=3993
...
* Sets the assembly target of all projects to .NET 3.5. I was asked to apply this by Diva to resolve a build issue with LinQ on Visual Studio 2008 but I have not tested it personally.
2009-08-14 17:52:57 -04:00
Teravus Ovares (Dan Olivares)
f5fc5226f8
* Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ensure that the Packing and unpacking method to and from OSD works as expected called, TestAgentCircuitDataOSDConversion. Also created a HistoricalAgentCircuitDataOSDConversion to ensure that any changes in the way the json wire format is parsed warns us via this test.
2009-08-13 18:10:09 -04:00
Justin Clark-Casey (justincc)
da82fe0409
* Fix test failure by setting up MainConsole.Instance in SceneSetupHelpers.SetupScene()
2009-08-10 16:55:53 +01:00
Melanie
ccd0c893ec
Remove the OpenSim.Services.exe project
2009-08-07 22:11:37 +01:00
Melanie
ed3b21ce4e
Remove the forge module patch insertion area from prebuild.xml
2009-08-06 23:01:59 +01:00
Melanie
dcbaaba61f
Fix prebuild include syntax
2009-08-05 18:55:37 +01:00
Melanie
d2c7fd223c
Comment the include line as it seems our prebuild can't handle it.
2009-08-05 18:48:43 +01:00
Melanie
3cfd6f0c1a
Add include line to prebuild
2009-08-05 18:34:31 +01:00
Melanie
afc318f30b
Add the region module shell for the new freeswitch service
2009-08-04 04:25:17 +01:00
Melanie
0f400dc83d
Adding the plumbing for a ROBUST freeswitch service
2009-08-04 04:11:04 +01:00
Melanie Thielker
ec1a5d8933
Some module reshuffling, no user functionality yet
2009-07-10 20:46:16 +00:00
Melanie Thielker
7b457805a3
Create a MainServer static class to access the regions server's HTTP server
2009-07-10 00:59:43 +00:00
Melanie Thielker
a752936613
A stab at fixong a Windows build break
...
Mantis #3872
2009-07-07 23:53:24 +00:00
Melanie Thielker
3bfd98eae7
Committing the basic universal server Technology (B.U.S.T.)
2009-07-07 16:21:51 +00:00
lbsa71
e50e10369c
* Fixed some prebuild ref issues
2009-06-22 07:39:36 +00:00
diva
913bc3bdb3
Moved OpenSim/Framework/Communications/Capabilities up to OpenSim/Framework/Capabilities. Didn't change the namespace because VC# is not helping, and this would imply manually changing more than 50 files. So the namespace is still OpenSim.Framework.Communications.Capabilities, to be cleaned up later by someone with more energy.
2009-06-18 00:48:39 +00:00
diva
54d44e370b
Removing the OpenSim.SimulatorServices project. All of those region modules are now in CoreModules/ServiceConnectorsIn, where they belong.
2009-06-15 00:17:17 +00:00
diva
7a9c85526c
Pulled out HelloNeighbour into its own service, INeighbourService, which may get more functions as we go along. It's a very simple service and service connectors, and it served primarily to establish the design of services that dependent on Scenes and that must always have a local connector. More refactoring coming, as this showed how to do it right.
2009-06-14 15:35:09 +00:00
Arthur Valadares
c13f3649d2
* Reinstating UserProfileCacheServiceTests. One test still fails (TestUpdateFolder)
2009-06-11 18:27:12 +00:00
diva
0f367bd7bb
Heart surgery no.2: the inventory service hooks.
...
Several improvements in the connectors themselves.
Several improvements in configurations.
Needed to add a hack in IUserService and UserManagerBase, to be removed when that service is refactored.
2009-06-10 13:18:32 +00:00
diva
9216f4b7c2
First draft of the inventory service IN connector. Probably won't work yet. But everything of inventory service is now checked in, first draft.
2009-06-08 03:16:55 +00:00
diva
1ad237a8a7
First draft of inventory service connectors, and service implementation. No handlers yet, this is just the OUT part for now. It's not active and nothing in the simulator uses this yet. Just checking it in to start sharing with others. There are a couple of interesting software design points that could use other devs opinions.
...
Hopefully I added all needed files.
2009-06-07 19:00:55 +00:00
lbsa71
a3c91de17d
* Reverting the test restructuring as, on second thought, this is not at all how the tests are structured.
...
(pt2)
2009-06-07 08:51:10 +00:00
lbsa71
7431b9a3f9
* Restructured Scenes Tests to follow (what I conceive of as being) current directory standards. (pt 2 - thank you, svn. not.)
2009-06-05 06:22:42 +00:00
Melanie Thielker
14bb372bb0
Committing the skeleton of the authentication service
2009-06-03 20:14:41 +00:00
lbsa71
6f37fd8399
* Pried apart the ODE tests. This fixes mantis #3212
2009-06-02 18:12:34 +00:00
Justin Clarke Casey
fa04937a82
* Add xml2 load test
2009-05-29 16:11:33 +00:00
Dahlia Trimble
42fa7cf989
plumbing for future sculpt map caching
2009-05-29 05:42:06 +00:00
lbsa71
0787967f59
* So, giving up on my efforts to de-duplicate the asset handlers. I'll just service commit my current state, then start over and this time concentrating only on the new handlers.
...
* Fixed some erroneous refs in Tests.Common
2009-05-27 18:27:28 +00:00
Sean Dague
85e91ddb67
Revert "* Added IntegrationTest Attribute and tagged the ODETestClass"
...
This reverts commit 8f0096cc7b112fea8f69f391224911f624482747.
To get us back to compiling on fresh checkouts.
2009-05-27 12:53:29 +00:00
Sean Dague
9b003a2a5d
the new Tests were defined before the Tests.Common dll in prebuild,
...
this causes nant to choke on a fresh checkout. This should fix the build
break
2009-05-27 12:41:18 +00:00
lbsa71
17f0a4be53
* Added IntegrationTest Attribute and tagged the ODETestClass
2009-05-27 12:36:58 +00:00
lbsa71
892406248a
* Added OpenSim.Server.Handlers.Tests project
...
* Added AssetServerGetHandlerTests - not really wired up yet; more to come.
* Ignored some gens
2009-05-27 11:54:17 +00:00
diva
f5efb0061a
Forgot to include this on the last commit.
2009-05-26 21:35:24 +00:00
diva
cb704ecde1
Beginning of refactoring RESTComms/LocalComms in the new style of services and connectors. This commit has the beginning of the In connector, not the Out. Nothing of this is finished yet, and it doesn't run. But it should compile ok.
2009-05-25 20:30:24 +00:00
Dr Scofield
7929970257
letting TestClient implement IClientCore as well to fix test case
...
failure due to new NAT code
2009-05-25 10:40:09 +00:00
diva
006c2c2e8f
Fixes map image on link-region (HG).
2009-05-24 02:09:20 +00:00
Arthur Valadares
a85f496f4d
* Upgraded LLStandaloneLoginModule, LLProxyLoginModule and LLClientStackModule to new
...
region modules. This was needed because the stand alone and grid modules weren't deleting
old scenes, which caused an issue when deleting and recreating a region with same name
on same x,y coordinates. Tested it on standalone and issue is fixed. Requires prebuild
to be run again.
Fixes Mantis #3699
2009-05-21 20:28:59 +00:00
Melanie Thielker
744100821d
Refactor RegionAssetService to load the service connector rather than
...
duplicating it's functionality
2009-05-19 00:36:06 +00:00
Melanie Thielker
4789500d32
Rename OpenSim.Server.exe to OpenSim.Services.exe and the corresponding
...
ini to OpenSim.Services.ini.example, which makes soooo much more sense.
Thanks, Adam!
2009-05-18 21:14:08 +00:00
Melanie Thielker
f7dbfe63e5
This commit changes the way the new server works. There is no longer a server
...
exe for each function, rather each function is a connector and the server ini
loads them. If you like your multiple processes, use -inifile with the server.
Otherwise, you get one server process that serves all configured funcions, see
example .ini. The new exe is OpenSim.Server.exe. Clean your bin, loads of names
have changed!
2009-05-18 21:04:25 +00:00
Melanie Thielker
2534078380
Refactor: Change "Servers" to "Server", since the can only be one. Break
...
the handlers out of the asset server context into a generic scope.
2009-05-18 12:36:59 +00:00
Melanie Thielker
72adbd976c
Nonowrking intermadiate commit,, DO NOT USE
2009-05-18 12:10:56 +00:00
Melanie Thielker
cb2ce61876
Move the connectors under services for reasons of application logic. Remove
...
the user server skeleton in preparation for introducing a generic server
2009-05-18 11:43:37 +00:00
diva
f4cee7c97c
Duh, prebuild was wrong. My evil twin sister did it.
2009-05-17 01:52:14 +00:00
diva
aac8ca0411
HG asset transfers starting to work -- GETs only for now.
2009-05-17 01:38:43 +00:00
diva
dc82ba4af5
Fixed minor problem in prebuild.xml
2009-05-15 05:14:59 +00:00
diva
5e4fc6e91e
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
...
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
2009-05-15 05:00:25 +00:00
Melanie Thielker
3aa6fd0d2c
Move the server request handlers into a separate lib nunit can digest
2009-05-14 11:26:14 +00:00
Melanie Thielker
d843b897b2
Move the connector for the new asset server to a connectors project. Inherit
...
the region module version from this. This enables inter-server connections
to reuse connetor code from region modules.
2009-05-14 06:18:18 +00:00
lbsa71
40e95cab02
* Added some more tests to the GetAssetStreamHandlers
2009-05-13 17:11:53 +00:00
Melanie Thielker
16efb78698
Changes to the new user system to add the modularity developed for the asset
...
system
2009-05-11 22:54:09 +00:00
Melanie Thielker
4cd85e5c9e
resolve a circular dependency
2009-05-11 21:11:46 +00:00
Melanie Thielker
f948fab4da
Add AssetService of type IAssetService to Scene
2009-05-11 21:04:27 +00:00
Teravus Ovares
dac793ea47
* Break out the SampleMoneyModule to a new namespace
...
* Create the OpenSim.Region.ReplaceableModules namespace for modules that we intend to have people replace (see readme)
* Create the OpenSim.Region.ReplaceableModules.MoneyModule namespace
* Put our current Sample MoneyModule in this namespace. (more modifications here next commit)
2009-05-09 05:21:56 +00:00
Melanie Thielker
c1e7352d75
Add the asset service connectors and sample config. READ WARNINGS!!!
2009-05-09 02:49:55 +00:00
Justin Clarke Casey
09a6faf0b7
* Fix windows build. Thanks RemedyTomm for the patch
2009-05-08 19:32:10 +00:00
Melanie Thielker
a1631c496e
The new asset server now actually serves existing assets
2009-05-08 18:45:52 +00:00
Melanie Thielker
aec069d161
More additions to the nextgen reference UGAIM
2009-05-08 14:08:41 +00:00
lbsa71
8ac73be917
* Introduced new HttpServer.Tests project
...
* Split the GetAssetStreamHandler testing into separate tests for BaseRequestHandler
* Ignored some gens
2009-05-08 06:11:44 +00:00
Sean Dague
ce0a84cbc0
instrument most of the tests with a new InMethod function that may help us figure
...
out where that pesky deadlock is during test runs.
2009-05-07 19:07:08 +00:00
lbsa71
1afdf2ee1f
* Added some GetAssetStreamHandlerTests
...
* Minor tweaks to attain testability
2009-05-06 17:02:51 +00:00
Melanie Thielker
f51f552baa
Plumb the database into the new server skel
2009-05-05 04:48:09 +00:00
Melanie Thielker
d1c9a41be0
Plumb the new server connector logic
2009-05-05 04:37:06 +00:00
Melanie Thielker
5e28a5982d
Committing the user server executable skeleton
2009-05-05 03:15:41 +00:00
Melanie Thielker
96774752c8
Add an interface skeleton for user services
2009-05-05 03:01:17 +00:00
Melanie Thielker
91ce6c90b5
Committing the HTTP (REST) server base
2009-05-05 02:37:04 +00:00
Melanie Thielker
500f71ca1f
Add the missing reference to fix windows build break
2009-05-05 01:41:48 +00:00
Melanie Thielker
f28b380c4a
Committing the new server base
2009-05-05 01:34:41 +00:00
Melanie Thielker
61afd6db2c
Remove a superfluous reference
2009-05-04 20:50:37 +00:00
Melanie Thielker
acfb5051cd
Intermediate commit. WILL NOT COMPILE!
2009-05-04 20:15:39 +00:00
Melanie Thielker
f80ba373fa
Prebuild changes to allow the console to reference the http server
2009-05-04 15:04:24 +00:00
Melanie Thielker
66e25abbfe
Plumb conifg into the client views. Add config option to configure packet
...
dropping.
2009-05-02 17:31:49 +00:00
Dr Scofield
a89f60d4c9
From: Alan Webb <alan_webb@us.ibm.com> & Dr Scofield <drscofield@xyzzyxyzzy.net>
...
- Adds an admin_modify_region call to allow changing of parcel voice
settings and changing of public/private status
- add boolean "public" and boolean "enable_voice" to
admin_create_region XmlRpc call to allow specifying of
public/private status and to allow enabling voice for all parcels;
also added config variables to allow setting of defaults for those
- fixing cut-and-paste artefacts
2009-04-29 09:05:01 +00:00
Adam Frisby
2af4ca44a6
* Adds additional background layer for VWoHTTP ClientStack
...
* Implements asset handling.
2009-04-23 04:51:29 +00:00
Justin Clarke Casey
8ca805009b
* Fix the other windows build break. Hopefully that shoudl be the last one
2009-04-22 18:48:49 +00:00
Justin Clarke Casey
3ace45a839
* Fix windows build from last commit
2009-04-22 18:36:45 +00:00
Adam Frisby
d6b62b677c
* Committing stub VW-over-HTTP ClientStack. (2/2)
...
* Minor MRM tweak.
2009-04-22 10:11:12 +00:00
Charles Krinke
659b55905d
Thank you kindly, MCortez, for a patch that:
...
Added is a patch that adds a rough Groups implementation. This patch allows
the creation, adding and maintaining Groups, Roles and Members. Work has begun
on a very naive implementation of messaging, and minimal support for notifications
{no attachments yet}. Proposals are not yet supported, but are on the to-do list.
This implementation is not active by default, and must be configured in
OpenSim.ini to become active.
2009-04-18 21:33:48 +00:00
Charles Krinke
b4cb45bb79
Fixes Mantis # 3469. Thank you kindly, BlueWall, for a patch that:
...
This patch adds extended status reporting with the url
http://server:port/simstatusx/ [^] . The data is returned
in json format as "text/plain" type.
2009-04-17 21:48:48 +00:00
Melanie Thielker
c98287249e
Add the XML manifests needed to get the new style modules to load.
...
Scripting now works again
2009-04-15 23:59:15 +00:00
Teravus Ovares
53026affb3
* Instead of referencing mesh stuff in the physics plugin.. change the IMesh Interface. (blame prebuild)
2009-04-11 00:11:54 +00:00
Teravus Ovares
daac8ad2db
* Tweak prebuild #2
2009-04-10 23:55:03 +00:00
Teravus Ovares
881ab5412f
* Fixes missing meshing reference.
2009-04-10 23:32:29 +00:00
lbsa71
5572a00295
* Moved the DatabaseTestAttribute to Test.Common, and thus included ref to that in all db tests. *phew*
2009-04-09 16:40:02 +00:00
Homer Horwitz
ae98a12235
And another fix for the windows build
2009-04-05 18:36:05 +00:00
Homer Horwitz
9af49f4c59
Try another fix for the Windows build break
2009-04-05 18:32:01 +00:00
Homer Horwitz
3e17e578a4
Fix windows build break. Hopefully.
2009-04-05 18:24:58 +00:00
Homer Horwitz
648452dd91
- Add new RegionModulesControllerPlugin to the application modules
...
- Change several classes to use the new plugin for handling of region-modules
(NOTE: No regionmodule is using this yet)
- Add necessary prebuild parts (don't forget to runprebuild)
Attention: Work in progress. This shouldn't break anything, but you never know...
2009-04-05 17:08:11 +00:00
Teravus Ovares
e592d03843
* Committing what I have on the BulletDotNETPlugin that I have so far.
...
* It's not ready to try. It doesn't do what you expect in many ways.
* It throws errors and prints jibberish on the console
* Test it out only if you're brave and you've backed up first.
* The opensim.ini line is physics = BulletDotNETPlugin
2009-04-05 08:35:38 +00:00
Charles Krinke
54a27f9f5c
Thank you kindly, MCortez for a patch that:
...
With some support from HomerH, this patch adds support for Wind
Model plugins via the mono.Addin framework.
* Adds console & OSSL access to Wind Parameters
* Adds plug-in support for custom wind models
* Provides two example Wind Model plug-ins
Documentation for the wind module is temporarily located at http://code.google.com/p/flotsam/wiki/CoreWindModule [^]
-- will move this documentation to http://opensimulator.org [^]
after the patch has been committed.
2009-03-31 02:33:19 +00:00
Teravus Ovares
52c482a7a7
* This updates LibOMV to the current release 0.6.0 on March 19 2009
...
* Important: HttpServer.dll was changed to HttpServer_OpenSim.dll so that the HttpServer references do not conflict if you've copied the OpenMetaverse.Http.dll and requirements to the OpenSimulator bin folder.
This means that if you reference HttpServer.dll in any projects, you will need to change the reference to HttpServer_OpenSim.dll. It still uses the Same HttpServer namespace though.
2009-03-27 22:13:09 +00:00
Justin Clarke Casey
152b02c832
* Ooops, wasn't that - it was the lack of a Types reference isntead
2009-03-26 18:04:35 +00:00
Justin Clarke Casey
58095b2802
* Add missing '.dll' to Serialization OpenMetaverse use to fix windows build break
2009-03-26 18:02:50 +00:00
Justin Clarke Casey
93b26f8933
* iars: Serialize information about item creators to archive
2009-03-26 17:25:12 +00:00
Mike Mazur
f28886e26d
Rename OpenSim.Framework.Archive to OpenSim.Framework.Serialization
...
Update using statements and prebuild.xml. Also trim trailing whitespace.
2009-03-16 00:12:25 +00:00
Mike Mazur
7b2977d625
Move ArchiveConstants to OpenSim.Framework.Archive
...
- move a couple constants from InventoryArchiveConstants to
ArchiveConstants, now only one of these is needed
- change InventoryArchiveConstants references to ArchiveConstants
- remove InventoryArchive AssetInventoryServer plugin dependency on
OpenSim.Region.CodeModules
- trim trailing whitespace
2009-03-12 06:04:17 +00:00
Mike Mazur
f784620780
Moving TarArchive to OpenSim.Framework.Archive
...
We now build OpenSim.Framework.Archive.dll which aims to contain code
used for archiving various things in OpenSim. Also remove trailing
whitespace.
2009-03-12 06:03:59 +00:00
Teravus Ovares
5a6e502266
* Fix silly windows prebuild borkage. To use System.Xml, the project must have it as a reference in prebuild.xml
2009-03-11 13:38:36 +00:00
Mike Mazur
c20e0286d3
Adding AssetInventory InventoryArchive plugin
...
This plugin exposes an HTTP handler on the AssetInventoryServer which
serves a gzipped tar file containing the contents of a user's inventory.
The assets referenced by the inventory are not yet archived. At the
moment only export functionality is implemented, restore functionality
is missing.
prebuild.xml had to be shuffled around a bit in order for the plugin to
build, as it has a dependency on OpenSim.Region.CoreModules.
Also, close a MemoryStream in a few places.
2009-03-11 07:38:35 +00:00
Mike Mazur
3676062277
Use Inventory{Item,Folder}Base in AssetInventoryServer.
...
Also the first inventory storage methods are implemented.
2009-03-05 08:29:52 +00:00
MW
171015f65f
Moved Linden protocol login handling to modules in OpenSim.Client.Linden. There are two region modules in there LLStandaloneLoginModule (for standalone mode) and LLProxyLoginModule (for grid mode which just handles incoming expect_user and logoff_user messages from the remote login server)
...
Changed OpenSim.Framework.Communications.Tests.LoginServiceTests to use the LLStandaloneLoginService (from the LLStandaloneLoginModule) rather than LocalLoginService. Really these login tests should most likely be somewhere else as they are testing specific implementations of login services.
Commented out the old LocalLoginService as its no longer used, but want to check there are no problems before it gets deleted.
2009-03-03 15:41:21 +00:00
MW
03b8eddc37
Added OpenSim.Client.Linden which is a (non shared) region module that creates and initialises the LindenClientStack (or actually whatever client stack was set in opensim.ini) for that region. Currently this module is still at a early stage so just for testing, so its hardcoded to be disabled. To enable first turn off auto creation of the client stack in opensimbase (see last revision) and then in OpenSim.Client.Linden.LLClientStackModule change bool m_createClientStack = false; to true.
2009-03-02 17:18:24 +00:00
MW
5626d43259
Changed the CreateCommsManagerPlugin so it requests a IRegionCreator and subscribes to the OnNewRegionCreated event on that interface rather than requesting the LoadRegionsPlugin directly.
...
Removed the reference to OpenSim.ApplicationPlugins.LoadRegions from the CreateCommsManagerPlugin project.
2009-02-27 17:03:27 +00:00
MW
bb9ba1602b
Changed the order of the OpenSim.Grid.GridServer and OpenSim.Grid.GridServer.Modules projects in prebuild.xml. Hopefully this will fix the mono build problem.
2009-02-27 16:07:11 +00:00
MW
d45fa9c2df
Added GridServerPlugin class (which implements IGridPlugin) to OpenSim.Grid.GridServer.Modules.
...
This class handles all the initialising of the grid server.
And made GridServer into basically a generic server that just loads plugins.
So this is a step towards having a generic server that loads service modules.
2009-02-27 15:57:09 +00:00
MW
95230c244c
Applied patch from Mantis# 3240, thanks tlaukkan/Tommil
2009-02-27 14:50:49 +00:00
Sean Dague
7f727bd33e
This adds a new osGetAgentIP function with threat level set to High. It
...
isn't tested, but it doesn't break anything else. The reason for this
function is to let in world tools be used to coordiante out of world
network services that need access to client ip addresses.
2009-02-26 22:37:02 +00:00
MW
e2d30a0244
Moved the Initialisation of the CommunicationsManager to a ApplicationPlugin.
...
Also in that plugin it registers the IUserService with all the Scenes (as they are created). So now we can start changing over all uses of IUserService, that currently access it from the CommunicationsManager to accessing it from the Scene.RequestModuleInterface call.
Once that is done we can move the UserService creation out to its own plugin and remove all references to it from the CommunicationsManager. Then we can take the next CommunicationsManager interface and repeat.
2009-02-26 21:30:12 +00:00
lbsa71
309eaf4735
* Applied a patch that: Added prim parameters support to MXP client
...
* Updated MXP to contain extension fragment with prims and updated MXPClientView to fill in the parameters.
* Added google protobuffers dll.
* Update MXP dll.
* Updated MXPClientView to send prim parameters as Perception event extension
* Started OpenSim and connected with IdealistViewer via MXP and ensured from log that parameters are being sent.
* Ensured that nant test target runs succesfully.
This closes mantis #3229 . Thanks, tlaukkan!
2009-02-25 16:29:43 +00:00
MW
98178b4e9f
Same treatment for the MessagingServer... added OpenSim.Grid.MessagingServer.Modules for the modules/components of it.
2009-02-24 16:13:16 +00:00
MW
021225675f
Added OpenSim.Grid.GridServer.Modules, for the GridServer modules/components.
2009-02-24 15:57:25 +00:00