| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -16/+2 |
| |\ | |||||
| | * | Fix problem with dragging child part inventory item to user inventory. | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -11/+1 |
| | | | | | | | | | | | This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller. Resolves http://opensimulator.org/mantis/view.php?id=5569 | ||||
| | * | Revert "Fix:Cannot drag inventory from child prim into inventory ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569" This reverts commit 15ce73caca9ea6448e34b95d344cbbf5c9507f6d. As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569, I was going to fix this in a more general way. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -4/+8 |
| |\ \ | |/ | |||||
| | * | Fix:Cannot drag inventory from child prim into inventory ↵ | PixelTomsen | 2012-02-21 | 1 | -4/+8 |
| | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569 | ||||
| * | | Also preserve angular velocity on crossing. | Melanie | 2012-02-21 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -15/+14 |
| |\ \ | |/ | | | | | Conflicts: | ||||
| | * | Fix bug where NPCs would establish child agents on other neighbour regions ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -15/+14 |
| | | | | | | | | | that had come up after the NPC was created. | ||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-20 | 2 | -6/+3 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-02-20 | 2 | -6/+3 |
| | |\ \ | | |/ | |||||
| | | * | More improvements on agent position updates: if the target sims fail, ↵ | Diva Canto | 2012-02-20 | 1 | -5/+2 |
| | | | | | | | | | | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail. | ||||
| | | * | Amend to last commit. This should have been committed too. | Diva Canto | 2012-02-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make vehicles retain velocity when crossing between regions. | Melanie | 2012-02-20 | 1 | -0/+4 |
| | | | | |||||
| * | | | Add an override to make SOG.Velocity work as expected | Melanie | 2012-02-20 | 1 | -0/+6 |
| |/ / | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-19 | 3 | -13/+21 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-02-19 | 3 | -13/+21 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-02-19 | 2 | -9/+9 |
| | | |\ | |||||
| | | | * | Use localy defined name, TPFlags, for Constants.TeleportFlags | BlueWall | 2012-02-19 | 1 | -6/+6 |
| | | | | | |||||
| | | * | | A few more tweaks on position updates and create child agents. Mono hates ↵ | Diva Canto | 2012-02-19 | 2 | -7/+15 |
| | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Uncomment serialization | Melanie | 2012-02-19 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge branch 'ubitwork' | Melanie | 2012-02-19 | 3 | -4/+300 |
| |\ \ \ \ | |||||
| | * | | | | simplified vehicle fromXml. Use still comented on SceneObjectSerialized.cs | UbitUmarov | 2012-02-19 | 1 | -77/+117 |
| | | | | | | |||||
| | * | | | | Vehicle XML serialization more complete. Inactived by coments in ↵ | UbitUmarov | 2012-02-19 | 3 | -4/+260 |
| | | | | | | | | | | | | | | | | | | | | | SceneObjectSerializar.cs until proper testing | ||||
| * | | | | | Merge branch 'ubitwork' | Melanie | 2012-02-19 | 5 | -26/+636 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | ||||
| | * | | | | moved vehicle from SOG to SOP | UbitUmarov | 2012-02-19 | 3 | -104/+79 |
| | | | | | | |||||
| | * | | | | missing paramenters init plus some cleaning | UbitUmarov | 2012-02-18 | 1 | -91/+16 |
| | | | | | | |||||
| | * | | | | added a EnUsCulture whatever that is.. | UbitUmarov | 2012-02-18 | 1 | -4/+3 |
| | | | | | | |||||
| | * | | | | a bit less human readable xml | UbitUmarov | 2012-02-18 | 1 | -25/+25 |
| | | | | | | |||||
| | * | | | | added some ToXml2 to SOGVehicle ( unused untested ) | UbitUmarov | 2012-02-18 | 1 | -1/+84 |
| | | | | | | |||||
| | * | | | | changed how vehicle data is stored and passed to physics. use unsafe in ↵ | UbitUmarov | 2012-02-18 | 2 | -163/+175 |
| | | | | | | | | | | | | | | | | | | | | | serializer, tried to control m_dupeInProgress | ||||
| | * | | | | vehicle parameters do cross (i hope) on regions in same instance ( others ↵ | UbitUmarov | 2012-02-18 | 2 | -13/+57 |
| | | | | | | | | | | | | | | | | | | | | | need xml) | ||||
| | * | | | | let SOG know about vehicles. Still needs serialization and applyphyscis on ↵ | UbitUmarov | 2012-02-18 | 3 | -30/+541 |
| | | | | | | | | | | | | | | | | | | | | | deserialize, etc | ||||
| | * | | | | don't freeze with a sitted avatar in a border without other sim. Still messy :( | UbitUmarov | 2012-02-15 | 1 | -1/+8 |
| | | | | | | |||||
| | * | | | | try to make crossings work better. chode no longer prevents crossings i hope | UbitUmarov | 2012-02-15 | 2 | -6/+9 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-15 | 7 | -68/+202 |
| | |\ \ \ \ | |||||
| | * | | | | | scenepresence change! in standup() give avatar a physical actor after ↵ | UbitUmarov | 2012-02-11 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | deciding the new position. This reduces a bit the odds of it being still coliding with object. | ||||
| | * | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-10 | 6 | -8/+66 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: prebuild.xml | ||||
| | * | | | | | | initial introdution of physics actor building control. | UbitUmarov | 2012-02-08 | 3 | -9/+58 |
| | | | | | | | | |||||
| | * | | | | | | first change in SOP. in AddPrimShape(..) give physics the world rotation and ↵ | UbitUmarov | 2012-02-08 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not local offset. Currently physics interface only knows about world frame | ||||
| * | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-19 | 8 | -29/+199 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-19 | 1 | -3/+3 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | | Fix:OmegaX, OmegaY and OmegaZ not saved for child prims ↵ | PixelTomsen | 2012-02-19 | 1 | -3/+3 |
| | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5893 Signed-off-by: nebadon <michael@osgrid.org> | ||||
| | * | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 6 | -19/+149 |
| | |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | ||||
| | | * | | | | Route logins according to Estate, Telehub and TeleportFlags | BlueWall | 2012-02-18 | 1 | -2/+4 |
| | | | | | | | |||||
| | | * | | | | Propagate our teleport flags on logins | BlueWall | 2012-02-18 | 1 | -1/+4 |
| | | | | | | | |||||
| | | * | | | | Fix a bug where changing shape parameters of a child prim in a linkset would ↵ | Justin Clark-Casey (justincc) | 2012-02-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not persist. Resolves http://opensimulator.org/mantis/view.php?id=5819 | ||||
| | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-17 | 8 | -24/+159 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Add new and updated script events | Robert Adams | 2012-02-17 | 2 | -3/+67 |
| | | | | | | | | |||||
| | | | * | | | | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-17 | 1 | -0/+21 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Fix missing telehub handling on login | BlueWall | 2012-02-17 | 1 | -0/+21 |
| | | | | | | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |