| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Suppress the strange "Result not Dictionary" messages that happen when | root | 2010-09-16 | 1 | -0/+3 | |
| | | | | | | | | | a region queries for a nonexistent presence. | |||||
| * | | 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() ↵ | Justin Clark-Casey (justincc) | 2010-09-15 | 1 | -49/+49 | |
| | | | | | | | | | | | | | | | | | | | to reduce scope for kill/update race conditions This is necessary because it was still possible for an entity update packet to be constructed, the thread to pause, a kill to be sent on another thread, and then the original thread to resume and send the update This would result in an update being received after a kill, which results in undeletable ghost objects until the viewer is relogged Extending the lock looks okay since its only taken by kill, update and reprioritize, and both kill and update do not take further locks However, evidence suggests that there is still a kill/update race somewhere | |||||
| | * | 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 ↵ | Justin Clark-Casey (justincc) | 2010-09-15 | 4 | -4/+4 | |
| | | | | | | | | | | | | | code readability | |||||
| | * | | Instead of locking SOG.Children when a group is being removed from the ↵ | Justin Clark-Casey (justincc) | 2010-09-15 | 1 | -15/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | scene, iterate over an unlocked list instead Previously, deadlock was possible because deleting a group took a SOG.Children lock then an m_entityUpdates.SyncRoot lock in LLClientView At the same time, a thread starting from LLClientView.ProcessEntityUpdates() could take an m_entityUpdates.SyncRoot lock then later attempt to take a SOG.Children lock in PermissionsModule.GenerateClientFlags() and later on Taking a children list in SOG appears to be a better solution than changing PermissionsModule to not relook up the prim. Going the permission modules root would require that all downstream modules not take a SOG.Children lock either | |||||
| * | | | 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 | |
| | | | | | | | | | | | | | config entry. Not every authorization service will need a URI. | |||||
| * | | | 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 | |
| | |/ | | | | | | | | | in their oqn sections, for those of us who don't want a catch-all DatabaseService section. | |||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-09-14 | 14 | -121/+76 | |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * \ | 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 | |
| | | | | | | | | | | | | | All methods had already been deleted, only GetThreads() was left | |||||
| | * | | 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 ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 2 | -18/+22 | |
| | | | | | | | | | | | | | OpenSim.Framework.Watchdog | |||||
| | | * | fix OpenSim.Tests.ConfigurationLoaderTest to satisfy requirement that ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | OpenSimDefaults.ini is present this should allow the testsuite to run again and the autobuild to complete | |||||
| | | * | Revert "Move OpenSimDefaults,ini into config-include in order to put it with ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | all the other default files" This reverts commit c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1. Reverted by agreement. | |||||
| | | * | Move OpenSimDefaults,ini into config-include in order to put it with all the ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | other default files | |||||
| | | * | 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 | |
| | | | | | | | | | | | | | | | | | This can get very spammy with regularly changing objects. Please uncomment if required. | |||||
| | | | * | minor: Add comments which explain what's going on wrt avatar movements at ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 2 | -0/+6 | |
| | | | | | | | | | | | | | | | | | various points in the main scene loop and associated methods | |||||
| | | | * | Improve generic message exception logging. Quieten down complaints about ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | unhandled GenericMessages | |||||
| | | | * | Add client name to packet resend log messages to make them a bit more ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -3/+7 | |
| | | | | | | | | | | | | | | | | | informative | |||||
| | | | * | Remove SceneGraph.DetachObject() which was accidentally left around after ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -10/+0 | |
| | | | | | | | | | | | | | | | | | being migrated to AttachmentsModule | |||||
| | | | * | Rename now protected method SetAttachmentInventoryStatus() to ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | ShowAttachInUserInventory() to match ShowDetachInUserInventory() | |||||
| | | | * | Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface | Justin Clark-Casey (justincc) | 2010-09-13 | 2 | -16/+13 | |
| | | | | | | | | | | | | | | | | | No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately | |||||
| | | | * | If attachment fails (e.g. because asset wasn't found) then don't try to set ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | attachment as shown in inventory Doing this results in a null reference exception | |||||
| | | | * | 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 ↵ | John Hurliman | 2010-09-13 | 1 | -4/+6 | |
| | | | | | | | | | | | | | | | | | inclusive in Range: headers) | |||||
| | | * | | Change the help message to point to copying OpenSimDefaults.ini.example. | Melanie | 2010-09-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | Provide a mostly empty OpenSim.ini.example | |||||
| | | * | | Output an error and quit if the master file is missing. Also rename | Melanie | 2010-09-13 | 1 | -4/+16 | |
| | | | | | | | | | | | | | | | | | OpenSim.ini.example to bin/OpenSimDefaults.ini.example | |||||
| | | * | | 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 | |
| | | | | | | | | | | | position on backup. This way, ant object that has been moved will be checked for ghost prims as soon as it is persisted. | |||||
| * | | LSL compatibility: Don't throw an exception if an invalid key is passed to ↵ | meta7 | 2010-09-13 | 1 | -4/+2 | |
| | | | | | | | | | llInstantMessage, instead shout about it and apply the usual delay. This now matches SL. | |||||
| * | | Change the help message to point to copying OpenSimDefaults.ini.example. | Melanie | 2010-09-13 | 1 | -1/+1 | |
| | | | | | | | | | Provide a mostly empty OpenSim.ini.example | |||||
| * | | Output an error and quit if the master file is missing. Also rename | Melanie | 2010-09-13 | 1 | -4/+16 | |
| | | | | | | | | | OpenSim.ini.example to bin/OpenSimDefaults.ini.example | |||||
| * | | 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 | |
| |\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | |||||
| | * | 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 | |
| | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |