Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2010-02-04 | 10 | -378/+1194 |
|\ | |||||
| * | Revert "change position of OnAttach event firing so that this also happens ↵ | Melanie | 2010-02-04 | 2 | -17/+15 |
| | | | | | | | | | | | | | | | | when a user teleports into a region" The behavior introduced here is not compatible with SL This reverts commit b6bee4999c9d238a052022f105069ea4eb85f8f4. | ||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-02-03 | 3 | -6/+3 |
| | | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -3/+3 |
| |\ | |||||
| * | | minor: remove one mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -3/+1 |
| | | | |||||
| * | | minor: remove one mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -10/+8 |
| | | | |||||
| * | | minor: add a smidgen of EventManager doc | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -6/+6 |
| | | | |||||
| * | | minor: remove one mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -1/+1 |
| | | | |||||
| * | | For each delegate added to events in the EventManager, catch and log but do ↵ | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -314/+1128 |
| | | | | | | | | | | | | | | | | | | not propogate any exceptions that come back This stops exceptions thrown by modules from disrupting the kernel and still allows other delegates to be executed normally | ||||
| * | | add an IsRoot property to sop | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -1/+24 |
| | | | |||||
| * | | minor: comment out a log line in ScenePresence | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -2/+1 |
| | | | |||||
| * | | minor: remove a couple of mono warnings | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -4/+1 |
| | | | |||||
| * | | change position of OnAttach event firing so that this also happens when a ↵ | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -15/+17 |
| | | | | | | | | | | | | user teleports into a region | ||||
| * | | refactor: move world comm message queueing into its own method | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -23/+13 |
| | | | |||||
* | | | Line endings cleanup | Melanie | 2010-02-04 | 1 | -36/+36 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2010-02-03 | 4 | -20/+60 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-02-03 | 4 | -17/+57 |
| |\ \ | | |/ | |||||
| | * | minor: copy some method doc from the WorldComm implementation to the interface | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -0/+39 |
| | | | |||||
| | * | minor: add method doc to sop.SetScriptEvents() | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -0/+5 |
| | | | |||||
| | * | minor: add some documentation to EventManager.OnObjectGrab | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -15/+8 |
| | | | |||||
| | * | minor: add reminder to lock SOG.Children before using it directly in order ↵ | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -2/+5 |
| | | | | | | | | | | | | to avoid threading issues | ||||
| * | | allow terrain collision events after regular collision check | radams1 | 2010-02-03 | 1 | -3/+3 |
| |/ | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-02 | 14 | -283/+475 |
|\ \ | |||||
| * | | Revert "improve locking of m_items in SceneObjectPartInventory" | Melanie | 2010-02-02 | 1 | -133/+85 |
| |/ | | | | | | | This reverts commit 968b9e160d70568fbdea5b190d1386e9431316e3. | ||||
| * | minor: rename GetScriptPrimType() to GetPrimType() | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -4/+4 |
| | | |||||
| * | move hollow sphere faces bug back up to LSL_Api.cs | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -37/+52 |
| | | |||||
| * | remove now duplicated shape code from LSL_Api.cs | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -194/+49 |
| | | |||||
| * | Copy prim face color setting code from LSL_Api down into SOP so that non-LSL ↵ | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -1/+192 |
| | | | | | | | | callers can use it | ||||
| * | Actually make EventManager.OnAttach() fire when an object is attached. ↵ | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -2/+6 |
| | | | | | | | | Previously, only detach was firing! | ||||
| * | Don't try to start attachment scripts or send updates if the attachment ↵ | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -27/+64 |
| | | | | | | | | itself has been unsuccessful | ||||
| * | apply http://opensimulator.org/mantis/view.php?id=4486 | Justin Clark-Casey (justincc) | 2010-01-30 | 1 | -1/+1 |
| | | | | | | | | | | fix compilation of mrm scripts using microthreaded parmeter Thanks ziah | ||||
| * | Apply http://opensimulator.org/mantis/view.php?id=4504 | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -1/+3 |
| | | | | | | | | | | Stop the REST console crashing when entering return on an empty line Thanks BlueWall | ||||
| * | Apply http://opensimulator.org/mantis/view.php?id=3334 | Justin Clark-Casey (justincc) | 2010-01-29 | 4 | -1/+58 |
| | | | | | | | | | | | | Send continuous touch() events if the left mouse button is held down while moving over an object This conforms with Linden Lab practice Thanks Revolution | ||||
| * | Apply http://opensimulator.org/mantis/view.php?id=4548 | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -1/+1 |
| | | | | | | | | | | Fix command params check on fcache expire <datetime> Thanks coyled | ||||
| * | use common sop2 setup for TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -16/+12 |
| | | |||||
| * | make TestSaveOarV0_2() use a common part2 construction | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -18/+14 |
| | | |||||
| * | use common part1 createio nin TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -16/+5 |
| | | |||||
| * | minor: swap which part uses the automatically set up scene in TestMergeOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -25/+13 |
| | | |||||
| * | use common part1 creation in ArchiverTests.TestLoadOarV0_2() | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -30/+28 |
| | | |||||
| * | refactor out scene object 1 creation n ArchiverTetss | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -44/+22 |
| | | |||||
| * | factor out scene setup in ArchiverTests | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -40/+53 |
| | | |||||
| * | improve locking of m_items in SceneObjectPartInventory | Justin Clark-Casey (justincc) | 2010-01-29 | 1 | -85/+133 |
| | | |||||
| * | Add method to get all items with the same name from a particular prim | Justin Clark-Casey (justincc) | 2010-01-29 | 3 | -7/+41 |
| | | | | | | | | Extend load oar test to check loading of a sound item | ||||
| * | Resolve one more conflict I overlooked | Melanie | 2010-01-29 | 1 | -14/+0 |
| | | |||||
| * | Revert "Updates all IRegionModules to the new style region modules." | Melanie | 2010-01-29 | 76 | -1811/+879 |
| | | | | | | | | This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf. | ||||
* | | Small fix for a spurious exception | Melanie | 2010-01-29 | 1 | -1/+1 |
| | | |||||
* | | Prevent empty ObjectProperties packets being sent | Melanie | 2010-01-29 | 1 | -0/+3 |
| | | |||||
* | | Resolve one more conflict I overlooked | Melanie | 2010-01-29 | 1 | -14/+0 |
| | | |||||
* | | Revert "Updates all IRegionModules to the new style region modules." | Melanie | 2010-01-29 | 76 | -1811/+879 |
| | | | | | | | | This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-28 | 2 | -4/+8 |
|\ \ | |/ |