aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-2314-124/+473
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Mantis 5977 Corrections to llRegionSayToTalun2012-04-236-58/+120
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * 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.
* | Merge branch 'master' into careminsterMelanie2012-04-226-248/+352
|\ \ | |/
| * 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.
| * | Add TestSetPhysics() to SOP status testsJustin Clark-Casey (justincc)2012-04-213-4/+27
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-200-0/+0
|\ \ \ | | |/ | |/|
| * | 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
* | Merge branch 'master' into careminsterMelanie2012-04-201-12/+10
|\ \ | |/
| * 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
* | Merge branch 'master' into careminsterMelanie2012-04-205-53/+106
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
| * 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 ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-209-221/+170
|\ \ | | | | | | | | | careminster
| * | changed - VolumeDetect and phantom setting interaction. Script VD(true) ↵UbitUmarov2012-04-192-13/+40
| | | | | | | | | | | | forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics.
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-04-196-4/+28
| |\ \
| | * | Allow setting a specific target velocity on TeleportWithMomentumMelanie2012-04-181-1/+11
| | | |
| | * | Allow scripts in attachments owned by the NPC to control the NPCMelanie2012-04-181-1/+7
| | | |
| | * | Prevent objects rezzed in sim from being seen as attachments and becoming ↵Melanie2012-04-172-0/+8
| | | | | | | | | | | | | | | | uneditable or crashers. (Foxtail of death)
| * | | ubitODE still retouching character pidUbitUmarov2012-04-181-2/+2
| | | |
| * | | ubitODE - retouch character PIDsUbitUmarov2012-04-181-4/+4
| | | |
| * | | ubitODE: prims - update managed dinamic parameters from unmanaged at ODE ↵UbitUmarov2012-04-171-78/+46
| | | | | | | | | | | | | | | | rate and not heartbeat.
| * | | ubitODE: - character managed ode was only getting position etc from ↵UbitUmarov2012-04-172-119/+48
| | | | | | | | | | | | | | | | unmanaged at heartbeat rate like core ode. Now do it at ODE rate in move(..). UpdatePositionAndVelocity() called once per heartbeat is now empty.
| * | | ubitODE: - made avatar/ground collision pid servo a bit softer since seems a ↵UbitUmarov2012-04-172-6/+7
| | | | | | | | | | | | | | | | bit unstable with small avas in AVI even if fine on my testsite - Removed reading of PID parameters from config files since that only serves to mess things up and adds more unknowns
* | | | Fx up estate settingsMelanie2012-04-182-97/+97
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-04-182-4/+8
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | | 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' into careminsterMelanie2012-04-189-2/+1534
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-186-1/+1475
| |\ \ \
| | * | | 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.
| | * | | add configuration for jsonstore module, disabled by defaultMic Bowman2012-04-171-0/+6
| | | | |
| | * | | 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.
generated by cgit v1.1 at 2024-12-22 12:36:05 +0000