Justin Clark-Casey (justincc)
c6f30e044b
Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed from ODEPrim.SetGeom.
...
This occurred in 7a574be3fd
from Sat 21 Apr 2012.
This should fix collision detection.
Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988
2012-04-24 20:15:10 +01:00
BlueWall
3750f329d1
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-24 02:29:43 -04:00
BlueWall
40828910e7
Plugin manager generic result for use by command line or rest interface
2012-04-24 02:27:23 -04:00
Diva Canto
fd27988978
Changed the Map-related messages from Info to Debug. They're debug messages.
2012-04-23 21:29:18 -07:00
Justin Clark-Casey (justincc)
6c21e15cb9
Add online/offline indicator to "friends show" region console command.
...
Improve output table formatting.
2012-04-24 00:32:01 +01:00
Justin Clark-Casey (justincc)
40e37d8b78
Add osForceAttachToAvatar() and osForceDetachFromAvatar()
...
These behave identically to llAttachToAvatar() and llDetachFromAvatar() except that they do not enforce the PERMISSION_ATTACH check
Intended for use in completely controlled dedicated environments where these checks are more a UI hinderance than a help.
Threat level high.
2012-04-24 00:03:57 +01:00
Justin Clark-Casey (justincc)
b798b32b19
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-23 22:54:11 +01:00
Justin Clark-Casey (justincc)
1f8d1bcdcf
Replace common code to fetch self inventory item (as opposed to uuid) with GetSelfInventoryItem()
...
However, at some point it would be far more convenient to receive the TaskInventoryItem in the constructor rather than just the item UUID, so we don't have to constantly refetch our self item.
2012-04-23 22:52:46 +01:00
Justin Clark-Casey (justincc)
60065f06b3
refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_Api
...
There's no point look up an item ID that we already have.
2012-04-23 22:23:47 +01:00
Talun
3c03418e06
Mantis 5977 Corrections to llRegionSayTo
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-23 07:16:59 -04:00
Talun
679da63da6
Mantis 5977 Corrections to llRegionSayTo
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-23 07:16:33 -04:00
BlueWall
6a69c3ac04
Filling in some more web handlers
2012-04-22 22:47:29 -04:00
BlueWall
e8909703ae
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-22 19:34:52 -04:00
BlueWall
3e546ebbc5
Adding framework to handle web requests for plugin management
2012-04-22 19:31:51 -04:00
Justin Clark-Casey (justincc)
49ed68e98c
refactor: simply some properties code in BasicPhysicsPlugin
2012-04-22 20:28:12 +01:00
Justin Clark-Casey (justincc)
58c890df5d
Make TestSetPhysicsSinglePrim() actually add the object to the scene in order to test more code paths.
2012-04-22 20:03:34 +01:00
Justin Clark-Casey (justincc)
8205fe79ce
Fix bug where setting phantom on a prim would result in a server log message rather than setting phantom.
...
This was an oversight when removing some race conditions from PhysicsActor setting recently.
Regression tests extended to probe this code path.
Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
2012-04-22 19:51:51 +01:00
BlueWall
bd0dfc1d6d
Make sorted lists for selecting plugins for operations
2012-04-21 17:51:44 -04:00
BlueWall
05b369965e
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-20 22:45:56 -04:00
Justin Clark-Casey (justincc)
ae2b8f7007
Comment out spurious Body != IntPtr.Zero code after disableBody(), since disableBody() sets Body == IntPtr.Zero on all code paths.
2012-04-21 03:42:54 +01:00
Justin Clark-Casey (justincc)
f609594595
refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.
2012-04-21 03:23:51 +01:00
BlueWall
e76fa4c5aa
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-20 21:58:37 -04:00
BlueWall
027d313703
Cleanup and formatting
2012-04-20 21:52:02 -04:00
Justin Clark-Casey (justincc)
77a7de87e1
Add test for setting physics in a linkset
2012-04-21 02:45:16 +01:00
BlueWall
9b1741da0d
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-20 21:32:26 -04:00
Justin Clark-Casey (justincc)
d5c724e5b8
Add regression test for prim status when root prim in a new linkset is non-physical
2012-04-21 01:51:57 +01:00
Justin Clark-Casey (justincc)
9ac48b2aff
Fix a bug where linking a non-physical prim with a physical prim as root would make the non-physical prim phantom rather than part of the physics object.
...
On region restart, the whole object would become physical as expected.
Observed behaviour from elsewhere is that all prims in a new linkset should take on the status of the root prim.
Add regression test for this behaviour.
2012-04-21 01:43:09 +01:00
Justin Clark-Casey (justincc)
17bf2a62db
Add test for correct physics status on linking two physics objects
...
Also fixes last build break.
2012-04-21 01:09:42 +01:00
Justin Clark-Casey (justincc)
71900968b2
refactor: extract common setup code in SceneObjectStatusTests
2012-04-21 01:01:24 +01:00
Justin Clark-Casey (justincc)
ae789f6c16
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-21 00:55:27 +01:00
Justin Clark-Casey (justincc)
06552f217e
Add TestSetPhysics() to SOP status tests
2012-04-21 00:54:48 +01:00
BlueWall
2122748af1
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-20 19:21:48 -04:00
Justin Clark-Casey (justincc)
7a574be3fd
Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.
...
prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock.
Therefore, we can remove these checks which were not consistently applied anyway.
If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug.
2012-04-21 00:12:07 +01:00
Justin Clark-Casey (justincc)
c8307cdf1e
Improve bitmap disposal to do null checks and not to potentially try disposal of uninitialized variables.
...
This issue doesn't cause the mono 2.10.5 compiler to fail but appears to cause the windows compiler to fail.
Resolves http://opensimulator.org/mantis/view.php?id=5973
2012-04-20 23:35:11 +01:00
Justin Clark-Casey (justincc)
566327a948
If a physical prim is manually moved (e.g. by a user) then set the geometry position as well as the body position
...
This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once
This resolves http://opensimulator.org/mantis/view.php?id=5966
2012-04-20 23:24:24 +01:00
BlueWall
040412857c
Undo the disposable
2012-04-20 14:13:32 -04:00
BlueWall
70808d6d54
Making plugins disposable
2012-04-20 13:16:44 -04:00
BlueWall
083dd0c17c
A little bit of clean up
2012-04-20 09:58:24 -04:00
BlueWall
b6f6f05e1a
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-20 08:00:44 -04:00
Justin Clark-Casey (justincc)
75f117484b
Always dispose of existing opened bitmap from file in SaveFile(), instead of simply dropping the reference if the existing file didn't contain a bitmap of the same size.
2012-04-20 03:57:22 +01:00
Justin Clark-Casey (justincc)
cba64ebc79
Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and JPEG.cs
2012-04-20 03:46:33 +01:00
Justin Clark-Casey (justincc)
4ac2f839bd
Remember to dispose of the bitmap opened from a file in GatekeeperServiceConnector.GetMapImage()
2012-04-20 03:32:38 +01:00
Garmin Kawaguichi
63cda3a6d0
concerns GenericSystemDrawing.cs
...
in OpenSim\Region\CoreModules\World\Terrain\FileLoaders\GenericSystemDrawing.cs
Ln 67
Apply Justin's solution
Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
2012-04-20 03:26:02 +01:00
Justin Clark-Casey (justincc)
f3dda2d85d
Add more exception detail to Exception and IOException throws in BaseHttpServer.HandleRequest()
2012-04-20 03:12:25 +01:00
Justin Clark-Casey (justincc)
2b98e2f106
Stop teleports from dropping tall avatars through or embedding them in the floor when lured by short avatars.
...
This involves giving the ceiling of the Z-component in a lure rather than the floor.
Ideally we would give the exact float compensating for relative avatar height but it looks like that isn't possible with the parcel id format used in lures
2012-04-20 02:50:36 +01:00
BlueWall
3d6f9f9cec
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-18 20:02:48 -04:00
Melanie
beb7b8d189
Fix a logic error in app domain creation
2012-04-18 23:23:37 +01:00
BlueWall
28f0bf7f08
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-18 15:22:03 -04:00
Melanie
7a255efdb2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-04-18 20:07:32 +01:00
Melanie
ea73a03553
Don't re-add the assembly resolver for each script if not creating the appdomain
2012-04-18 20:01:41 +01:00