aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-167-6/+58
|\
| * Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}Justin Clark-Casey (justincc)2010-09-171-22/+21
| * Send KillPackets on the Task queue rather than the State queueJustin Clark-Casey (justincc)2010-09-173-2/+17
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-174-1/+42
| |\
| | * Removing debugroot2010-09-161-1/+0
| | * JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-164-1/+40
| * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-09-161-3/+3
* | | Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-1632-1204/+1057
| |/ |/|
* | Add the modules include line back that i dropped by mistakeMelanie2010-09-151-0/+3
|/
* extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() t...Justin Clark-Casey (justincc)2010-09-151-49/+49
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-158-42/+712
|\
| * Mark up OpenSim.ini.example for use with an automatic configuration tool.Melanie2010-09-152-37/+688
| * Make AuthorizationService optional and disabled by default. It depends onMelanie2010-09-154-2/+6
| * Fix the aboveMelanie2010-09-141-4/+3
| * Allow to place the connection strings and providers for estate and regionMelanie2010-09-142-0/+16
* | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co...Justin Clark-Casey (justincc)2010-09-154-4/+4
* | Instead of locking SOG.Children when a group is being removed from the scene,...Justin Clark-Casey (justincc)2010-09-151-15/+17
|/
* Remove long unused Region/Framework/ThreadTrackerJustin Clark-Casey (justincc)2010-09-141-46/+0
* Fix "show threads" to show threads now being managed by OpenSim.Framework.Wat...Justin Clark-Casey (justincc)2010-09-142-18/+22
* fix OpenSim.Tests.ConfigurationLoaderTest to satisfy requirement that OpenSim...Justin Clark-Casey (justincc)2010-09-141-1/+1
* Revert "Move OpenSimDefaults,ini into config-include in order to put it with ...Justin Clark-Casey (justincc)2010-09-142-1/+1
* Revert "Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebod...Justin Clark-Casey (justincc)2010-09-141-1301/+1
* Move OpenSimDefaults,ini into config-include in order to put it with all the ...Justin Clark-Casey (justincc)2010-09-142-1/+1
* Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebody does t...Justin Clark-Casey (justincc)2010-09-141-1/+1301
* add the missing ini exampleMelanie2010-09-141-0/+1
* Renamed OpenSimDefaults.ini.example to OpenSimDefaults.iniJohn Hurliman2010-09-131-0/+0
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-139-52/+45
|\
| * Comment out SOG storing debug log messageJustin Clark-Casey (justincc)2010-09-141-3/+3
| * minor: Add comments which explain what's going on wrt avatar movements at var...Justin Clark-Casey (justincc)2010-09-132-0/+6
| * Improve generic message exception logging. Quieten down complaints about unh...Justin Clark-Casey (justincc)2010-09-131-2/+4
| * Add client name to packet resend log messages to make them a bit more informa...Justin Clark-Casey (justincc)2010-09-131-3/+7
| * Remove SceneGraph.DetachObject() which was accidentally left around after bei...Justin Clark-Casey (justincc)2010-09-131-10/+0
| * Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUse...Justin Clark-Casey (justincc)2010-09-131-4/+4
| * Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interfaceJustin Clark-Casey (justincc)2010-09-132-16/+13
| * If attachment fails (e.g. because asset wasn't found) then don't try to set a...Justin Clark-Casey (justincc)2010-09-131-4/+2
| * minor: Clean up log messages generated when an item is attachedJustin Clark-Casey (justincc)2010-09-133-12/+8
* | Add a missing parenthesisMelanie2010-09-131-1/+1
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-133-4/+8
|\ \ | |/
| * Adding missing ConnectionString lines to [DatabaseService] sections for SQLit...John Hurliman2010-09-132-0/+2
| * * Fixing length calculations for HTTP texture downloads (the end byte is incl...John Hurliman2010-09-131-4/+6
* | Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
* | Output an error and quit if the master file is missing. Also renameMelanie2010-09-132-4/+16
* | Make the inimaster option default to OpenSimDefaults.ini.Melanie2010-09-131-1/+1
|/
* Fix unit test SceneSetupHelpers to load the mock simulation data storeJohn Hurliman2010-09-122-1/+76
* MergedJohn Hurliman2010-09-1296-778/+922
|\
| * Formatting cleanup.Jeff Ames2010-09-1292-774/+756
| * Add copyright headers.Jeff Ames2010-09-127-6/+168
* | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-1234-255/+460
|/
* Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataService...John Hurliman2010-09-123-20/+227
* Shuffling fields and properties around in Scene to make Scene.cs more readableJohn Hurliman2010-09-111-138/+124