Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | TEST more options to avnLocalTeleport | UbitUmarov | 2012-04-27 | 1 | -4/+9 | |
| | | | | ||||||
| * | | | TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool ↵ | UbitUmarov | 2012-04-27 | 1 | -0/+22 | |
| | | | | | | | | | | | | | | | | Stopped) to scenepresence.cs | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 19 | -45/+341 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||||
| * | | | Fix prebuild.xml | BlueWall | 2012-04-27 | 1 | -1/+1 | |
| | |/ | |/| | | | | | | | adding a reference to a dll requires 'path="..."' | |||||
| * | | Fixed: custom walking animations didn't stop when the avatar stopped walking. | Oren Hurvitz | 2012-04-27 | 2 | -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 Hurvitz | 2012-04-27 | 3 | -9/+45 | |
| | | | | | | | | | | | | affect the starting position in the destination region. | |||||
| * | | Use DotNetZip to compress OARs and IARs. | Oren Hurvitz | 2012-04-27 | 7 | -2/+141 | |
| | | | | | | | | | | | | DotNetZip provides much better compression than standard .NET. | |||||
| * | | Add Stefan_Boom / stoehr to contributors | Justin Clark-Casey (justincc) | 2012-04-27 | 1 | -0/+1 | |
| | | | ||||||
| * | | minor: style adjustments in SensorRepeat, mainly related to patch from stoehr | Justin Clark-Casey (justincc) | 2012-04-27 | 1 | -3/+4 | |
| | | | ||||||
| * | | Fixing wrong position of llSensor, SensePoint wasnt following the rotation ↵ | Stefan_Boom | 2012-04-27 | 1 | -8/+22 | |
| | | | | | | | | | | | | of the root prim. | |||||
| * | | MapImageService: changed the event at which the map tiles are uploaded, ↵ | Diva Canto | 2012-04-27 | 2 | -5/+14 | |
| | | | | | | | | | | | | because they were being uploaded before the region was registered with the grid | |||||
| * | | MapImage security issue. Compare strings instead of IPAddresses. | Diva Canto | 2012-04-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | MapImage security issue: better error messages | Diva Canto | 2012-04-27 | 1 | -3/+5 | |
| | | | ||||||
| * | | Amend to last commit: account for the existence of proxies. | Diva Canto | 2012-04-27 | 3 | -3/+39 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-04-27 | 69 | -666/+821 | |
| |\ \ | ||||||
| * | | | Minor change in error message (HG teleport failures) | Diva Canto | 2012-04-27 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | MapImageService: added an additional security check for OSGrid and other ↵ | Diva Canto | 2012-04-27 | 3 | -5/+51 | |
| | | | | | | | | | | | | | | | | grids like it. | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 65 | -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-27 | 49 | -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 Hurvitz | 2012-04-26 | 1 | -13/+12 | |
| | | | | | | | | | | | | | | | | OSSL permissions are now controlled in OpenSim.ini. | |||||
| * | | | Refactored how asset/inventory types are associated with content types: ↵ | Oren Hurvitz | 2012-04-26 | 2 | -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 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 | 3 | -22/+43 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2012-04-26 | 33 | -383/+506 | |
| | |\ \ \ \ | ||||||
| | * | | | | | 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 | |
| | |_|/ / / | |/| | | | | ||||||
| * | | | | | Add request verb and url to error messages in WebUtil that lack this. | Justin Clark-Casey (justincc) | 2012-04-26 | 1 | -17/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Make exception printing consistent across windows and mono. | |||||
| * | | | | | 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 | |
| |\ \ \ \ | ||||||
| * | | | | | Add a configuration switch to turn on/off the use of the trash | Mic Bowman | 2012-04-25 | 3 | -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 ↵ | Melanie | 2012-04-27 | 5 | -22/+54 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | careminster | |||||
| * | | | | | revert last add commit | UbitUmarov | 2012-04-26 | 1 | -2/+3 | |
| | | | | | | ||||||
| * | | | | | add wearable type PHYSICS | UbitUmarov | 2012-04-26 | 1 | -6/+13 | |
| | | | | | | ||||||
| * | | | | | Help big boobies to dance (avatar visualParams). May not persist and need ↵ | UbitUmarov | 2012-04-26 | 4 | -17/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 |