aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | scale avatar push force with avatar densityUbitUmarov2012-02-111-1/+2
| | | | | |
| * | | | | revert project name to OpenSim and not CareminsterUbitUmarov2012-02-113-3/+3
| | | | | |
| * | | | | test on gitUbitUmarov2012-02-104-0/+4
| | | | | |
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-1017-34/+309
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: prebuild.xml
| * | | | | | Changes to vehicles code etc. Includes some debug aids to remove later.UbitUmarov2012-02-104-243/+145
| | | | | | |
| * | | | | | initial introdution of physics actor building control.UbitUmarov2012-02-085-11/+60
| | | | | | |
| * | | | | | first change in SOP. in AddPrimShape(..) give physics the world rotation and ↵UbitUmarov2012-02-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | not local offset. Currently physics interface only knows about world frame
| * | | | | | files need to run UbitODE in linux ( untested )UbitUmarov2012-02-083-0/+7
| | | | | | |
| * | | | | | changes needed to compile UbitODE, also changes project name to ↵UbitUmarov2012-02-083-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | "Careminter". untested on linux
| * | | | | | changes in physics manager, needed for UbitODEUbitUmarov2012-02-082-1/+28
| | | | | | |
| * | | | | | UbitODE plugin initial commitUbitUmarov2012-02-0810-0/+11556
| | | | | | |
* | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-1933-90/+688
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | 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-1824-70/+556
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | 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-182-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
| | | | | | |
| | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-182-1/+10
| | | |\ \ \ \
| | | * | | | | Actually add the Windows 64-bit ode.dll file.Justin Clark-Casey (justincc)2012-02-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This might be why it didn't work.
| | * | | | | | Route logins according to Estate, Telehub and TeleportFlagsBlueWall2012-02-181-2/+4
| | | | | | | |
| | * | | | | | Propagate our teleport flags on loginsBlueWall2012-02-183-3/+12
| | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-176-7/+66
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | 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-185-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Parcel sales support to SQLiteBlueWall2012-02-172-1/+10
| | |/ / / /
| | * | | | Fillin missing SQLite support for TelehubsBlueWall2012-02-172-0/+118
| | | | | |
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-1719-75/+400
| | |\ \ \ \
| | | * | | | 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-162-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-168-14/+87
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | | 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-155-10/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Now if chode prim.cs detects out of bounds it requests a update and blocks ↵UbitUmarov2012-02-152-20/+45
| | | | | | | | | | | | | | | | | | | | | | | | movement and colisions. Base code must do a PhysActor.CrossingFailure() to make it move again inside sim or delete it.
* | | | | | don't freeze with a sitted avatar in a border without other sim. Still messy :(UbitUmarov2012-02-152-3/+10
| | | | | |
* | | | | | try to make crossings work better. chode no longer prevents crossings i hopeUbitUmarov2012-02-154-27/+77
|/ / / / /