Commit Graph

688 Commits (9fa915bdef9371ec5953f6ba6496b11bec5803a9)

Author SHA1 Message Date
Melanie bb7a755cba Merge branch 'master' into careminster-presence-refactor 2010-10-18 20:30:46 +01:00
dahlia 7fa3335fd5 initial support for meshies physics. Must set ini option UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example. 2010-10-18 04:17:36 -07:00
Melanie 455a2ba7de Merge branch 'master' into careminster-presence-refactor 2010-10-16 02:27:51 +01:00
dahlia bcdd03c1cf more work in progress on mesh physics - still non-functional 2010-10-14 20:25:31 -07:00
Melanie 6ac6ca057d Kill some magic numbers in the caps module 2010-10-14 07:28:20 +01:00
Melanie d8149373c1 Merge branch 'master' into careminster-presence-refactor 2010-10-06 00:27:10 +01:00
Melanie 613bdb40bd Remove sirikata project 2010-10-06 00:22:08 +01:00
Melanie 5910be236f Merge branch 'master' into careminster-presence-refactor 2010-10-03 16:52:27 +01:00
Melanie ab4be3ffdf Initial port of the Warp3D map tile renderer 2010-10-03 16:34:17 +01:00
Melanie 4fbdcb95a0 Merge branch 'master' into careminster-presence-refactor 2010-09-25 06:19:26 +01:00
Teravus Ovares (Dan Olivares) 983c6a74b1 * Add CSharpSqlite to prebuild
* Use a conditional define to determine whether we're using CSharpSqlite or Mono.Data.Sqlite
#if CSharpSqlite
    using Community.CsharpSqlite.Sqlite;
#else
    using Mono.Data.Sqlite;
#endif
* Hopefully, this will restore sqlite functionality on a Mac.  In visual studio, you can edit the OpenSim.Data.SQLite project, go to the Build tab and enter CSharpSqlite in the box.  I'm not sure how to define CSharpSqlite in Mono, someone better at it then me will have to take the job of figuring out the best way to define it in Mono.
2010-09-23 01:21:08 -04:00
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 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
BlueWall 1e44ec84bd 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:

		<Reference name="Nini" path="../../../bin/"/>

	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.
2010-09-04 02:12:21 +01:00
Melanie e74809ff4c Merge branch 'master' into careminster-presence-refactor 2010-08-18 00:59:20 +01:00
Marck fcc83f2305 Unit test for ConfigurationLoader.
Adds a new test assembly for OpenSim.
2010-08-13 23:59:33 +01:00
Melanie 8fd3f6cf7f Merge branch 'master' into careminster-presence-refactor 2010-08-07 05:41:41 +01:00
justincc 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
Justin Clark-Casey (justincc) 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
Justin Clark-Casey (justincc) 1270727c96 Merge branch 'moap' 2010-08-06 18:29:30 +01:00
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