Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-06-07 | 1 | -8/+37 |
|\ | |||||
| * | Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -1/+37 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead. Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy this seems the least ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -0/+37 |
| | | | | | | | | | | | | shortly be changed to work under mono 2.6 and above | ||||
| * | | Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the | Melanie | 2010-06-01 | 1 | -7/+0 |
| |/ | | | | | | | needed libraries | ||||
| * | Changed the GetTextureModule backport to work with the 0.6.9 codebase | John Hurliman | 2010-04-08 | 1 | -1/+0 |
| | | |||||
| * | Added a missing reference to prebuild.xml | John Hurliman | 2010-04-08 | 1 | -0/+1 |
| | | |||||
* | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 1 | -33/+18 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-03-01 | 1 | -33/+18 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-14 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Add missing refernce to prebuild (backport from presence-refactor) | Melanie | 2010-02-09 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-08 | 1 | -0/+22 |
|\ \ | |/ | |||||
| * | Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched | Melanie | 2010-02-08 | 1 | -0/+22 |
| | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-26 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | Added some prebuild refs needed for mono building | Melanie | 2010-01-23 | 1 | -0/+3 |
| | | |||||
| * | Add first part of test for checking restore of task inventory items on oar load | Justin Clark-Casey (justincc) | 2010-01-22 | 1 | -0/+1 |
| | | | | | | | | Passes but not yet complete | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-27 | 1 | -0/+33 |
|\ \ | |/ | |||||
| * | * Added prebuild for previous commit. | Adam Frisby | 2009-12-27 | 1 | -0/+33 |
| | | |||||
* | | Include ChOdePlugin | Kitto Flora | 2009-12-22 | 1 | -0/+30 |
|/ | |||||
* | Remove stub Python module and DLLs since this was never fully implemented | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -2/+0 |
| | | | | | | | 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 | ||||
* | Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid ↵ | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -0/+1 |
| | | | | command line parsing | ||||
* | Add wildcard to prebuild include. Seems each file can only hold one project | Melanie | 2009-11-25 | 1 | -1/+1 |
| | |||||
* | * Fix prebuild break | Teravus Ovares (Dan Olivares) | 2009-11-10 | 1 | -1/+2 |
| | |||||
* | * Move RegionCombinerModule to it's own project | Teravus Ovares (Dan Olivares) | 2009-11-10 | 1 | -0/+41 |
| | | | | * Moves the mono_metadata_token_from_dor message to a different module on loading. | ||||
* | Stop OpenSim.Grid.GridServer.exe from building to reduce user/developer ↵ | Justin Clark-Casey (justincc) | 2009-11-10 | 1 | -1/+1 |
| | | | | | | 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 | ||||
* | Remove the SECS loader | Melanie | 2009-10-27 | 1 | -101/+0 |
| | |||||
* | Updating prebuild.xml to reflect the removal of DotNetEngine | John Hurliman | 2009-10-27 | 1 | -285/+0 |
| | |||||
* | Adding missing CSJ2K reference to OpenSim.Region.Physics.Meshing | John Hurliman | 2009-10-26 | 1 | -0/+1 |
| | |||||
* | Added a missing reference to System.Core for OpenSim.Region.Framework | John Hurliman | 2009-10-25 | 1 | -0/+1 |
| | |||||
* | Adding the presence service skeleton | Melanie | 2009-10-23 | 1 | -0/+31 |
| | |||||
* | Added VS2010 support to Prebuild and created runprebuild2010.bat | John Hurliman | 2009-10-22 | 1 | -1/+1 |
| | |||||
* | Add MaxPoolThreads in startup to limit the size of the thread pool used | Melanie | 2009-10-22 | 1 | -22/+23 |
| | | | | for FireAndForget. This lets us limit concurrency to make OpenSim play nice | ||||
* | * Removed OpenSim.Data.NHibernate | John Hurliman | 2009-10-19 | 1 | -79/+0 |
| | | | | * Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing | ||||
* | * Consolidated adding / removing ClientManager IClientAPIs to two places in ↵ | John Hurliman | 2009-10-13 | 1 | -1/+0 |
| | | | | | | | | Scene * Added some missing implementations of IClientAPI.RemoteEndPoint * Added a ClientManager.Remove(UUID) overload * Removed a reference to a missing project from prebuild.xml | ||||
* | * Rewrote ClientManager to remove Lindenisms from OpenSim core, improve ↵ | John Hurliman | 2009-10-13 | 1 | -0/+1 |
| | | | | | | | | 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) | ||||
* | Fear the lockless LLUDP implementation! | John Hurliman | 2009-10-08 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵ | John Hurliman | 2009-10-06 | 1 | -6/+0 |
|\ | | | | | | | htb-throttle | ||||
| * | Removing dependencies on System.Runtime.Remoting. | Diva Canto | 2009-10-06 | 1 | -6/+0 |
| | | |||||
* | | * Added missing references to prebuild.xml and commented out the LindenUDP ↵ | John Hurliman | 2009-10-06 | 1 | -0/+4 |
|/ | | | | | | | | 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 | ||||
* | Fixed build order for Linux. | Diva Canto | 2009-10-03 | 1 | -64/+64 |
| | |||||
* | Fixed interface between the Messaging server and the grid server. | Diva Canto | 2009-10-03 | 1 | -0/+3 |
| | |||||
* | Merge branch 'master' into diva-textures | Melanie | 2009-10-02 | 1 | -58/+160 |
|\ | |||||
| * | adding testcase for LandDataSerializer; fixing LandDataSerializer ;-) | dr scofield (aka dirk husemann) | 2009-10-01 | 1 | -2/+3 |
| | | |||||
| * | adding skeleton test case for LandDataSerializer [w-i-p] | dr scofield (aka dirk husemann) | 2009-09-30 | 1 | -1/+34 |
| | | |||||
| * | More reordering | Melanie | 2009-09-28 | 1 | -40/+40 |
| | | |||||
| * | Reorder prebuild stuff to make panda eat bamboo in peace | Melanie | 2009-09-28 | 1 | -43/+43 |
| | | |||||
| * | Fixed the connection from User server to GridServer. | Diva Canto | 2009-09-27 | 1 | -0/+3 |
| | | |||||
| * | Unpacking the mess with OtherRegionUp, so we can have a real cache of the ↵ | Diva Canto | 2009-09-27 | 1 | -0/+2 |
| | | | | | | | | neighbours in the grid service modules. | ||||
| * | Added test GridClient, which allowed me to remove a few bugs out of the new ↵ | Diva Canto | 2009-09-24 | 1 | -0/+29 |
| | | | | | | | | code. |