Kitto Flora
fc1ac25935
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-03 14:32:29 -05:00
Melanie
0f1a3f8ed2
Merge branch 'master' into careminster
2010-02-03 00:16:02 +00:00
Melanie
fa121951d2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-03 00:15:14 +00:00
radams1
88d0fc3b09
allow terrain collision events after regular collision check
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-03 00:15:04 +00:00
Justin Clark-Casey (justincc)
0faeaf98a6
minor: copy some method doc from the WorldComm implementation to the interface
2010-02-02 19:42:45 +00:00
Justin Clark-Casey (justincc)
dc82409106
minor: add method doc to sop.SetScriptEvents()
2010-02-02 19:04:06 +00:00
Kitto Flora
8c20610293
AngMotor update 1
2010-02-02 13:28:42 -05:00
Justin Clark-Casey (justincc)
0e23c5fffb
minor: add some documentation to EventManager.OnObjectGrab
2010-02-02 18:19:15 +00:00
Justin Clark-Casey (justincc)
96d5c8196a
minor: add reminder to lock SOG.Children before using it directly in order to avoid threading issues
2010-02-02 15:45:41 +00:00
Melanie
d5ed92cf38
Merge branch 'master' into careminster
2010-02-02 03:56:29 +00:00
Melanie
6478617c93
Revert "improve locking of m_items in SceneObjectPartInventory"
...
This reverts commit 968b9e160d
.
2010-02-02 03:49:00 +00:00
Justin Clark-Casey (justincc)
08721be374
minor: rename GetScriptPrimType() to GetPrimType()
2010-02-01 22:33:15 +00:00
Justin Clark-Casey (justincc)
5432925a3b
move hollow sphere faces bug back up to LSL_Api.cs
2010-02-01 22:29:21 +00:00
Justin Clark-Casey (justincc)
ecc068fbe0
remove now duplicated shape code from LSL_Api.cs
2010-02-01 22:08:00 +00:00
Justin Clark-Casey (justincc)
3863cd1d23
Copy prim face color setting code from LSL_Api down into SOP so that non-LSL callers can use it
2010-02-01 21:35:05 +00:00
Justin Clark-Casey (justincc)
4c1740f7d8
Actually make EventManager.OnAttach() fire when an object is attached. Previously, only detach was firing!
2010-02-01 20:15:36 +00:00
Justin Clark-Casey (justincc)
53a01dc422
Don't try to start attachment scripts or send updates if the attachment itself has been unsuccessful
2010-02-01 20:06:43 +00:00
Justin Clark-Casey (justincc)
4c1365f149
apply http://opensimulator.org/mantis/view.php?id=4486
...
fix compilation of mrm scripts using microthreaded parmeter
Thanks ziah
2010-01-30 00:15:37 +00:00
Justin Clark-Casey (justincc)
627df50646
Apply http://opensimulator.org/mantis/view.php?id=4504
...
Stop the REST console crashing when entering return on an empty line
Thanks BlueWall
2010-01-29 23:38:44 +00:00
Justin Clark-Casey (justincc)
05a3e37b85
Apply http://opensimulator.org/mantis/view.php?id=3334
...
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
2010-01-29 23:12:08 +00:00
Justin Clark-Casey (justincc)
7b53067d6d
Apply http://opensimulator.org/mantis/view.php?id=4548
...
Fix command params check on fcache expire <datetime>
Thanks coyled
2010-01-29 21:52:13 +00:00
Justin Clark-Casey (justincc)
0cf88b34c9
use common sop2 setup for TestMergeOarV0_2()
2010-01-29 21:45:07 +00:00
Justin Clark-Casey (justincc)
68c7218fa1
make TestSaveOarV0_2() use a common part2 construction
2010-01-29 21:42:27 +00:00
Justin Clark-Casey (justincc)
0c3043a298
use common part1 createio nin TestMergeOarV0_2()
2010-01-29 21:37:25 +00:00
Justin Clark-Casey (justincc)
055d991cc1
minor: swap which part uses the automatically set up scene in TestMergeOarV0_2()
2010-01-29 21:33:11 +00:00
Justin Clark-Casey (justincc)
75dcd721de
use common part1 creation in ArchiverTests.TestLoadOarV0_2()
2010-01-29 21:27:14 +00:00
Justin Clark-Casey (justincc)
115e66218e
refactor out scene object 1 creation n ArchiverTetss
2010-01-29 21:10:14 +00:00
Justin Clark-Casey (justincc)
c1da07e4eb
factor out scene setup in ArchiverTests
2010-01-29 20:59:56 +00:00
Justin Clark-Casey (justincc)
968b9e160d
improve locking of m_items in SceneObjectPartInventory
2010-01-29 20:36:13 +00:00
Justin Clark-Casey (justincc)
ae2174d8f5
Add method to get all items with the same name from a particular prim
...
Extend load oar test to check loading of a sound item
2010-01-29 18:11:53 +00:00
Melanie
0c5850237e
Small fix for a spurious exception
2010-01-29 16:50:00 +00:00
Melanie
9e37d24624
Prevent empty ObjectProperties packets being sent
2010-01-29 11:47:45 +00:00
Melanie
44c86cedcf
Resolve one more conflict I overlooked
2010-01-29 07:47:50 +00:00
Melanie
536a6bac72
Resolve one more conflict I overlooked
2010-01-29 07:42:45 +00:00
Melanie
a87a247f05
Revert "Updates all IRegionModules to the new style region modules."
...
This reverts commit ec3c31e61e
.
2010-01-29 07:21:06 +00:00
Melanie
cfca9e1e81
Revert "Updates all IRegionModules to the new style region modules."
...
This reverts commit ec3c31e61e
.
2010-01-29 07:20:13 +00:00
Melanie
5b9ca6e35f
Merge branch 'master' into careminster
2010-01-28 14:38:46 +00:00
Melanie
ad75a53d60
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-28 14:36:07 +00:00
Melanie
ee12b00cfa
Fixes inconsistencies in the permissions module. Adds a region_manager_is_god
...
configurable. Previously, estate managers could enter god mode, but would
not have any powers. Now estate managers can enter god mode only if this
option is true, and then will have real god powers.
2010-01-28 14:34:31 +00:00
Teravus Ovares (Dan Olivares)
ceb5ccc6fe
* one more test of mantisbot
2010-01-28 01:53:02 -05:00
Teravus Ovares (Dan Olivares)
ddf6226502
Test osmantis (quiet)
2010-01-28 00:54:28 -05:00
Revolution
862caa72a8
Fixes terrain editing. Changes ThrottleOutPacketType to task instead of land.
2010-01-28 03:04:38 +00:00
Melanie
2d9b69c186
Merge branch 'master' into careminster
2010-01-28 02:07:18 +00:00
Melanie
6478bc9fb0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-28 02:05:32 +00:00
Revolution
c26f1d1bfa
Changes WorldCommModule to ISharedRegionModule.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-28 02:05:05 +00:00
Teravus Ovares (Dan Olivares)
910d2177ad
* .. More Endlines...
2010-01-26 12:49:53 -05:00
Teravus Ovares (Dan Olivares)
d28542e4d4
more endlines..
2010-01-26 12:47:27 -05:00
Teravus Ovares (Dan Olivares)
ccf7bfe09b
* a few more endlines..
2010-01-26 12:44:42 -05:00
Teravus Ovares (Dan Olivares)
bc68f77396
* A few other endlines...
2010-01-26 12:41:37 -05:00
Teravus Ovares (Dan Olivares)
027ad49567
* Fix Endlines in Mock/TestClient.cs
2010-01-26 12:23:06 -05:00