aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2010-02-0214-283/+475
|\
| * Revert "improve locking of m_items in SceneObjectPartInventory"Melanie2010-02-021-133/+85
| * minor: rename GetScriptPrimType() to GetPrimType()Justin Clark-Casey (justincc)2010-02-012-4/+4
| * move hollow sphere faces bug back up to LSL_Api.csJustin Clark-Casey (justincc)2010-02-012-37/+52
| * remove now duplicated shape code from LSL_Api.csJustin Clark-Casey (justincc)2010-02-012-194/+49
| * Copy prim face color setting code from LSL_Api down into SOP so that non-LSL ...Justin Clark-Casey (justincc)2010-02-012-1/+192
| * Actually make EventManager.OnAttach() fire when an object is attached. Previ...Justin Clark-Casey (justincc)2010-02-012-2/+6
| * Don't try to start attachment scripts or send updates if the attachment itsel...Justin Clark-Casey (justincc)2010-02-012-27/+64
| * apply http://opensimulator.org/mantis/view.php?id=4486Justin Clark-Casey (justincc)2010-01-301-1/+1
| * Apply http://opensimulator.org/mantis/view.php?id=4504Justin Clark-Casey (justincc)2010-01-291-1/+3
| * Apply http://opensimulator.org/mantis/view.php?id=3334Justin Clark-Casey (justincc)2010-01-294-1/+58
| * Apply http://opensimulator.org/mantis/view.php?id=4548Justin Clark-Casey (justincc)2010-01-291-1/+1
| * use common sop2 setup for TestMergeOarV0_2()Justin Clark-Casey (justincc)2010-01-291-16/+12
| * make TestSaveOarV0_2() use a common part2 constructionJustin Clark-Casey (justincc)2010-01-291-18/+14
| * use common part1 createio nin TestMergeOarV0_2()Justin Clark-Casey (justincc)2010-01-291-16/+5
| * minor: swap which part uses the automatically set up scene in TestMergeOarV0_2()Justin Clark-Casey (justincc)2010-01-291-25/+13
| * use common part1 creation in ArchiverTests.TestLoadOarV0_2()Justin Clark-Casey (justincc)2010-01-291-30/+28
| * refactor out scene object 1 creation n ArchiverTetssJustin Clark-Casey (justincc)2010-01-291-44/+22
| * factor out scene setup in ArchiverTestsJustin Clark-Casey (justincc)2010-01-291-40/+53
| * improve locking of m_items in SceneObjectPartInventoryJustin Clark-Casey (justincc)2010-01-291-85/+133
| * Add method to get all items with the same name from a particular primJustin Clark-Casey (justincc)2010-01-293-7/+41
| * Resolve one more conflict I overlookedMelanie2010-01-291-14/+0
| * Revert "Updates all IRegionModules to the new style region modules."Melanie2010-01-2976-1811/+879
* | Small fix for a spurious exceptionMelanie2010-01-291-1/+1
* | Prevent empty ObjectProperties packets being sentMelanie2010-01-291-0/+3
* | Resolve one more conflict I overlookedMelanie2010-01-291-14/+0
* | Revert "Updates all IRegionModules to the new style region modules."Melanie2010-01-2976-1811/+879
* | Merge branch 'master' into careminsterMelanie2010-01-281-4/+7
|\ \ | |/
| * Fixes inconsistencies in the permissions module. Adds a region_manager_is_godMelanie2010-01-281-4/+7
* | Fixes terrain editing. Changes ThrottleOutPacketType to task instead of land.Revolution2010-01-281-1/+1
* | Merge branch 'master' into careminsterMelanie2010-01-2810-68/+72
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-01-289-67/+67
| |\
| | * * .. More Endlines...Teravus Ovares (Dan Olivares)2010-01-261-1/+1
| | * more endlines..Teravus Ovares (Dan Olivares)2010-01-261-9/+9
| | * * a few more endlines..Teravus Ovares (Dan Olivares)2010-01-261-4/+4
| | * * A few other endlines...Teravus Ovares (Dan Olivares)2010-01-261-9/+9
| | * * Fix Endlines in Mock/TestClient.csTeravus Ovares (Dan Olivares)2010-01-261-8/+8
| | * * Fix Endlines in SirikataClientView.csTeravus Ovares (Dan Olivares)2010-01-261-9/+9
| | * * Fix Endlines in IRCClientView.csTeravus Ovares (Dan Olivares)2010-01-261-9/+9
| | * * Fix Endlines in VWHClientView.csTeravus Ovares (Dan Olivares)2010-01-261-9/+9
| | * * Fix Endlines in MyNpcCharacter.csTeravus Ovares (Dan Olivares)2010-01-261-9/+9
| * | Changes WorldCommModule to ISharedRegionModule.Revolution2010-01-281-1/+5
| |/
* | Some merge fixupsMelanie2010-01-264-22/+11
* | Merge branch 'master' into careminsterMelanie2010-01-2689-900/+2074
|\ \ | |/
| * Replace dome tabs with spacesMelanie2010-01-261-3/+3
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-01-269-19/+79
| |\
| | * Fix a problem where llDie() calls were sometimes leaving dead objects behind.Justin Clark-Casey (justincc)2010-01-258-19/+73
| | * * Quick fix to Remote Console session ID handling.Adam Frisby2010-01-261-0/+6
| * | Fixes Region Crossings on a prim.Revolution2010-01-241-1/+9
| |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-01-234-5/+153
| |\
generated by cgit v1.1 at 2024-11-05 21:29:34 +0000