| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Suppress the strange "Result not Dictionary" messages that happen when | root | 2010-09-16 | 1 | -0/+3 |
* | | Some small bug fixes | root | 2010-09-16 | 2 | -1/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-16 | 5 | -63/+60 |
|\ \
| |/ |
|
| * | extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() t... | Justin Clark-Casey (justincc) | 2010-09-15 | 1 | -49/+49 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-15 | 2 | -3/+18 |
| |\ |
|
| | * | Fix the above | Melanie | 2010-09-14 | 1 | -4/+3 |
| * | | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co... | Justin Clark-Casey (justincc) | 2010-09-15 | 4 | -4/+4 |
| * | | Instead of locking SOG.Children when a group is being removed from the scene,... | Justin Clark-Casey (justincc) | 2010-09-15 | 1 | -15/+17 |
* | | | Revert last commit | meta7 | 2010-09-15 | 1 | -0/+1 |
* | | | Don't throw an exception if the authorizationservice is missing a serviceuri ... | meta7 | 2010-09-15 | 1 | -1/+0 |
* | | | Don't fart when deserializing a prim with no ParentGroup set yet | meta7 | 2010-09-15 | 1 | -1/+5 |
* | | | Fix the above | Melanie | 2010-09-14 | 1 | -4/+3 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 2 | -0/+16 |
|\ \ \
| | |/
| |/| |
|
| * | | Allow to place the connection strings and providers for estate and region | Melanie | 2010-09-14 | 2 | -0/+16 |
| |/ |
|
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie Thielker | 2010-09-14 | 14 | -121/+76 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 1 | -46/+0 |
| |\ \
| | |/ |
|
| | * | Remove long unused Region/Framework/ThreadTracker | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -46/+0 |
| * | | reorder some code to avoid merge issues in the future | Melanie | 2010-09-14 | 1 | -5/+5 |
| * | | Fix merge issues | Melanie | 2010-09-14 | 2 | -5/+2 |
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 13 | -68/+72 |
| |\ \
| | |/ |
|
| | * | Fix "show threads" to show threads now being managed by OpenSim.Framework.Wat... | Justin Clark-Casey (justincc) | 2010-09-14 | 2 | -18/+22 |
| | * | fix OpenSim.Tests.ConfigurationLoaderTest to satisfy requirement that OpenSim... | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1/+1 |
| | * | Revert "Move OpenSimDefaults,ini into config-include in order to put it with ... | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1/+1 |
| | * | Move OpenSimDefaults,ini into config-include in order to put it with all the ... | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1/+1 |
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-13 | 9 | -52/+45 |
| | |\ |
|
| | | * | Comment out SOG storing debug log message | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -3/+3 |
| | | * | minor: Add comments which explain what's going on wrt avatar movements at var... | Justin Clark-Casey (justincc) | 2010-09-13 | 2 | -0/+6 |
| | | * | Improve generic message exception logging. Quieten down complaints about unh... | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -2/+4 |
| | | * | Add client name to packet resend log messages to make them a bit more informa... | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -3/+7 |
| | | * | Remove SceneGraph.DetachObject() which was accidentally left around after bei... | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -10/+0 |
| | | * | Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUse... | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -4/+4 |
| | | * | Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface | Justin Clark-Casey (justincc) | 2010-09-13 | 2 | -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-13 | 1 | -4/+2 |
| | | * | minor: Clean up log messages generated when an item is attached | Justin Clark-Casey (justincc) | 2010-09-13 | 3 | -12/+8 |
| | * | | Add a missing parenthesis | Melanie | 2010-09-13 | 1 | -1/+1 |
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-13 | 1 | -4/+6 |
| | |\ \
| | | |/ |
|
| | | * | * Fixing length calculations for HTTP texture downloads (the end byte is incl... | John Hurliman | 2010-09-13 | 1 | -4/+6 |
| | * | | Change the help message to point to copying OpenSimDefaults.ini.example. | Melanie | 2010-09-13 | 1 | -1/+1 |
| | * | | Output an error and quit if the master file is missing. Also rename | Melanie | 2010-09-13 | 1 | -4/+16 |
| | * | | Make the inimaster option default to OpenSimDefaults.ini. | Melanie | 2010-09-13 | 1 | -1/+1 |
| | |/ |
|
* | | | Adjust the code for ghost prim removal to new information from Kitto | Melanie Thielker | 2010-09-14 | 1 | -3/+7 |
|/ / |
|
* | | Fix a small left over buglet and also add checking of the physics actor | Melanie Thielker | 2010-09-14 | 2 | -1/+11 |
* | | LSL compatibility: Don't throw an exception if an invalid key is passed to l... | meta7 | 2010-09-13 | 1 | -4/+2 |
* | | Change the help message to point to copying OpenSimDefaults.ini.example. | Melanie | 2010-09-13 | 1 | -1/+1 |
* | | Output an error and quit if the master file is missing. Also rename | Melanie | 2010-09-13 | 1 | -4/+16 |
* | | Make the inimaster option default to OpenSimDefaults.ini. | Melanie | 2010-09-13 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 151 | -2001/+2526 |
|\ \
| |/ |
|
| * | Fix unit test SceneSetupHelpers to load the mock simulation data store | John Hurliman | 2010-09-12 | 2 | -1/+76 |
| * | Merged | John Hurliman | 2010-09-12 | 96 | -778/+922 |
| |\ |
|
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 92 | -774/+756 |