Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-08-15 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MSSQL/MSSQLSimulationData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/Null/NullSimulationData.cs OpenSim/Data/SQLite/SQLiteSimulationData.cs OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | ||||
| * | minor: Add Gryc Ueusp to CREDITS for commit 884edac amongst others, by request. | Justin Clark-Casey (justincc) | 2012-08-14 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-05-27 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | ||||
| * | Add Blake/Techplex to CONTRIBUTORS. Thanks! | Justin Clark-Casey (justincc) | 2012-05-26 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-05-07 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | just another test :) | nebadon | 2012-05-05 | 1 | -1/+1 |
| | | |||||
| * | never say last test!! | nebadon | 2012-05-05 | 1 | -1/+1 |
| | | |||||
| * | one last test.. | nebadon | 2012-05-05 | 1 | -1/+1 |
| | | |||||
| * | last test clean up the mess.. | nebadon | 2012-05-05 | 1 | -1/+1 |
| | | |||||
| * | test #2 | nebadon | 2012-05-05 | 1 | -1/+1 |
| | | |||||
| * | testing new opensimulator.org hardware out to make sure git still works! | nebadon | 2012-05-05 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'avination' | Melanie | 2012-05-03 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Bogus change to get a version number | Melanie | 2012-05-02 | 1 | -1/+1 |
| | | |||||
* | | Add TBG Renfold to contributors | Justin Clark-Casey (justincc) | 2012-04-30 | 1 | -0/+1 |
| | | |||||
* | | Add Stefan_Boom / stoehr to contributors | Justin Clark-Casey (justincc) | 2012-04-27 | 1 | -0/+1 |
| | | |||||
* | | Add Talun to the CONTRIBUTORS.txt, Thank you for the great patches | nebadon | 2012-04-13 | 1 | -0/+1 |
|/ | | | | Talun | ||||
* | Add MSSQL login processing fix for servers run on different locales. | Justin Clark-Casey (justincc) | 2012-03-31 | 1 | -0/+1 |
| | | | | | | This may no longer be an issue with better locale enforcement in OpenSimulator but it doesn't hurt to have this patch. http://opensimulator.org/mantis/view.php?id=4680 Thanks to controlbreak for this | ||||
* | Start on Bulk inventory update via CAPS. Not functional yet. HG v2 | Melanie | 2012-03-28 | 1 | -1/+1 |
| | |||||
* | Add Garmin Kawaguichi to CONTRIBUTORS.txt | Justin Clark-Casey (justincc) | 2012-03-27 | 1 | -0/+1 |
| | |||||
* | Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927 | Justin Clark-Casey (justincc) | 2012-03-17 | 1 | -0/+1 |
| | | | | | This allows one to get description data for a given prim inventory item. Thanks MarcelEdward and GuduleLapointe! | ||||
* | Add satguru and Fernando to contributors | Justin Clark-Casey (justincc) | 2012-03-10 | 1 | -0/+2 |
| | |||||
* | Add Garmin Kawaguichi to CONTRIBUTORS.txt | Justin Clark-Casey (justincc) | 2011-12-17 | 1 | -0/+1 |
| | |||||
* | Add GuduleLapointe to list of contributors | BlueWall | 2011-11-10 | 1 | -0/+1 |
| | | | | Thanks for the patches! | ||||
* | add myself to the contributors.txt | nebadon | 2011-11-05 | 1 | -0/+1 |
| | |||||
* | add Mana Janus and SpotOn3D to contributors.txt last patch was courtesy | nebadon | 2011-11-05 | 1 | -0/+2 |
| | | | | of Mana Janus I failed to mention that, sorry! | ||||
* | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵ | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -1/+3 |
| | | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled | ||||
* | When creating an OAR, optionally exclude objects according to their permissions | Oren Hurvitz | 2011-09-12 | 1 | -0/+1 |
| | |||||
* | Thanks Neil Canham for fixing bulk inventory updates, no sending ↵ | Snoopy Pfeffer | 2011-08-22 | 1 | -0/+1 |
| | | | | BulkInventoryUpdate after accepting inventory items. | ||||
* | Let's see if I am really a core developer, now. ;) | Snoopy Pfeffer | 2011-08-09 | 1 | -1/+1 |
| | |||||
* | add myself to contributors.txt | Michael Cerquoni aka Nebadon Izumi | 2011-07-07 | 1 | -0/+1 |
| | |||||
* | Added MrMonkE to the contributors. Fixed contributors. | Diva Canto | 2011-04-28 | 1 | -14/+23 |
| | |||||
* | Add SignpostMarv to contributors | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -0/+1 |
| | |||||
* | Hello, World! | BlueWall | 2011-03-15 | 1 | -1/+1 |
| | |||||
* | Add 'contributors' notice for zlib.net.dll to keep track of its origin and ↵ | Justin Clark-Casey (justincc) | 2010-10-19 | 1 | -0/+1 |
| | | | | version. Dahlia, please correct the details if they're wrong. | ||||
* | add Micheil Merlin to CONTRIBUTORS.txt (Mantis #4784) | dahlia | 2010-07-01 | 1 | -0/+1 |
| | |||||
* | thanks lkalif for Mantis #4676 - a patch that adds support for inventory links | dahlia | 2010-04-12 | 1 | -0/+1 |
| | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | ||||
* | Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6 | Justin Clark-Casey (justincc) | 2010-03-11 | 1 | -0/+1 |
| | | | | Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6) | ||||
* | Apply http://opensimulator.org/mantis/view.php?id=4495 | Justin Clark-Casey (justincc) | 2010-02-19 | 1 | -0/+1 |
| | | | | | Adds IsChildAgent property to IAvatar in MRM. Thanks ziah | ||||
* | minor: update CONTRIBUTORS.txt | Justin Clark-Casey (justincc) | 2010-02-12 | 1 | -0/+1 |
| | |||||
* | * Implements OSSL function: osGetSimulatorMemory - returns the current ↵ | Adam Frisby | 2009-12-13 | 1 | -173/+173 |
| | | | | | | | | amount of memory allocated to the simulator process (Moderate Threat Level). * Cleans redundant information out of the Simulator Version. Versions now look like: "OpenSimulator 0.6.9(dev) Unix/Mono" * [Minor] additional log info for MySQLInventoryData | ||||
* | * Patch from Misterblue to fix Environment.TickCount for statistics ↵ | Teravus Ovares (Dan Olivares) | 2009-11-29 | 1 | -172/+173 |
| | | | | | | purposes. Resolves the wrap-around of the 32 bit uint. * Teravus moved the Environment methods to the Util class | ||||
* | minor: Add revolution to CONTRIBUTORS.txt | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -0/+1 |
| | |||||
* | minor: add KittyLiu to CONTRIBUTORS.txt | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -0/+1 |
| | |||||
* | 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 | ||||
* | using official lab name (kicking panda) | dr scofield (aka dirk husemann) | 2009-08-31 | 1 | -1/+1 |
| | |||||
* | Standardize FlotsamAssetCache header | Justin Clark-Casey (justincc) | 2009-08-28 | 1 | -8/+10 |
| | | | | | Add mcortez to CONTRIBUTORS Other minor tidy of CONTRIBUTORS | ||||
* | * Added Kunnis to CONTRIBUTORS.txt | Teravus Ovares (Dan Olivares) | 2009-08-14 | 1 | -1/+3 |
| | |||||
* | adding aka for Dr Scofield | dr scofield (aka dirk husemann) | 2009-08-04 | 1 | -1/+1 |
| | |||||
* | Minor: rename libsl to libomv in Contributors.txt. | Jeff Ames | 2009-07-23 | 1 | -1/+1 |
| | |||||
* | add rick to contributors file | Sean Dague | 2009-07-20 | 1 | -0/+1 |
| |