e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
fcc83f2305
Unit test for ConfigurationLoader.
...
Adds a new test assembly for OpenSim.
2010-08-13 23:59:33 +01:00
8fd3f6cf7f
Merge branch 'master' into careminster-presence-refactor
2010-08-07 05:41:41 +01:00
1cffeab99d
Relocate one System.Core reference from last commit to the Tests project
...
Ooops, shouldn't have assumed that the tests project came after the main on
2010-08-06 22:53:43 +01:00
a9bbff0cd3
Add System.Core references to OpenSim.Region.CoreModules.* to fix windows build
...
This addresses http://opensimulator.org/mantis/view.php?id=4923
2010-08-06 22:44:44 +01:00
1270727c96
Merge branch 'moap'
2010-08-06 18:29:30 +01:00
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
757929012e
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:11:47 +01:00
71cd4d6e84
Revert "remove long unused OpenSim/Framework/Configuration/* projects"
...
This reverts commit cdd3f17b2b
2010-08-04 01:10:01 +01:00
3302e8ddc4
Merge branch 'master' into careminster-presence-refactor
2010-07-31 00:57:50 +01:00
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
cdd3f17b2b
remove long unused OpenSim/Framework/Configuration/* projects
2010-07-30 20:19:46 +01:00
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
f3e902092a
Add System.Core assembly reference to two projects so that TimeZoneInfo can be used
2010-07-04 12:51:48 -07:00
c5878b6610
Merge branch 'master' into careminster-presence-refactor
2010-06-04 21:11:15 +01:00
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
84e30bee6d
Revert "Meta7 Communities : Authorization service added, skeleton, not yet functional"
...
This reverts commit 31439293cc
2010-05-29 12:34:02 +02:00
31439293cc
Meta7 Communities : Authorization service added, skeleton, not yet functional
2010-05-29 03:56:34 -07:00
97501495eb
Merge branch 'master' into careminster-presence-refactor
2010-05-26 17:19:02 +01:00
724305c37b
Prebuild: removed DB-specific test projects, added refs to Data.Tests
2010-05-23 11:48:13 +03:00
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
d71c483bf0
Prebuild: added *.migrations as resources to MSSQL, SQLiteLegacy (just in case)
2010-05-19 21:49:20 +03:00
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
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
df49756e7b
Looks like the new files were never added to prebuild.xml
2010-05-18 21:15:58 +01:00
9bc5098dd8
Merge branch 'master' into careminster-presence-refactor
2010-04-30 20:15:19 +01:00
89e79c1133
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 17:54:00 +01:00
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
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
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
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
5ee77886ac
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 19:05:32 +01:00
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
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
c9da66728a
Renamed OpenSim.Server.exe to Robust.exe and corresponding .ini's and config.
2010-04-22 07:25:32 -07:00
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
2040649871
Adding the SimianGrid connectors
2010-03-11 11:19:02 -08:00
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
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
107a0a4905
Merge branch 'master' into careminster-presence-refactor
2010-03-04 11:02:01 +00:00
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
d83b86e4bf
Fixed prebuild errors that have emerged with the merge
2010-03-03 09:34:51 -08:00
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
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
a5f78ac604
Formatting cleanup.
2010-03-01 11:59:22 +09:00
2084e08ad7
Merge branch 'master' into careminster
2010-02-14 22:27:39 +00:00
1d4d6c821a
Add missing refernce to prebuild (backport from presence-refactor)
2010-02-09 20:25:24 +00:00
1dfcf68330
Add the friends service skel and correct some namespace issues
2010-02-09 07:05:38 +00:00
ea33652e65
Fixed missing System.Xml from the new tool.
2010-02-08 15:15:14 -08:00
c8f3bb56ff
Merge branch 'master' into careminster
2010-02-08 22:11:38 +00:00
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
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
00f7d622cb
HG 1.5 is in place. Tested in standalone only.
2010-01-28 19:19:42 -08:00
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
48b03c2c61
Integrated the hyperlinking with the GridService.
2010-01-24 14:30:48 -08:00
316503c398
Added some prebuild refs needed for mono building
2010-01-23 15:40:34 +00:00
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
04e29c1bac
Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet.
2010-01-16 21:42:44 -08:00
686660650b
Implement region registration with authentication
2010-01-15 21:57:31 +00:00
ca75ad6743
Remove CreateCommsManagerPlugin
2010-01-11 05:13:47 +00:00
5cf6d6fa79
All grid servers deleted, including user server. They served us well.
2010-01-10 20:17:37 -08:00
2415d36bed
OpenSim.Region.Communications.* is no more. Thanks to everyone who contributed to these!
2010-01-10 19:50:09 -08:00
b0bbe861cd
Moved OpenId authentication from user server to Server.Handlers.Authentication.
2010-01-10 17:15:02 -08:00
53e83e5dbb
* Starting to clean the house...
...
* Fixed circular dependency
2010-01-10 16:20:59 -08:00
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
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
b63405c1a7
Inching ahead... This compiles, but very likely does not run.
2010-01-08 10:43:34 -08:00
3c18c0189a
Avatar appearance skeleton
2010-01-04 00:56:39 +00:00
8bed461957
Test client for remote user account connector and service. It seems to be working.
2010-01-02 20:16:21 -08:00
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
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
130c80efe0
A lot more beef on the login service. The LLLoginResponse is a MONSTER! Almost done...
2009-12-31 17:18:55 -08:00
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
af29999d7d
No-op.
2009-12-30 21:29:29 -08:00
c664307126
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-30 21:00:52 -08:00
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
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
1d2a332b96
Unit tests for presence. They helped fix a couple of wrongnesses.
2009-12-30 14:17:18 -08:00
be2f033626
More renames to make everything consistent. This is the UserAccountService.
2009-12-29 17:21:16 -08:00
e3f60ce06f
Merge branch 'master' into careminster
2009-12-27 15:48:43 +00:00
8e18762e22
* Added prebuild for previous commit.
2009-12-27 15:03:26 +11:00
0a29842caf
Include ChOdePlugin
2009-12-22 00:20:04 -05:00
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
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
f493249bc3
Add wildcard to prebuild include. Seems each file can only hold one project
2009-11-25 08:38:49 +00:00
44012d72e3
* Fix prebuild break
2009-11-10 23:04:13 -05:00
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
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
d068d108ad
Remove the SECS loader
2009-10-27 21:11:10 +00:00
27ee49f198
Updating prebuild.xml to reflect the removal of DotNetEngine
2009-10-27 13:44:23 -07:00
322b39804d
Adding missing CSJ2K reference to OpenSim.Region.Physics.Meshing
2009-10-26 22:05:07 -07:00
3639f68411
Added a missing reference to System.Core for OpenSim.Region.Framework
2009-10-25 01:20:54 -07:00
d0019704e6
Adding the presence service skeleton
2009-10-23 09:47:45 +01:00
96d53f11e5
Added VS2010 support to Prebuild and created runprebuild2010.bat
2009-10-22 17:03:13 -07:00
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
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
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
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
3a04d706c9
Fear the lockless LLUDP implementation!
2009-10-08 17:34:51 -07:00
fa6027aa09
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-06 12:15:24 -07:00
Melanie