aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-02-0316-303/+535
|\
| * Merge branch 'master' into careminsterMelanie2010-02-034-20/+60
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-02-034-17/+57
| | |\
| | | * minor: copy some method doc from the WorldComm implementation to the interfaceJustin Clark-Casey (justincc)2010-02-021-0/+39
| | | * minor: add method doc to sop.SetScriptEvents()Justin Clark-Casey (justincc)2010-02-021-0/+5
| | | * minor: add some documentation to EventManager.OnObjectGrabJustin Clark-Casey (justincc)2010-02-021-15/+8
| | | * minor: add reminder to lock SOG.Children before using it directly in order to...Justin Clark-Casey (justincc)2010-02-021-2/+5
| | * | allow terrain collision events after regular collision checkradams12010-02-031-3/+3
| | |/
| * | 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
* | | AngMotor update 1Kitto Flora2010-02-022-79/+143
|/ /
* | 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-282-4/+8
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-01-280-0/+0
| |\
| | * * one more test of mantisbotTeravus Ovares (Dan Olivares)2010-01-281-1/+1
| | * Test osmantis (quiet)Teravus Ovares (Dan Olivares)2010-01-281-1/+1
| * | Fixes inconsistencies in the permissions module. Adds a region_manager_is_godMelanie2010-01-282-4/+8
| |/
* | 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