| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 55 | -293/+377 |
| |\ | | | | | | | | | | | | | 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-27 | 43 | -206/+126 |
| | | | | | | | | | | | | | | | | | 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 Hurvitz | 2012-04-26 | 1 | -13/+12 |
| | | | | | | | | | OSSL permissions are now controlled in OpenSim.ini. | ||||
| | * | When creating an OAR, objects where the user is the Creator are always ↵ | Oren Hurvitz | 2012-04-26 | 1 | -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-26 | 5 | -25/+48 |
| | | | | | | | | | problem resolution. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-26 | 6 | -10/+144 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-04-26 | 2 | -5/+5 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2012-04-26 | 25 | -358/+423 |
| | | |\ \ | |||||
| | | * | | | Add a version of osNpcSay that takes a channel number Mantis 5747 | Talun | 2012-04-26 | 6 | -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-26 | 1 | -35/+35 |
| | | | | | | | | | | | | | | | | | | | | | analysis complexity | ||||
| | * | | | | minor: Add more detail to unauthorized caps client message | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -1/+4 |
| | | | | | | |||||
| | * | | | | minor: Add region name to dropped inbound packet message | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -1/+3 |
| | | |_|/ | |/| | | |||||
| | * | | | minor: Add avatar name to removing agent log message | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Comment out avatar move to target message for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -3/+3 |
| | | |/ | |/| | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-04-25 | 2 | -7/+47 |
| | |\ \ | |||||
| | | * | | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵ | Melanie | 2012-04-25 | 2 | -7/+47 |
| | | | | | | | | | | | | | | | | | scripts work. Fixes Mantis #5990 | ||||
| | * | | | Add a configuration switch to turn on/off the use of the trash | Mic Bowman | 2012-04-25 | 2 | -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 ↵ | Melanie | 2012-04-27 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | careminster | ||||
| | * | | | Help big boobies to dance (avatar visualParams). May not persist and need ↵ | UbitUmarov | 2012-04-26 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | more lobe ? | ||||
| * | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-04-25 | 7 | -53/+158 |
| |\ \ \ \ | |/ / / | | | | | | | | | careminster | ||||
| | * | | | set PIDHoverTau and not PIDTau since all physics need that | UbitUmarov | 2012-04-25 | 1 | -5/+7 |
| | | | | | |||||
| | * | | | fix chODE loosing some part positions when doing isPhysical false | UbitUmarov | 2012-04-24 | 2 | -11/+42 |
| | | | | | |||||
| | * | | | SOG bug fix in UI object changes | UbitUmarov | 2012-04-24 | 1 | -11/+20 |
| | | | | | |||||
| | * | | | fix animations if sited in ground also | UbitUmarov | 2012-04-24 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | let objects/avas push avas | UbitUmarov | 2012-04-24 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | "save the catgirls" | UbitUmarov | 2012-04-24 | 2 | -18/+13 |
| | | | | | |||||
| | * | | | display heatbeat sleep time in stats. This may not be good for general use, ↵ | UbitUmarov | 2012-04-24 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | but for testing/debug | ||||
| | * | | | fix Simulation time report | UbitUmarov | 2012-04-24 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | some reduction on time resolution efects on spare time report | UbitUmarov | 2012-04-24 | 1 | -4/+8 |
| | | | | | |||||
| | * | | | *testing* changed stats time reports to be per reported frame and not ↵ | UbitUmarov | 2012-04-24 | 1 | -11/+64 |
| | | | | | | | | | | | | | | | | | acumulated in about 1second. Total Frame Time is not just 1/reported sim fps | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 1 | -15/+24 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-04-25 | 39 | -769/+1283 |
| | |\ \ \ | |||||
| | * | | | | Add try/catch around Json script method registration to avoild some issues | Mic Bowman | 2012-04-25 | 1 | -15/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with .NET 3.5 vs 4.0 differences. See http://opensimulator.org/mantis/view.php?id=5971 | ||||
| * | | | | | Adapt some TeleportWithMomentum calls | Melanie | 2012-04-25 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 3 | -19/+15 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | | Slight rewording of output messages. | Diva Canto | 2012-04-24 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-04-24 | 2 | -1/+13 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-04-25 | 1 | -0/+1 |
| | | |\ \ \ \ | |||||
| | | | * | | | | zero out SP velocity before calling SP.Teleport(), as the client expects ↵ | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (though this is also effectively done by physics at the moment) | ||||
| | | * | | | | | Commit the avination Teleport() methods (adaptedto justincc's changes) | Melanie | 2012-04-25 | 1 | -1/+12 |
| | | |/ / / / | |||||
| | * | | | | | HG: Moved User-level code down to the HGEntityTransferModule where it belongs. | Diva Canto | 2012-04-24 | 2 | -14/+14 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 4 | -10/+39 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() | Justin Clark-Casey (justincc) | 2012-04-25 | 2 | -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-25 | 3 | -1/+43 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 5 | -41/+50 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | ||||
| | * | | | | Comment out some debug ATTACHMENTS log messages for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -15/+14 |
| | | | | | | |||||
| | * | | | | Comment out the noisier AVFACTORY log messages for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | Permanently comment out warnings about ScenePresence not being found - this is entirely expected if the avatar has alraedy logged out or left the scene. | ||||
| | * | | | | Improve teleport log debug and error messages to tell us who is teleporting. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -3/+14 |
| | | | | | | |||||
| | * | | | | Minor improvements to logging | Oren Hurvitz | 2012-04-24 | 4 | -11/+16 |
| | | | | | | | | | | | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]"). | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-24 | 11 | -332/+236 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |