aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | TEST more changesUbitUmarov2012-04-271-1/+2
| | |
| * | TEST more options to avnLocalTeleportUbitUmarov2012-04-271-4/+9
| | |
| * | TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool ↵UbitUmarov2012-04-271-0/+22
| | | | | | | | | | | | Stopped) to scenepresence.cs
* | | Merge branch 'master' into careminsterMelanie2012-04-273-20/+49
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * | Fixed: custom walking animations didn't stop when the avatar stopped walking.Oren Hurvitz2012-04-272-20/+32
| | | | | | | | | | | | | | | | | | This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK. This reverts commit feef1dd73243cfdd5322632fb67e64cabc1ad4bc.
| * | If a Grid God teleports then include the Godlike teleport flag. This can ↵Oren Hurvitz2012-04-271-0/+17
| | | | | | | | | | | | affect the starting position in the destination region.
* | | Merge branch 'master' into careminsterMelanie2012-04-2722-210/+164
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-2720-173/+92
| | | | | | | | | | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
| * | Tweak log messages on local region to region teleport path to help with ↵Justin Clark-Casey (justincc)2012-04-261-1/+4
| | | | | | | | | | | | problem resolution.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-261-0/+30
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-04-262-5/+5
| | |\ \
| | * \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-265-12/+89
| | |\ \ \
| | * | | | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-261-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osNpcSay(UUID npc, string message) left untouched New functions:- osNpcSay(UUID npc, int channel, string message) osNpcShout(UUID npc, int channel, string message) osNpcWhisper(UUID npc, int channel, string message) Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | | | Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing ↵Justin Clark-Casey (justincc)2012-04-261-35/+35
| | |_|/ / | |/| | | | | | | | | | | | | analysis complexity
| * | | | minor: Add avatar name to removing agent log messageJustin Clark-Casey (justincc)2012-04-261-2/+2
| | | | |
| * | | | Comment out avatar move to target message for now.Justin Clark-Casey (justincc)2012-04-251-3/+3
| | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-251-2/+40
| |\ \ \
| | * | | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵Melanie2012-04-251-2/+40
| | | | | | | | | | | | | | | | | | | | scripts work. Fixes Mantis #5990
| * | | | Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-252-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folder when deleting objects from a scene. The use of the trash folder causes assets to be created and stored everytime you delete an object from the scene (slows down the delete and adds mostly useless assets to your database). Default is on (use the trash folder) which is the standard behavior.
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-271-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | careminster
| * | | Help big boobies to dance (avatar visualParams). May not persist and need ↵UbitUmarov2012-04-261-1/+1
| | | | | | | | | | | | | | | | more lobe ?
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-254-40/+115
|\ \ \ \ | |/ / / | | | | | | | | careminster
| * | | set PIDHoverTau and not PIDTau since all physics need thatUbitUmarov2012-04-251-5/+7
| | | |
| * | | SOG bug fix in UI object changesUbitUmarov2012-04-241-11/+20
| | | |
| * | | fix animations if sited in ground alsoUbitUmarov2012-04-241-1/+1
| | | |
| * | | "save the catgirls"UbitUmarov2012-04-242-18/+13
| | | |
| * | | display heatbeat sleep time in stats. This may not be good for general use, ↵UbitUmarov2012-04-241-0/+5
| | | | | | | | | | | | | | | | but for testing/debug
| * | | fix Simulation time reportUbitUmarov2012-04-241-0/+7
| | | |
| * | | some reduction on time resolution efects on spare time reportUbitUmarov2012-04-241-4/+8
| | | |
| * | | *testing* changed stats time reports to be per reported frame and not ↵UbitUmarov2012-04-241-11/+64
| | | | | | | | | | | | | | | | acumulated in about 1second. Total Frame Time is not just 1/reported sim fps
* | | | Merge branch 'master' into careminsterMelanie2012-04-251-5/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | Commit the avination Teleport() methods (adaptedto justincc's changes)Melanie2012-04-251-1/+12
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-04-252-8/+37
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()Justin Clark-Casey (justincc)2012-04-251-16/+0
| | | | | | | | | | | | | | | | These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
| * | | Add regression test TestSameRegionTeleport()Justin Clark-Casey (justincc)2012-04-252-0/+42
| | |/ | |/|
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-234-26/+109
|\ \ \ | | |/ | |/| | | | careminster
| * | fix a bug i added fixing another....UbitUmarov2012-04-221-2/+5
| | |
| * | changed seletion code. SOP now knows about parts selection. UI actions are ↵UbitUmarov2012-04-203-24/+104
| | | | | | | | | | | | sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects
* | | Merge branch 'master' into careminsterMelanie2012-04-236-14/+33
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 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-232-4/+24
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | 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-223-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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-223-9/+129
|\ \ \ | |/ /
| * | 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
| | |
| * | Add TestSetPhysics() to SOP status testsJustin Clark-Casey (justincc)2012-04-212-3/+26
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-204-14/+57
|\ \ \ | | |/ | |/| | | | careminster