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
Justin Clark-Casey (justincc)
c85f9d681a
On "show part" command, show link number.
...
This replaces the Parts count which was rather pointless for a prim (it was either 1 if a child or the number of parts if the root).
This information is still avaliable on the "show object" command.
2012-04-18 00:39:39 +01:00
Justin Clark-Casey (justincc)
b430c0162c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-18 00:00:09 +01:00
Justin Clark-Casey (justincc)
859646ef5c
minor: Add some method doc. Add warnings since calling SOG link/delink methods directly rather than through Scene may allow race conditions.
2012-04-17 23:54:51 +01:00
Mic Bowman
84891930aa
clean up some more logging spam in the jsonstore modules
2012-04-17 14:23:43 -07:00
Mic Bowman
4db518b9a3
Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.
...
Cut down on the logging spam.
2012-04-17 14:15:17 -07:00
Mic Bowman
2d45ba47ac
add configuration for jsonstore module, disabled by default
2012-04-17 13:55:00 -07:00
Mic Bowman
5ff2bda587
This commit adds a new optional region module, JsonStore, that provides structured
...
storage (dictionaries and arrays of string values) for scripts and region modules.
In addition, there are operations on the storage that enable "real" distributed
computation between scripts through operations similar to those of a tuple space.
Scripts can share task queues, implement shared locks or semaphores, etc.
The structured store is limited to the current region and is not currently
persisted. However, script operations are defined to initialize a store from a notecard
and to serialize the store to a notecard.
Documentation will be posted to the opensim wiki soon.
2012-04-17 13:45:27 -07:00
Mic Bowman
4bb72c9ffe
make the namespace for the ScriptModuleComms consistent with its file system location
2012-04-17 13:45:03 -07:00
Justin Clark-Casey (justincc)
cca6b6bd0d
Add TestGetChildPartPositionAfterObjectRotation()
2012-04-17 02:14:10 +01:00
Justin Clark-Casey (justincc)
2f2181683c
Add test TestGetChildPartPosition()
2012-04-17 01:51:13 +01:00
Justin Clark-Casey (justincc)
7e1ab216e3
Move some public methods on WebStatsModule to private to reduce some static analysis complexity.
...
There's no obvious reason for these methods to be public.
2012-04-17 01:33:55 +01:00
Justin Clark-Casey (justincc)
24a0cc5261
refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.
...
This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities.
As per opensim-dev mailing list.
2012-04-17 01:25:41 +01:00
Talun
5655239f44
Null reference in llGetObjectMass on a seated avatar.
2012-04-17 00:56:46 +01:00
Justin Clark-Casey (justincc)
e6ec83125b
Use INSERT OR REPLACE INTO sql in WebStatsModule for session update rather than separate insert and update statements
2012-04-17 00:46:43 +01:00
Justin Clark-Casey (justincc)
572440cd23
correct bug where f_invalid was being inserted on a webstats update for an existing session rather than d_world_kb
2012-04-17 00:33:23 +01:00
Justin Clark-Casey (justincc)
1bb3873338
Simplify WebStatsModule by removing the uncompleted migrations section.
...
Use "create table if not exists" instead.
Client stats data is transitory data that it is not worth migrating.
2012-04-17 00:19:36 +01:00
Justin Clark-Casey (justincc)
f213f55586
Fix bug in WebStatsModule where an exception would always be output on update if the user teleported to another region on that simulator.
...
This was because update was looking for an existing stats record unique in session id, agent id and region id.
But if the user teleports to another region then region id changes.
WebStatsModule promptly doesn't find the existing record and tries to insert a new one, but only session id is the primary key and that's still the same, which makes things go bang.
This makes the update search only on the unique session id.
This is only an issue with simulators that have multiple regions where the webstats module is enabled.
2012-04-17 00:02:58 +01:00
Justin Clark-Casey (justincc)
2c74e1bba8
Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition()
2012-04-14 01:57:09 +01:00
Justin Clark-Casey (justincc)
da342d0b21
minor: make test names consistent
2012-04-14 01:53:40 +01:00
Justin Clark-Casey (justincc)
f61b234252
refactor: move common init code into SetUp() in SceneObjectSpatialTests
2012-04-14 01:52:16 +01:00
BlueWall
0f96b9f41b
Merge branch 'integration' of /home/opensim/var/repo/opensim
2012-04-13 20:48:50 -04:00
Justin Clark-Casey (justincc)
317aebcce6
refactor: put SOG position test in a separate TestSceneObjectGroupPosition()
2012-04-14 01:47:56 +01:00