Commit Graph

142 Commits (89d342b5ce9ac5d9fc4fd493eead8e050f99c91a)

Author SHA1 Message Date
Melanie 90e4c3fece Merge branch 'master' into careminster
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
2012-08-15 18:58:15 +01:00
Justin Clark-Casey (justincc) d8125fb1f7 minor: Add Gryc Ueusp to CREDITS for commit 884edac amongst others, by request. 2012-08-14 21:56:31 +01:00
Melanie 884c0e7bb1 Merge branch 'master' into careminster
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
2012-05-27 19:24:30 +01:00
Justin Clark-Casey (justincc) 3ac3be99ae Add Blake/Techplex to CONTRIBUTORS. Thanks! 2012-05-26 01:35:33 +01:00
Melanie df7abbb367 Merge branch 'master' into careminster 2012-05-07 12:07:47 +01:00
nebadon c11b3760da just another test :) 2012-05-05 14:49:10 -07:00
nebadon f19fe50629 never say last test!! 2012-05-05 14:45:53 -07:00
nebadon 86dd5adceb one last test.. 2012-05-05 14:42:33 -07:00
nebadon 8d070cf47b last test clean up the mess.. 2012-05-05 14:32:40 -07:00
nebadon 531c52abe3 test #2 2012-05-05 13:59:40 -07:00
nebadon 9317b888f9 testing new opensimulator.org hardware out to make sure git still works! 2012-05-05 13:49:10 -07:00
Melanie 8b1cc0dd29 Merge branch 'avination' 2012-05-03 00:15:45 +02:00
Melanie 8ef2a2b7de Bogus change to get a version number 2012-05-02 00:35:52 +02:00
Justin Clark-Casey (justincc) cc482d2d56 Add TBG Renfold to contributors 2012-04-30 17:39:11 +01:00
Justin Clark-Casey (justincc) 9d1791def8 Add Stefan_Boom / stoehr to contributors 2012-04-27 19:42:12 +01:00
nebadon 2254a718c8 Add Talun to the CONTRIBUTORS.txt, Thank you for the great patches
Talun
2012-04-13 17:09:23 -07:00
Justin Clark-Casey (justincc) 38d241a317 Add MSSQL login processing fix for servers run on different locales.
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
2012-03-31 01:12:04 +01:00
Melanie 0463a00d34 Start on Bulk inventory update via CAPS. Not functional yet. HG v2 2012-03-28 02:45:50 +01:00
Justin Clark-Casey (justincc) b78224176e Add Garmin Kawaguichi to CONTRIBUTORS.txt 2012-03-27 02:10:39 +01:00
Justin Clark-Casey (justincc) 4a57112f19 Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927
This allows one to get description data for a given prim inventory item.
Thanks MarcelEdward and GuduleLapointe!
2012-03-17 04:02:23 +00:00
Justin Clark-Casey (justincc) 3a5928f813 Add satguru and Fernando to contributors 2012-03-10 01:31:27 +00:00
Justin Clark-Casey (justincc) 9b56cc69c1 Add Garmin Kawaguichi to CONTRIBUTORS.txt 2011-12-17 00:29:42 +00:00
BlueWall ce4560bf8f Add GuduleLapointe to list of contributors
Thanks for the patches!
2011-11-10 07:26:16 -05:00
nebadon e8a8e462ed add myself to the contributors.txt 2011-11-05 03:03:57 -07:00
nebadon f0d2fcfbe9 add Mana Janus and SpotOn3D to contributors.txt last patch was courtesy
of Mana Janus I failed to mention that, sorry!
2011-11-05 02:35:19 -07:00
Justin Clark-Casey (justincc) e742cffe15 Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off.
This is for debugging purposes.  Defaults to Attachments Enabled
2011-09-30 01:19:22 +01:00
Oren Hurvitz 7f318277f1 When creating an OAR, optionally exclude objects according to their permissions 2011-09-12 20:09:24 +01:00
Snoopy Pfeffer db91044593 Thanks Neil Canham for fixing bulk inventory updates, no sending BulkInventoryUpdate after accepting inventory items. 2011-08-22 14:51:43 +02:00
Snoopy Pfeffer 1677587532 Let's see if I am really a core developer, now. ;) 2011-08-09 01:11:39 +02:00
Michael Cerquoni aka Nebadon Izumi 4e30361f63 add myself to contributors.txt 2011-07-07 03:30:40 -07:00
Diva Canto 5c227da497 Added MrMonkE to the contributors. Fixed contributors. 2011-04-28 07:36:34 -07:00
Justin Clark-Casey (justincc) 435d72f106 Add SignpostMarv to contributors 2011-03-26 02:46:00 +00:00
BlueWall 28c335e25f Hello, World! 2011-03-15 17:16:50 -04:00
Justin Clark-Casey (justincc) e561070d3f Add 'contributors' notice for zlib.net.dll to keep track of its origin and version. Dahlia, please correct the details if they're wrong. 2010-10-19 02:28:10 +01:00
dahlia d58b32735d add Micheil Merlin to CONTRIBUTORS.txt (Mantis #4784) 2010-07-01 20:50:24 -07:00
dahlia 3d0860ae61 thanks lkalif for Mantis #4676 - a patch that adds support for inventory links
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-04-12 17:10:51 -07:00
Justin Clark-Casey (justincc) e844524b41 Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6
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)
2010-03-11 21:04:56 +00:00
Justin Clark-Casey (justincc) 68b494b2cc Apply http://opensimulator.org/mantis/view.php?id=4495
Adds IsChildAgent property to IAvatar in MRM.
Thanks ziah
2010-02-19 22:44:33 +00:00
Justin Clark-Casey (justincc) b2656e62ba minor: update CONTRIBUTORS.txt 2010-02-12 23:16:45 +00:00
Adam Frisby 963cf25813 * Implements OSSL function: osGetSimulatorMemory - returns the current 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
2009-12-13 03:04:16 +11:00
Teravus Ovares (Dan Olivares) 4338f4e1d7 * Patch from Misterblue to fix Environment.TickCount for statistics purposes. Resolves the wrap-around of the 32 bit uint.
* Teravus moved the Environment methods to the Util class
2009-11-29 05:06:25 -05:00
Justin Clark-Casey (justincc) bdba4500ed minor: Add revolution to CONTRIBUTORS.txt 2009-11-27 19:27:01 +00:00
Justin Clark-Casey (justincc) eaa424778b minor: add KittyLiu to CONTRIBUTORS.txt 2009-11-27 19:02:48 +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
dr scofield (aka dirk husemann) ca673a7744 using official lab name (kicking panda) 2009-08-31 17:41:33 +02:00
Justin Clark-Casey (justincc) 33004b613d Standardize FlotsamAssetCache header
Add mcortez to CONTRIBUTORS
Other minor tidy of CONTRIBUTORS
2009-08-28 18:12:30 +01:00
Teravus Ovares (Dan Olivares) 2c20d60de6 * Added Kunnis to CONTRIBUTORS.txt 2009-08-14 17:59:57 -04:00
dr scofield (aka dirk husemann) 8bfb85080d adding aka for Dr Scofield 2009-08-04 12:10:36 +02:00
Jeff Ames b73edc3d7a Minor: rename libsl to libomv in Contributors.txt. 2009-07-23 15:12:00 +00:00
Sean Dague 8af7d5b368 add rick to contributors file 2009-07-20 15:12:56 +00:00