aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add osForceAttachToAvatar() and osForceDetachFromAvatar()Justin Clark-Casey (justincc)2012-04-246-49/+127
| | | | | | 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.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-236-58/+120
|\
| * Mantis 5977 Corrections to llRegionSayToTalun2012-04-236-58/+120
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Replace common code to fetch self inventory item (as opposed to uuid) with ↵Justin Clark-Casey (justincc)2012-04-231-155/+76
| | | | | | | | | | | | 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.
* | refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_ApiJustin Clark-Casey (justincc)2012-04-231-94/+42
|/ | | | There's no point look up an item ID that we already have.
* refactor: simply some properties code in BasicPhysicsPluginJustin Clark-Casey (justincc)2012-04-222-72/+12
|
* Make TestSetPhysicsSinglePrim() actually add the object to the scene in ↵Justin Clark-Casey (justincc)2012-04-221-0/+2
| | | | order to test more code paths.
* Fix bug where setting phantom on a prim would result in a server log message ↵Justin Clark-Casey (justincc)2012-04-226-32/+382
| | | | | | | | 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.
* Comment out spurious Body != IntPtr.Zero code after disableBody(), since ↵Justin Clark-Casey (justincc)2012-04-212-10/+20
| | | | disableBody() sets Body == IntPtr.Zero on all code paths.
* refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.Justin Clark-Casey (justincc)2012-04-211-115/+117
|
* Add test for setting physics in a linksetJustin Clark-Casey (justincc)2012-04-211-2/+28
|
* Add regression test for prim status when root prim in a new linkset is ↵Justin Clark-Casey (justincc)2012-04-212-1/+20
| | | | non-physical
* Fix a bug where linking a non-physical prim with a physical prim as root ↵Justin Clark-Casey (justincc)2012-04-212-0/+22
| | | | | | | | 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.
* Add test for correct physics status on linking two physics objectsJustin Clark-Casey (justincc)2012-04-211-2/+26
| | | | Also fixes last build break.
* refactor: extract common setup code in SceneObjectStatusTestsJustin Clark-Casey (justincc)2012-04-211-10/+16
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-212-120/+95
|\
| * Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.Justin Clark-Casey (justincc)2012-04-211-116/+88
| | | | | | | | | | | | 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.
| * Improve bitmap disposal to do null checks and not to potentially try ↵Justin Clark-Casey (justincc)2012-04-201-4/+7
| | | | | | | | | | | | | | 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
* | Add TestSetPhysics() to SOP status testsJustin Clark-Casey (justincc)2012-04-213-4/+27
|/
* If a physical prim is manually moved (e.g. by a user) then set the geometry ↵Justin Clark-Casey (justincc)2012-04-201-12/+10
| | | | | | | 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
* Always dispose of existing opened bitmap from file in SaveFile(), instead of ↵Justin Clark-Casey (justincc)2012-04-201-22/+37
| | | | simply dropping the reference if the existing file didn't contain a bitmap of the same size.
* Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and ↵Justin Clark-Casey (justincc)2012-04-202-18/+31
| | | | JPEG.cs
* Remember to dispose of the bitmap opened from a file in ↵Justin Clark-Casey (justincc)2012-04-201-4/+11
| | | | GatekeeperServiceConnector.GetMapImage()
* concerns GenericSystemDrawing.csGarmin Kawaguichi2012-04-201-8/+9
| | | | | | | | in OpenSim\Region\CoreModules\World\Terrain\FileLoaders\GenericSystemDrawing.cs Ln 67 Apply Justin's solution Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
* Add more exception detail to Exception and IOException throws in ↵Justin Clark-Casey (justincc)2012-04-201-2/+2
| | | | BaseHttpServer.HandleRequest()
* Stop teleports from dropping tall avatars through or embedding them in the ↵Justin Clark-Casey (justincc)2012-04-201-1/+7
| | | | | | | 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
* Fix a logic error in app domain creationMelanie2012-04-181-1/+1
|
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-04-181-1/+1
|\
| * On "show part" command, show link number.Justin Clark-Casey (justincc)2012-04-181-1/+1
| | | | | | | | | | 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.
* | Don't re-add the assembly resolver for each script if not creating the appdomainMelanie2012-04-181-4/+8
|/
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-185-1/+1469
|\
| * clean up some more logging spam in the jsonstore modulesMic Bowman2012-04-172-2/+4
| |
| * Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.Mic Bowman2012-04-173-5/+7
| | | | | | | | Cut down on the logging spam.
| * This commit adds a new optional region module, JsonStore, that provides ↵Mic Bowman2012-04-174-0/+1464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * make the namespace for the ScriptModuleComms consistent with its file system ↵Mic Bowman2012-04-171-1/+1
| | | | | | | | location
* | minor: Add some method doc. Add warnings since calling SOG link/delink ↵Justin Clark-Casey (justincc)2012-04-172-0/+22
|/ | | | methods directly rather than through Scene may allow race conditions.
* Add TestGetChildPartPositionAfterObjectRotation()Justin Clark-Casey (justincc)2012-04-171-1/+37
|
* Add test TestGetChildPartPosition()Justin Clark-Casey (justincc)2012-04-171-0/+28
|
* Move some public methods on WebStatsModule to private to reduce some static ↵Justin Clark-Casey (justincc)2012-04-171-14/+14
| | | | | | analysis complexity. There's no obvious reason for these methods to be public.
* refactor: Rename EstateSettings.IsEstateManager() to ↵Justin Clark-Casey (justincc)2012-04-179-16/+16
| | | | | | | 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.
* Null reference in llGetObjectMass on a seated avatar.Talun2012-04-171-1/+1
|
* Use INSERT OR REPLACE INTO sql in WebStatsModule for session update rather ↵Justin Clark-Casey (justincc)2012-04-171-77/+7
| | | | than separate insert and update statements
* correct bug where f_invalid was being inserted on a webstats update for an ↵Justin Clark-Casey (justincc)2012-04-171-2/+2
| | | | existing session rather than d_world_kb
* Simplify WebStatsModule by removing the uncompleted migrations section.Justin Clark-Casey (justincc)2012-04-171-29/+3
| | | | | Use "create table if not exists" instead. Client stats data is transitory data that it is not worth migrating.
* Fix bug in WebStatsModule where an exception would always be output on ↵Justin Clark-Casey (justincc)2012-04-171-5/+10
| | | | | | | | | | 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.
* Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition()Justin Clark-Casey (justincc)2012-04-141-1/+3
|
* minor: make test names consistentJustin Clark-Casey (justincc)2012-04-141-1/+1
|
* refactor: move common init code into SetUp() in SceneObjectSpatialTestsJustin Clark-Casey (justincc)2012-04-141-8/+13
|
* refactor: put SOG position test in a separate TestSceneObjectGroupPosition()Justin Clark-Casey (justincc)2012-04-141-1/+17
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-144-12/+61
|\