| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+3 | |
| |\ \ | |/ | ||||||
| | * | Get new NewUser and SetUserAccount calls to accept PrincipalID instead of ↵ | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -3/+3 | |
| | | | | | | | | | UserID for consistency with output | |||||
| * | | Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+59 | |
| |\ \ | |/ | ||||||
| | * | Allow an http call to set account details if AllowSetAccount = true in ↵ | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -3/+59 | |
| | | | | | | | | | | | | | [UserAccountService]. As before, default is false to not allow these calls. | |||||
| * | | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge | Melanie | 2011-10-25 | 3 | -7/+73 | |
| |\ \ | |/ | ||||||
| | * | Provide an option to allow remote calls to the CreateUser method on the ↵ | Justin Clark-Casey (justincc) | 2011-10-18 | 3 | -7/+73 | |
| | | | | | | | | | | | | | | | | | | | UserAccountService Default is false, as before. Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces. Only Ruths can be created at present. Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service. | |||||
| * | | Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+6 | |
| |\ \ | |/ | ||||||
| | * | Temporarily put in log lines to record time taken to set terrain in OdeScene. | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -0/+6 | |
| | | | ||||||
| * | | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+10 | |
| |\ \ | |/ | ||||||
| | * | Store scene identifier passed in to OdeScene for later debug messages | Justin Clark-Casey (justincc) | 2011-10-18 | 2 | -2/+10 | |
| | | | ||||||
| * | | Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge | Melanie | 2011-10-25 | 1 | -16/+13 | |
| |\ \ | |/ | ||||||
| | * | Don't bother taking OdeLock during OdeScene construction, since there can be ↵ | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -16/+13 | |
| | | | | | | | | | no contention until the object is constructed. | |||||
| * | | Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmerge | Melanie | 2011-10-25 | 1 | -18/+13 | |
| |\ \ | |/ | ||||||
| | * | Remove unnecessary lock of OdeLock in OdePrim.changeadd() | Justin Clark-Casey (justincc) | 2011-10-18 | 1 | -18/+13 | |
| | | | | | | | | | This taint can only ever be processed from the OdeScene.Simulate() loop, which already locks OdeLock. | |||||
| * | | Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmerge | Melanie | 2011-10-25 | 2 | -1/+3 | |
| |\ \ | |/ | ||||||
| | * | minor: method doc to explain a lock of OdeLock | Justin Clark-Casey (justincc) | 2011-10-18 | 2 | -1/+3 | |
| | | | ||||||
| * | | Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge | Melanie | 2011-10-25 | 4 | -97/+81 | |
| |\ \ | |/ | ||||||
| | * | Remove the unused CollisionLocker from ODE | Justin Clark-Casey (justincc) | 2011-10-18 | 4 | -97/+81 | |
| | | | | | | | | | Despite its name, this wasn't actually being used in any collision checking | |||||
| * | | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge | Melanie | 2011-10-25 | 2 | -6/+11 | |
| |\ \ | |/ | ||||||
| | * | Allow an avatar to be explicitly named to the "debug packet" command | Justin Clark-Casey (justincc) | 2011-10-17 | 2 | -6/+11 | |
| | | | ||||||
| * | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 6 | -28/+16 | |
| |\ \ | |/ | ||||||
| | * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 6 | -28/+16 | |
| | | | | | | | | | without a getter | |||||
| * | | Merge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+17 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||||
| | * | Add avatar names to debug packet output | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmerge | Melanie | 2011-10-25 | 3 | -13/+14 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | refactor: Use SOP.SitTargetAvatar instead of calling a special ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 3 | -11/+10 | |
| | | | | | | | | | GetAvatarOnSitTarget() which returned exactly the same thing | |||||
| * | | Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | rename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | understandable This makes something like osNpcSit(npc, llGetKey(), OS_NPC_IMMEDIATE) now become osNpcSit(npc, llGetKey(), OS_NPC_SIT_NOW); This is why it's in development :) | |||||
| * | | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmerge | Melanie | 2011-10-25 | 6 | -2/+48 | |
| |\ \ | |/ | ||||||
| | * | Implement osNpcStand(<npc-id>) | Justin Clark-Casey (justincc) | 2011-10-17 | 6 | -2/+48 | |
| | | | | | | | | | Allows you to stand an NPC that has sat. | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+0 | |
| | |\ | ||||||
| * | \ | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge | Melanie | 2011-10-25 | 11 | -15/+74 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | Implement osNpcSit(). This is still in development so don't trust it | Justin Clark-Casey (justincc) | 2011-10-17 | 10 | -5/+75 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE) e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE); At the moment, sit only succeeds if the part has a sit target set. NPC immediately sits on the target even if miles away - they do not walk up to it. This method is in development - it may change so please don't trust it yet. Standing will follow shortly since that's kind of important once you're sitting :) | |||||
| * | | | Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+0 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Bug fix on the bug fix on UserAccountService.cs | Diva Canto | 2011-10-16 | 1 | -1/+0 | |
| | |/ | ||||||
| * | | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+3 | |
| |\ \ | |/ | ||||||
| | * | Guard HGAssetService against uninitialized variables and null arguments. | Diva Canto | 2011-10-15 | 1 | -0/+3 | |
| | | | ||||||
| * | | Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 | |
| |\ \ | |/ | ||||||
| | * | improve method doc on Scene.OtherRegionUp() | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+4 | |
| | | | | | | | | | this is really just to trigger panda. | |||||
| * | | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 6 | -17/+8 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 6 | -17/+8 | |
| | | | | | | | | | the others | |||||
| * | | Merge | Melanie | 2011-10-25 | 2 | -3/+1 | |
| | | | ||||||
| * | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 7 | -45/+24 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | fetch physical_prim switch from [Startup] config from inside scene, as is ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 7 | -48/+23 | |
| | | | | | | | | | done for most other scene config params | |||||
| * | | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge | Melanie | 2011-10-25 | 3 | -7/+7 | |
| |\ \ | |/ | ||||||
| | * | remove now redundant m_physical_prim flag from SOP.ApplyPhysics() | Justin Clark-Casey (justincc) | 2011-10-15 | 3 | -7/+7 | |
| | | | ||||||
| * | | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge | Melanie | 2011-10-25 | 2 | -1/+12 | |
| |\ \ | |/ | ||||||
| | * | Restore [Startup] physical_prim flag which can stop any prims being subject ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -1/+12 | |
| | | | | | | | | | | | | | | | to physics This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed. Default for this flag is true as previously. | |||||
| * | | Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+0 | |
| |\ \ | |/ | ||||||
| | * | remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -4/+0 | |
| | | | | | | | | | done immediately afterwards in DoPhysicsPropertyUpdate() | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |