aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| | * Renamed OpenSimDefaults.ini.example to OpenSimDefaults.iniJohn Hurliman2010-09-131-0/+0
| | |
| | * 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
| | | | | | | | | | | | | | | | 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-132-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-131-2/+4
| | | | | | | | | | | | | | | | unhandled GenericMessages
| | | * Add client name to packet resend log messages to make them a bit more ↵Justin Clark-Casey (justincc)2010-09-131-3/+7
| | | | | | | | | | | | | | | | informative
| | | * Remove SceneGraph.DetachObject() which was accidentally left around after ↵Justin Clark-Casey (justincc)2010-09-131-10/+0
| | | | | | | | | | | | | | | | being migrated to AttachmentsModule
| | | * Rename now protected method SetAttachmentInventoryStatus() to ↵Justin Clark-Casey (justincc)2010-09-131-4/+4
| | | | | | | | | | | | | | | | ShowAttachInUserInventory() to match ShowDetachInUserInventory()
| | | * Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interfaceJustin Clark-Casey (justincc)2010-09-132-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-131-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 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-133-4/+8
| | |\ \ | | | |/
| | | * Adding missing ConnectionString lines to [DatabaseService] sections for ↵John Hurliman2010-09-132-0/+2
| | | | | | | | | | | | | | | | SQLite configs
| | | * * Fixing length calculations for HTTP texture downloads (the end byte is ↵John Hurliman2010-09-131-4/+6
| | | | | | | | | | | | | | | | inclusive in Range: headers)
| | * | Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
| | | | | | | | | | | | | | | | Provide a mostly empty OpenSim.ini.example
| | * | Output an error and quit if the master file is missing. Also renameMelanie2010-09-132-4/+16
| | | | | | | | | | | | | | | | OpenSim.ini.example to bin/OpenSimDefaults.ini.example
| | * | 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
| | | | | | | | | | 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 ↵meta72010-09-131-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.Melanie2010-09-131-1/+1
| | | | | | | | Provide a mostly empty OpenSim.ini.example
generated by cgit v1.1 at 2024-11-12 16:24:05 +0000