aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie2010-09-171-1/+0
|\ | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Remove the now unused partslockroot2010-09-171-1/+0
| |
* | Add LandServices to make landmarks work right in gridsMelanie2010-09-172-0/+2
|/
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-0/+4
|\
| * Send kill packets for avatars, tooMelanie2010-09-171-0/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1736-1275/+1034
|\ \ | |/ | | | | | | | | 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"root2010-09-174-37/+109
| | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust
| * Fixed a regression in SOG.Copy()John Hurliman2010-09-161-1/+1
| |
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * 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 ↵John Hurliman2010-09-1632-1204/+1057
| | |/ | |/| | | | | | | MapAndArray collection
* | | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-174-37/+109
| | | | | | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust
* | | Removing debugroot2010-09-161-1/+0
| | |
* | | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-164-1/+40
| | |
* | | Catch a nullrefroot2010-09-161-1/+2
| | |
* | | Suppress the strange "Result not Dictionary" messages that happen whenroot2010-09-161-0/+3
| | | | | | | | | | | | a region queries for a nonexistent presence.
* | | Some small bug fixesroot2010-09-162-1/+2
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1611-98/+754
|\ \ \ | |/ /
| * | Add the modules include line back that i dropped by mistakeMelanie2010-09-151-0/+3
| |/
| * extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() ↵Justin Clark-Casey (justincc)2010-09-151-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/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
| | | | | | | | | | | | | | | Remove seldom changed options from OpenSim.ini.example. Remove non-overridable settings like [Architecture] from OpenSimDefaults.ini
| | * Make AuthorizationService optional and disabled by default. It depends onMelanie2010-09-154-2/+6
| | | | | | | | | | | | | | | external PHP and the default configuration makes it throw for not having a URL to this PHP
| | * Fix the aboveMelanie2010-09-141-4/+3
| | |
| * | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve ↵Justin Clark-Casey (justincc)2010-09-154-4/+4
| | | | | | | | | | | | code readability
| * | Instead of locking SOG.Children when a group is being removed from the ↵Justin Clark-Casey (justincc)2010-09-151-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 commitmeta72010-09-151-0/+1
| | |
* | | Don't throw an exception if the authorizationservice is missing a serviceuri ↵meta72010-09-151-1/+0
| | | | | | | | | | | | config entry. Not every authorization service will need a URI.
* | | 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
| |/ | | | | | | | | in their oqn sections, for those of us who don't want a catch-all DatabaseService section.
* | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-09-1417-121/+1418
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ 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
| | | | | | | | | | | | All methods had already been deleted, only GetThreads() was left
| * | 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-1416-68/+1414
| |\ \ | | |/
| | * Fix "show threads" to show threads now being managed by ↵Justin Clark-Casey (justincc)2010-09-142-18/+22
| | | | | | | | | | | | OpenSim.Framework.Watchdog
| | * fix OpenSim.Tests.ConfigurationLoaderTest to satisfy requirement that ↵Justin Clark-Casey (justincc)2010-09-141-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-142-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | all the other default files" This reverts commit c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1. Reverted by agreement.
| | * Revert "Repopulate OpenSim.ini.example with OpenSimDefaults.ini until ↵Justin Clark-Casey (justincc)2010-09-141-1301/+1
| | | | | | | | | | | | | | | | | | | | | | | | somebody does the work of deciding what users commonly change and what they don't" This reverts commit fc48eb7b549cc639e143bb0f1369d74223630aff. Reverted by agreement.
| | * Move OpenSimDefaults,ini into config-include in order to put it with all the ↵Justin Clark-Casey (justincc)2010-09-142-1/+1
| | | | | | | | | | | | other default files
| | * Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebody does ↵Justin Clark-Casey (justincc)2010-09-141-1/+1301
| | | | | | | | | | | | the work of deciding what users commonly change and what they don't
| | * add the missing ini exampleMelanie2010-09-141-0/+1
| | |
generated by cgit v1.1 at 2024-09-27 04:31:39 +0000