Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 2 | -315/+67 |
|\ | |||||
| * | This patch caused serialization errors and needs to be reexamined | Melanie | 2009-12-31 | 2 | -315/+67 |
| | | | | | | | | | | | | Revert "[PATCH] Adds llCollisionFilter" This reverts commit eab2b4c6a96cd5b2a0f079f27a9c2ac15273d3f0. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 5 | -67/+412 |
|\ \ | |/ | |||||
| * | [PATCH] Adds llCollisionFilter | Melanie | 2009-12-31 | 2 | -67/+315 |
| | | | | | | | | Thank you, Revolution. Applied with minor changes. | ||||
| * | Adds osKickUser and osSetSpeed | unknown | 2009-12-31 | 3 | -0/+97 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2009-12-31 | 1 | -0/+5 |
|\ \ | |||||
| * | | Revert "Merge branch 'master' into careminster" | Melanie | 2009-12-30 | 2 | -22/+1 |
| | | | | | | | | | | | | This reverts commit d49d44923d1be38f6fff12706b156562c6060566. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-30 | 2 | -1/+22 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | * Fixes Sitting on the ground. | Teravus Ovares (Dan Olivares) | 2009-12-30 | 2 | -3/+13 |
| | | | |||||
| * | | Revert "Merge branch 'master' into careminster" | Melanie | 2009-12-30 | 3 | -143/+4 |
| | | | | | | | | | | | | This reverts commit 596af3f600462fb1e467714e5b898c10aa3d838b. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-30 | 3 | -4/+143 |
| |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | * Makes forward and backward key reactions faster by responding to the NUDGE ↵ | Teravus Ovares (Dan Olivares) | 2009-12-30 | 2 | -9/+35 |
| | | | | | | | | | | | | type movements. | ||||
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2009-12-29 | 9 | -20/+42 |
| | |\ | |||||
| | | * | Fix an omission in LSL that causes a viewer crash | Melanie | 2009-12-30 | 1 | -0/+5 |
| | | | | |||||
| | * | | * Attempts to resolve the megaregion terrain edit rebound. | Teravus Ovares (Dan Olivares) | 2009-12-29 | 1 | -0/+82 |
| | | | | | | | | | | | | | | | | | | | | | | | | * It does this by tweaking the throttles on child agent connection to a megaregion and multiplying the land throttle by 50. (various bit and byte magic ensue) * While, I doubt this will cause terrain crater sized potholes.. since it actually increases the bandwidth available for land in child regions when MegaRegions area active, more testing would be good. * This, in theory, also shouldn't cause missing objects in child regions.. because all objects are in the root region anyway. As I said, more testing would be good. | ||||
| * | | | Fix an omission in LSL that causes a viewer crash | Melanie | 2009-12-30 | 1 | -0/+5 |
| | | | | |||||
* | | | | Add a small delay in NewAgentConnection to fix an issue with Hippo | Melanie | 2009-12-31 | 1 | -0/+3 |
|/ / / | | | | | | | | | | (and possibly other cleints) getting their data mixed up. | ||||
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2009-12-30 | 8 | -20/+37 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2009-12-29 | 8 | -20/+37 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Change teleports so the TeleportFlags are sent to the destination sim. It | Melanie | 2009-12-29 | 8 | -20/+37 |
| | |/ | | | | | | | | | | | | | can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation | ||||
| | * | One should not copy/paste so much :) | Melanie | 2009-12-27 | 1 | -3/+3 |
| | | | |||||
| | * | Fix the spelling :/ | Melanie | 2009-12-27 | 1 | -3/+3 |
| | | | |||||
* | | | Fix a timer list locking issue causing XMREngine deadlocks | Melanie | 2009-12-30 | 1 | -15/+17 |
|/ / | |||||
* | | One should not copy/paste so much :) | Melanie | 2009-12-27 | 1 | -3/+3 |
| | | |||||
* | | Fix the spelling :/ | Melanie | 2009-12-27 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-27 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Encode the published and mature checkboxes into the user flags for | Melanie | 2009-12-27 | 1 | -0/+3 |
| | | | | | | | | profiles | ||||
* | | Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ↵ | CasperW | 2009-12-27 | 1 | -11/+13 |
| | | | | | | | | ReaderWriteLockSlim, hopefully fixes a native crash | ||||
* | | Make sure that we're not bounds checking attachments. 'Cos otherwise your ↵ | CasperW | 2009-12-26 | 1 | -2/+2 |
| | | | | | | | | hair will end up on your bum. Seen that before? | ||||
* | | Merge branch 'master' into casper | CasperW | 2009-12-26 | 18 | -7/+662 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2009-12-26 | 4 | -0/+29 |
| |\ \ | | |/ | |||||
| | * | Add AvatarInterestsReply | Melanie | 2009-12-26 | 4 | -0/+29 |
| | | | |||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2009-12-25 | 2 | -1/+27 |
| |\ \ | | | | | | | | | | | | | careminster | ||||
| | * | | Recover out-of-region objects during db load. | Kitto Flora | 2009-12-24 | 2 | -1/+27 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2009-12-25 | 2 | -0/+17 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-25 | 1 | -0/+4 |
| | |\ | |||||
| | | * | Clear Shape.SculptEntry if prim type is not a sculptie in ↵ | dahlia | 2009-12-24 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | llSetPrimitiveParams() - addresses Mantis #4462 | ||||
| | * | | Enable the profile module to be replaced completely, even for the base | Melanie | 2009-12-25 | 1 | -0/+13 |
| | |/ | | | | | | | | | | profile data | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-24 | 3 | -0/+483 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-24 | 3 | -0/+483 |
| | |\ | |||||
| | | * | No-op in this commit. Just increasing the tag number due to weirdnesses. | Diva Canto | 2009-12-23 | 1 | -1/+1 |
| | | | | |||||
| | | * | Library Module: allows adding folders/items to the Library from IAR files ↵ | Diva Canto | 2009-12-23 | 3 | -0/+483 |
| | | | | | | | | | | | | | | | | placed under bin/Library. This works only for standalones. | ||||
| | * | | Add the LSL List Size property | Melanie | 2009-12-24 | 1 | -1/+40 |
| | |/ | |||||
| * | | Add the body to the LSL List Size property | Melanie | 2009-12-24 | 1 | -2/+36 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-24 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | Fixes the broken build of the previous commit. | Diva Canto | 2009-12-23 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2009-12-23 | 1 | -1/+41 |
| |\ \ | | |/ | |||||
| | * | Add saving assets from gestures to IAR | Melanie | 2009-12-23 | 1 | -1/+41 |
| | | | |||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2009-12-23 | 1 | -29/+85 |
| |\ \ | | | | | | | | | | | | | careminster | ||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2009-12-23 | 5 | -3/+28 |
| |\ \ \ | | | |/ | | |/| |