aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Catch a nullrefroot2010-09-161-1/+2
* Suppress the strange "Result not Dictionary" messages that happen whenroot2010-09-161-0/+3
* Some small bug fixesroot2010-09-162-1/+2
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-165-63/+60
|\
| * 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-152-3/+18
| |\
| | * Fix the aboveMelanie2010-09-141-4/+3
| * | 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
* | | Revert last commitmeta72010-09-151-0/+1
* | | Don't throw an exception if the authorizationservice is missing a serviceuri ...meta72010-09-151-1/+0
* | | Don't fart when deserializing a prim with no ParentGroup set yetmeta72010-09-151-1/+5
* | | Fix the aboveMelanie2010-09-141-4/+3
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-142-0/+16
|\ \ \ | | |/ | |/|
| * | Allow to place the connection strings and providers for estate and regionMelanie2010-09-142-0/+16
| |/
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-09-1414-121/+76
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-09-141-46/+0
| |\ \ | | |/
| | * Remove long unused Region/Framework/ThreadTrackerJustin Clark-Casey (justincc)2010-09-141-46/+0
| * | reorder some code to avoid merge issues in the futureMelanie2010-09-141-5/+5
| * | Fix merge issuesMelanie2010-09-142-5/+2
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1413-68/+72
| |\ \ | | |/
| | * 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-141-1/+1
| | * Move OpenSimDefaults,ini into config-include in order to put it with all the ...Justin Clark-Casey (justincc)2010-09-141-1/+1
| | * 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-131-4/+6
| | |\ \ | | | |/
| | | * * 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-131-4/+16
| | * | Make the inimaster option default to OpenSimDefaults.ini.Melanie2010-09-131-1/+1
| | |/
* | | Adjust the code for ghost prim removal to new information from KittoMelanie Thielker2010-09-141-3/+7
|/ /
* | Fix a small left over buglet and also add checking of the physics actorMelanie Thielker2010-09-142-1/+11
* | LSL compatibility: Don't throw an exception if an invalid key is passed to l...meta72010-09-131-4/+2
* | 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-131-4/+16
* | Make the inimaster option default to OpenSimDefaults.ini.Melanie2010-09-131-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-13151-2001/+2526
|\ \ | |/
| * Fix unit test SceneSetupHelpers to load the mock simulation data storeJohn Hurliman2010-09-122-1/+76
| * MergedJohn Hurliman2010-09-1296-778/+922
| |\