aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-2765-639/+741
|\ | | | | | | | | | | | | 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-2749-307/+268
| | | | | | | | | | | | | | | | 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.
| * OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar.Oren Hurvitz2012-04-261-13/+12
| | | | | | | | OSSL permissions are now controlled in OpenSim.ini.
| * Refactored how asset/inventory types are associated with content types: ↵Oren Hurvitz2012-04-262-228/+177
| | | | | | | | gathered all the knowledge into a single class. Added the Mesh content type.
| * When creating an OAR, objects where the user is the Creator are always ↵Oren Hurvitz2012-04-261-2/+7
| | | | | | | | | | | | included, regardless of their permissions. The purpose of the permission checks is to prevent the unauthorized copying of assets, but users can always copy assets that they created.
| * Tweak log messages on local region to region teleport path to help with ↵Justin Clark-Casey (justincc)2012-04-265-25/+48
| | | | | | | | problem resolution.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-266-10/+144
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-04-263-22/+43
| | |\
| | * \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-2633-383/+506
| | |\ \
| | * | | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-266-10/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 more detail to unauthorized caps client messageJustin Clark-Casey (justincc)2012-04-261-1/+4
| | | | |
| * | | | minor: Add region name to dropped inbound packet messageJustin Clark-Casey (justincc)2012-04-261-1/+3
| | |_|/ | |/| |
| * | | Add request verb and url to error messages in WebUtil that lack this.Justin Clark-Casey (justincc)2012-04-261-17/+38
| | | | | | | | | | | | | | | | Make exception printing consistent across windows and mono.
| * | | 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-252-7/+47
| |\ \
| * | | Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-253-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-275-22/+54
|\ \ \ \ | | | | | | | | | | | | | | | careminster
| * | | | revert last add commitUbitUmarov2012-04-261-2/+3
| | | | |
| * | | | add wearable type PHYSICSUbitUmarov2012-04-261-6/+13
| | | | |
| * | | | Help big boobies to dance (avatar visualParams). May not persist and need ↵UbitUmarov2012-04-264-17/+41
| | | | | | | | | | | | | | | | | | | | more lobe ?
* | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-257-53/+158
|\ \ \ \ \ | |/ / / / | | | | | | | | | | careminster
| * | | | set PIDHoverTau and not PIDTau since all physics need thatUbitUmarov2012-04-251-5/+7
| | | | |
| * | | | fix chODE loosing some part positions when doing isPhysical falseUbitUmarov2012-04-242-11/+42
| | | | |
| * | | | SOG bug fix in UI object changesUbitUmarov2012-04-241-11/+20
| | | | |
| * | | | fix animations if sited in ground alsoUbitUmarov2012-04-241-1/+1
| | | | |
| * | | | let objects/avas push avasUbitUmarov2012-04-241-2/+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-250-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵Melanie2012-04-252-7/+47
| | |/ / | |/| | | | | | | | | | scripts work. Fixes Mantis #5990
* | | | Merge branch 'master' into careminsterMelanie2012-04-251-15/+24
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-2550-801/+1393
| |\ \ \
| * | | | Add try/catch around Json script method registration to avoild some issuesMic Bowman2012-04-251-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with .NET 3.5 vs 4.0 differences. See http://opensimulator.org/mantis/view.php?id=5971
* | | | | Adapt some TeleportWithMomentum callsMelanie2012-04-252-2/+2
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-04-253-19/+15
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | Slight rewording of output messages.Diva Canto2012-04-241-1/+1
| | | | |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-242-1/+13
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-04-251-0/+1
| | |\ \ \ \
| | | * | | | zero out SP velocity before calling SP.Teleport(), as the client expects ↵Justin Clark-Casey (justincc)2012-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (though this is also effectively done by physics at the moment)
| | * | | | | Commit the avination Teleport() methods (adaptedto justincc's changes)Melanie2012-04-251-1/+12
| | |/ / / /
| * | | | | HG: Moved User-level code down to the HGEntityTransferModule where it belongs.Diva Canto2012-04-242-14/+14
| |/ / / /
* | | | | Merge branch 'master' into careminsterMelanie2012-04-255-11/+40
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()Justin Clark-Casey (justincc)2012-04-252-17/+1
| | | | | | | | | | | | | | | | | | | | 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-253-1/+43
| | | | |
| * | | | Comment out AvatarService.SetAvatar debug log line for nowJustin Clark-Casey (justincc)2012-04-251-1/+1
| | | | |
generated by cgit v1.1 at 2024-10-26 19:44:47 +0000