aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination'Melanie2012-05-021-2/+14
|\
| * Merge branch 'ubitwork' into avinationMelanie2012-05-021-2/+14
| |\
| | * llGetGeometricCenter...UbitUmarov2012-04-291-2/+14
| | |
* | | Merge branch 'avination'Melanie2012-05-023-1/+5
|\ \ \ | |/ /
| * | Preserve attachment rotation on objects rezzed via a script. Makes toastersMelanie2012-05-022-0/+4
| | | | | | | | | | | | work right, finally.
| * | Fix saving of attachment positionsMelanie2012-05-011-1/+1
| |/
* | Merge branch 'master' into careminsterMelanie2012-04-304-71/+84
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
| * | Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on ↵Justin Clark-Casey (justincc)2012-04-303-4/+9
| | | | | | | | | | | | | | | | | | and off within tests. This makes *.Tests.dll.config files no longer needed, hence deleted.
| * | refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 ↵Justin Clark-Casey (justincc)2012-04-301-73/+75
| | | | | | | | | | | | into SendControlsToScripts() (instead of SendControlToScripts()).
| * | Fixed: scripted controls didn't work if the avatar was sitting downOren Hurvitz2012-04-301-9/+15
| | | | | | | | | | | | This fixes a bug introduced in 6473674bbf6ce006512083902e8ff1796d8c8b22
* | | Merge branch 'master' into careminsterMelanie2012-04-291-5/+5
|\ \ \ | |/ /
| * | Comment out debug [ASYNC DELETER] messages for now.Justin Clark-Casey (justincc)2012-04-281-5/+5
| | |
* | | Merge branch 'avination'Melanie2012-04-293-8/+113
|\ \ \ | | |/ | |/|
| * | remove repeated set of group rotation to physicsUbitUmarov2012-04-291-2/+3
| | |
| * | SOG bug fix in group rotations updatesUbitUmarov2012-04-291-4/+6
| | |
| * | fix llGetCenterOfMass ( checked with ubitODE only)UbitUmarov2012-04-282-3/+70
| | |
| * | testUbitUmarov2012-04-271-3/+0
| | |
| * | testUbitUmarov2012-04-271-12/+9
| | |
| * | testUbitUmarov2012-04-271-1/+1
| | |
| * | itestUbitUmarov2012-04-271-2/+3
| | |
| * | itestUbitUmarov2012-04-271-2/+5
| | |
| * | testUbitUmarov2012-04-271-2/+2
| | |
| * | testing....UbitUmarov2012-04-271-15/+24
| | |
| * | testingUbitUmarov2012-04-271-1/+1
| | |
| * | TESTINGUbitUmarov2012-04-271-4/+4
| | |
| * | 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-2721-210/+134
|\ \ \ | |/ / | | | | | | | | | | | | | | | 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.
| * | 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
| | |