| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Overwrite the core version of the string parsing method with ours | Melanie | 2010-09-17 | 1 | -60/+37 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -37/+60 | |
| |\ \ \ | |/ / | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-17 | 4 | -35/+111 | |
| | |\ \ | ||||||
| | * | | | Applying the llParseString2List() patch from #5036 that Melanie claims was ↵ | John Hurliman | 2010-09-17 | 1 | -81/+22 | |
| | | |/ | |/| | | | | | | | already applied | |||||
| * | | | Remove the now unused partslock | root | 2010-09-17 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -0/+4 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Send kill packets for avatars, too | Melanie | 2010-09-17 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 28 | -1259/+830 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | |||||
| | * | | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 3 | -35/+107 | |
| | |/ | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | |||||
| | * | Fixed a regression in SOG.Copy() | John Hurliman | 2010-09-16 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-16 | 6 | -3/+55 | |
| | |\ | ||||||
| | | * | Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {} | Justin Clark-Casey (justincc) | 2010-09-17 | 1 | -22/+21 | |
| | | | | ||||||
| | | * | Send KillPackets on the Task queue rather than the State queue | Justin Clark-Casey (justincc) | 2010-09-17 | 3 | -2/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object updates are sent on the task queue. It's possible for an object update to be placed on the client queue before a kill packet comes along. The kill packet would then be placed on the state queue and possibly get sent before the update If the update gets sent afterwards then client get undeletable no owner objects until relog Placing the kills in the task queue should mean that they are received after updates. The kill record prevents subsequent updates getting on the queue Comments state that updates are sent via the state queue but this isn't true. If this was the case this problem might not exist. | |||||
| | | * | Removing debug | root | 2010-09-16 | 1 | -1/+0 | |
| | | | | ||||||
| | | * | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 4 | -1/+40 | |
| | | | | ||||||
| | * | | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 25 | -1191/+856 | |
| | |/ | | | | | | | MapAndArray collection | |||||
| * | | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 3 | -35/+107 | |
| | | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | |||||
| * | | Removing debug | root | 2010-09-16 | 1 | -1/+0 | |
| | | | ||||||
| * | | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 4 | -1/+40 | |
| | | | ||||||
| * | | Catch a nullref | root | 2010-09-16 | 1 | -1/+2 | |
| | | | ||||||
| * | | 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 | |||||
| | * | 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 | |||||
| * | | Don't fart when deserializing a prim with no ParentGroup set yet | meta7 | 2010-09-15 | 1 | -1/+5 | |
| | | | ||||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-09-14 | 10 | -56/+53 | |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * | | 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 | 10 | -49/+49 | |
| | |\ \ | | |/ | ||||||
| | | * | 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. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |