aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix a typoMelanie2010-09-211-3/+3
| | |
| * | Refactor script create permission into the perms moduleMelanie2010-09-212-15/+23
| | |
* | | If the uuid gatherer fails to find the asset containing gesture metadata, ↵Justin Clark-Casey (justincc)2010-09-241-0/+7
| |/ |/| | | | | | | | | | | then simply return rather than generating an exception This matches existing behaviour, though better diagnostics for missing assets may be good later on. This addresses http://opensimulator.org/mantis/view.php?id=4977
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-215-2/+354
|\ \
| * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-2119-150/+867
| |\ \
| | * | * Tweaked the LocationTests for maximum coverage.Teravus Ovares (Dan Olivares)2010-09-182-1/+60
| | | | | | | | | | | | | | | | * Added more mundane tests.
| | * | * Covered the type converters in SLUtil with unit tests.Teravus Ovares (Dan Olivares)2010-09-181-1/+57
| | | | | | | | | | | | | | | | * Does anyone have an example raw notecard to look at and test the notecard parser?
| | * | * More Mundane TestsTeravus Ovares (Dan Olivares)2010-09-172-0/+198
| | | | | | | | | | | | | | | | * SL Util tests of AssetType2ContentType and ContentType2AssetType
| * | | If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ↵Justin Clark-Casey (justincc)2010-09-212-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scene, remove the old uuid reference from m_parts as well as adding the new one. The separate remove and set operations is SOG.set_UUID() are both locked under m_parts.SyncRoot since they are logically atomic (though this isn't such an issue if the SOG isn't part of a scene) Added unit test for this behaviour. Also changed the second m_parts.AddOrReplace() to m_parts.Add(). As the old reference is now removed we never end up replacing an identical uuid. And if we replace a uuid that's already there (from a child part) then this is an error.
* | | | Improve the explanative text of migration failuresJustin Clark-Casey (justincc)2010-09-181-3/+3
| |/ / |/| | | | | | | | When running for the first time, people see migration failures because of sql statements that are trying to move data from old tables (e.g. users). The amended text attempts to calm their nerves.
* | | Clarify help text for use of file paths with console command "create region".Marck2010-09-181-1/+1
| | |
* | | REST Console delivers responses with content type text/xml instead of ↵Marck2010-09-181-2/+2
| | | | | | | | | | | | | | | | | | text/plain. Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload.
* | | Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurlimanJustin Clark-Casey (justincc)2010-09-181-2/+3
| | | | | | | | | | | | Though this is actually thread-safe on .net 4.0 and mono today, the .net sdk states that Dictionary instance members are not guaranteed thread-safe
* | | Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatarsJustin Clark-Casey (justincc)2010-09-181-3/+1
| | | | | | | | | | | | This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
* | | Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to ↵Justin Clark-Casey (justincc)2010-09-181-0/+0
| | | | | | | | | | | | | | | | | | OpenSim/Framework/Tests/PrimeNumberHelperTests.cs I'm assuming the lowercase tests was a mistake. Please revert if it actually wasn't
* | | For all Flotasm group module XMLRPC calls, correct parameter ↵Justin Clark-Casey (justincc)2010-09-171-9/+2
| | | | | | | | | | | | | | | | | | requestingAgentID to RequestingAgentID This was stopping the get group member roles call from working, and may have affected other things
* | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-09-173-81/+24
|\ \ \ | | |/ | |/|
| * | Add LandServices to make landmarks work right in gridsMelanie2010-09-172-0/+2
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-177-37/+355
| |\ \
| * | | Applying the llParseString2List() patch from #5036 that Melanie claims was ↵John Hurliman2010-09-171-81/+22
| | |/ | |/| | | | | | | already applied
* | | * Fixed and re-enabled CacheTestsTeravus Ovares (Dan Olivares)2010-09-173-15/+166
| |/ |/| | | | | | | * Added MundaneFrameworkTests.cs for the really mundane tests like testing properties,constructors, etc in OpenSim.Framework. * Fixed LeftAxis and UpAxis unpacking from OSD to AgentPosition (copy and paste error caught while writing mundane test) (Good thing nobody uses the camera frustum from remote regions yet)
* | * Add a few more tests to help our meager code coverage %.Teravus Ovares (Dan Olivares)2010-09-172-0/+242
| | | | | | | | | | | | * Tests Animation Constructors * Tests Animation OSD Packing/Unpacking * Tests the PrimeNumberHelper class which is used in the cache.
* | Send kill packets for avatars, tooMelanie2010-09-171-0/+4
| |
* | 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
* | 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
| |
| * 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.
* | 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
* Remove long unused Region/Framework/ThreadTrackerJustin Clark-Casey (justincc)2010-09-141-46/+0
| | | | All methods had already been deleted, only GetThreads() was left
* 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
|