aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie2010-09-212-6/+4
|\ | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Fix a typoMelanie2010-09-211-3/+3
| |
| * Refactor script create permission into the perms moduleMelanie2010-09-212-15/+23
| |
| * Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-192-6/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-2116-53/+556
|\ \ | |/ |/|
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-2114-37/+532
| |\
| | * 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
| | |\ \
| | * | | * 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)
| * | | | Fix a typoMelanie2010-09-211-3/+3
| | | | |
| * | | | Refactor script create permission into the perms moduleMelanie2010-09-212-15/+23
| | |/ / | |/| |
* | | | Overwrite the core version of the string parsing method with oursMelanie2010-09-171-60/+37
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-173-37/+302
|\ \ \ \ | |/ / /
| * | | 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
| |\ \ \ | | |/ /
| | * | * 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.
| * | | Applying the llParseString2List() patch from #5036 that Melanie claims was ↵John Hurliman2010-09-171-81/+22
| | |/ | |/| | | | | | | already applied
* | | 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.