aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-194-18/+29
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-02-193-10/+11
| |\
| | * Use localy defined name, TPFlags, for Constants.TeleportFlagsBlueWall2012-02-191-6/+6
| | |
| * | A few more tweaks on position updates and create child agents. Mono hates ↵Diva Canto2012-02-193-11/+23
| | | | | | | | | | | | concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.
* | | Merge branch 'master' into careminsterMelanie2012-02-194-6/+45
|\ \ \ | | |/ | |/|
| * | Fix:Fly setting for Parcel dosen't work ↵PixelTomsen2012-02-191-1/+2
| | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5887 Signed-off-by: nebadon <michael@osgrid.org>
| * | Fix:OmegaX, OmegaY and OmegaZ not saved for child prims ↵PixelTomsen2012-02-191-3/+3
| |/ | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5893 Signed-off-by: nebadon <michael@osgrid.org>
| * This should smooth movement in heteregeneous networks by a lot: cache the ↵Diva Canto2012-02-182-2/+40
| | | | | | | | region by position instead of looking it up all the time -- this was being done during the main update loop!
* | Merge branch 'master' into careminsterMelanie2012-02-1815-64/+379
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-181-1/+4
| |\
| | * Report an error if the required native Windows ODE library can't be found.Justin Clark-Casey (justincc)2012-02-181-1/+4
| | |
| * | Route logins according to Estate, Telehub and TeleportFlagsBlueWall2012-02-181-2/+4
| | |
| * | Propagate our teleport flags on loginsBlueWall2012-02-181-1/+4
| |/
| * Fix a bug where changing shape parameters of a child prim in a linkset would ↵Justin Clark-Casey (justincc)2012-02-181-2/+2
| | | | | | | | | | | | not persist. Resolves http://opensimulator.org/mantis/view.php?id=5819
| * On Windows automatically load the correct native ODE library depending on ↵Justin Clark-Casey (justincc)2012-02-182-3/+24
| | | | | | | | | | | | | | | | | | whether the process is 32-bit or 64-bit In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory. However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated. Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected. This will currently not work with sqlite - I will add that too if this works.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-1716-71/+378
| |\
| | * Add new and updated script eventsRobert Adams2012-02-172-3/+67
| | |
| | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-171-0/+21
| | |\
| | | * Fix missing telehub handling on loginBlueWall2012-02-171-0/+21
| | | |
| | * | Make osNpcStopAnimation() call AvatarStopAnimation() rather than ↵Justin Clark-Casey (justincc)2012-02-171-1/+1
| | | | | | | | | | | | | | | | AvatarPlayAnimation()
| | * | Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-161-2/+4
| | |\ \ | | | |/
| | | * Remove some debugging output form the loggerBlueWall2012-02-161-2/+4
| | | |
| | * | minor formatting changes from last commit (4486n7d)Justin Clark-Casey (justincc)2012-02-161-4/+3
| | | |
| | * | Fix: Object owned by the group does not return to the last owner ↵PixelTomsen2012-02-163-2/+8
| | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5404
| | * | Turn off logging on test in last commit (2b84295).Justin Clark-Casey (justincc)2012-02-161-1/+1
| | | |
| | * | If shape properties fail SOP parsing (e.g. due to commas instead of decimal ↵Justin Clark-Casey (justincc)2012-02-162-12/+155
| | |/ | | | | | | | | | | | | | | | points) print out one short message listing the failing node names rather than lots of exceptions. Adds skeleton bad float values deserialization test
| | * Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends ↵Justin Clark-Casey (justincc)2012-02-161-3/+3
| | | | | | | | | | | | grid call would try and contact the wrong uri. Also fixes the build from df960d5
| | * Add known identity informatio nto log message if an exception is thrown ↵Justin Clark-Casey (justincc)2012-02-161-36/+53
| | | | | | | | | | | | during LLUDPServer.HandleUseCircuitCode()
| | * Comment out "experimental" log message printed out whenever a physics mesh ↵Justin Clark-Casey (justincc)2012-02-161-2/+2
| | | | | | | | | | | | | | | | | | was generated for a mesh Also adds prim name to the "no asset data" error log message
| * | Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by ↵Dan Lake2012-02-172-0/+28
| | | | | | | | | | | | AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set).
* | | Merge branch 'master' into careminsterMelanie2012-02-166-11/+66
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | Fix some logic mistakes where firstly osNpcCreate() without options was ↵Justin Clark-Casey (justincc)2012-02-163-5/+20
| | | | | | | | | | | | | | | | | | creating npcs sensed as agents and secondly the OS_NPC_SENSE_AS_AGENT option was having the opposite effect. Hopefully makes progress on addressing http://opensimulator.org/mantis/view.php?id=5872
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-154-23/+101
| |\ \ | | |/
| * | In ObjectTortureTests, run garbage collector on Teardown and run scene loop ↵Justin Clark-Casey (justincc)2012-02-153-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update when scene objects have been deleted. At least on mono 2.6.4, running GC.Collect() is not guaranteed to force gc of all objects when run in the same method where those objects had references. Therefore, GC.Collect() is now being done in the per-script teardown of ObjectTortureTests. In addition, scene loop update is being run after garbage collection in order to clean out the viewer update list of scene objects in the SceneGraph. These measures mean that scene objects/parts are now garbage collected after a test run if deleted from the scene, resulting in a much better memory usage report (though probably still not very accurate). However, deletion takes a very long time - what's really needed is to find out now why the entire scene isn't being GC'd by this measure. This change hasn't yet been applied to the other stress tests.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-02-156-163/+237
|\ \ \ | | | | | | | | | | | | careminster
| * | | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-145-157/+221
| | | | | | | | | | | | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet.
| * | | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-143-8/+18
| | | | | | | | | | | | | | | | crossings
* | | | Merge branch 'master' into careminsterMelanie2012-02-1511-43/+179
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-143-15/+38
| | |
| * | Fix a race condition in the simian groups connector. When requests wereMic Bowman2012-02-131-8/+63
| |/ | | | | | | | | | | too slow they would circumvent the cache (piling up on the network service and making the problem even worse). This condition happens frequently during permission checks.
| * Fix: get embedded objects from Notecard fails with activated ↵PixelTomsen2012-02-141-3/+3
| | | | | | | | | | | | FreeSwitchVoiceModul http://opensimulator.org/mantis/view.php?id=2607
| * Add some more data to the new user connection logging for debug purposes.Justin Clark-Casey (justincc)2012-02-141-3/+3
| |
| * short circuit the expensive parts of the permission checking codeMic Bowman2012-02-131-1/+6
| | | | | | | | | | if the current user is the owner of an object. none of the later checks can reverse the outcome.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-137-20/+101
| |\
| | * correct the default avatar_terminal_velocity value that I accidentally left ↵Justin Clark-Casey (justincc)2012-02-111-1/+1
| | | | | | | | | | | | in whilst testing
| | * Clamp ODE character velocity. Make ODE falling character 54m/s by default.Justin Clark-Casey (justincc)2012-02-112-1/+53
| | | | | | | | | | | | | | | | | | | | | If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value. In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver. This also appears to be the value used on the linden lab grid. This should resolve http://opensimulator.org/mantis/view.php?id=5882
| | * Make ScenePresence.MovementFlag a private only settable value to reduce ↵Justin Clark-Casey (justincc)2012-02-111-7/+4
| | | | | | | | | | | | complexity of code analysis
| * | On object deserialization, go back to logging errors at DEBUG level rather ↵Justin Clark-Casey (justincc)2012-02-131-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | than ERROR. Restore extra log message if shape processing fails. Logging level was DEBUG before 312e145 (Fri Feb 3 2012). 312e145 also accidentally removed the 'general error' log message if any shape deserialization failed. This commit restores it, though this has no functional impact.
* | | Merge branch 'master' into careminsterMelanie2012-02-104-12/+44
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-101-9/+20
| |\ \
generated by cgit v1.1 at 2024-12-26 07:57:08 +0000