aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-2117-150/+865
| | | |\
| | | | * * Tweaked the LocationTests for maximum coverage.Teravus Ovares (Dan Olivares)2010-09-182-1/+60
| | | | * * Covered the type converters in SLUtil with unit tests.Teravus Ovares (Dan Olivares)2010-09-181-1/+57
| | | | * * More Mundane TestsTeravus Ovares (Dan Olivares)2010-09-172-0/+198
| | | * | If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ...Justin Clark-Casey (justincc)2010-09-212-2/+41
| | * | | Improve the explanative text of migration failuresJustin Clark-Casey (justincc)2010-09-181-3/+3
| | | |/ | | |/|
| | * | 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 text/pl...Marck2010-09-181-2/+2
| | * | Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurlimanJustin Clark-Casey (justincc)2010-09-181-2/+3
| | * | Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatarsJustin Clark-Casey (justincc)2010-09-181-3/+1
| | * | Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to OpenSim/Framework/T...Justin Clark-Casey (justincc)2010-09-181-0/+0
| | * | For all Flotasm group module XMLRPC calls, correct parameter requestingAgentI...Justin Clark-Casey (justincc)2010-09-171-9/+2
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-09-171-81/+22
| | |\ \
| | * | | * Fixed and re-enabled CacheTestsTeravus Ovares (Dan Olivares)2010-09-173-15/+166
| * | | | 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
|\ \ \ \ | |/ / /
| * | | 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
| * | | Applying the llParseString2List() patch from #5036 that Melanie claims was al...John Hurliman2010-09-171-81/+22
| | |/ | |/|
* | | Remove the now unused partslockroot2010-09-171-1/+0
* | | 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
|\ \ \ | |/ /
| * | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-174-37/+109
| |/
| * 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
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-173-1/+39
| | |\
| | | * 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 MapAndA...John Hurliman2010-09-1632-1204/+1057
| |/
* | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-174-37/+109
* | 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
* | Some small bug fixesroot2010-09-162-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-165-63/+60
|\ \ | |/
| * extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() t...Justin Clark-Casey (justincc)2010-09-151-49/+49
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-152-3/+18
| |\
| | * Fix the aboveMelanie2010-09-141-4/+3
| * | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co...Justin Clark-Casey (justincc)2010-09-154-4/+4
| * | Instead of locking SOG.Children when a group is being removed from the scene,...Justin Clark-Casey (justincc)2010-09-151-15/+17