aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Add option to allow remote http calls to setpassword in the ↵Justin Clark-Casey (justincc)2011-10-192-23/+46
| | | | | | | | | | | | | | AuthenticationService. This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini Default is false as before.
* | Merge commit 'fe484ab331871e1419ee78afefca7c8856e2dfb4' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Slightly change log message in LoadRegionsPluginJustin Clark-Casey (justincc)2011-10-191-1/+1
| |
* | Merge commit '178b8d0926a53d82f54d60c088f36c7bad13dc87' into bigmergeMelanie2011-10-251-1/+13
|\ \ | |/
| * Region-UUID - can not be zero-uuidPixel Tomsen2011-10-191-1/+13
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3426
* | Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmergeMelanie2011-10-251-11/+6
|\ \ | |/
| * Make ScopeID optional for http GetAccount and GetAccountsJustin Clark-Casey (justincc)2011-10-191-11/+6
| | | | | | | | If not specified then it assumes UUID.Zero. as occurs elsewhere in the codebase
* | Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmergeMelanie2011-10-251-0/+6
|\ \ | |/
| * Make PrincipalID a synonym for UserID in GetUserAccountJustin Clark-Casey (justincc)2011-10-191-0/+6
| |
* | Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmergeMelanie2011-10-251-3/+3
|\ \ | |/
| * Get new NewUser and SetUserAccount calls to accept PrincipalID instead of ↵Justin Clark-Casey (justincc)2011-10-191-3/+3
| | | | | | | | UserID for consistency with output
* | Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmergeMelanie2011-10-251-3/+59
|\ \ | |/
| * Allow an http call to set account details if AllowSetAccount = true in ↵Justin Clark-Casey (justincc)2011-10-191-3/+59
| | | | | | | | | | | | [UserAccountService]. As before, default is false to not allow these calls.
* | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-253-7/+73
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the ↵Justin Clark-Casey (justincc)2011-10-183-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 bigmergeMelanie2011-10-251-0/+6
|\ \ | |/
| * Temporarily put in log lines to record time taken to set terrain in OdeScene.Justin Clark-Casey (justincc)2011-10-181-0/+6
| |
* | Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmergeMelanie2011-10-252-2/+10
|\ \ | |/
| * Store scene identifier passed in to OdeScene for later debug messagesJustin Clark-Casey (justincc)2011-10-182-2/+10
| |
* | Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmergeMelanie2011-10-251-16/+13
|\ \ | |/
| * Don't bother taking OdeLock during OdeScene construction, since there can be ↵Justin Clark-Casey (justincc)2011-10-181-16/+13
| | | | | | | | no contention until the object is constructed.
* | Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmergeMelanie2011-10-251-18/+13
|\ \ | |/
| * Remove unnecessary lock of OdeLock in OdePrim.changeadd()Justin Clark-Casey (justincc)2011-10-181-18/+13
| | | | | | | | This taint can only ever be processed from the OdeScene.Simulate() loop, which already locks OdeLock.
* | Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmergeMelanie2011-10-252-1/+3
|\ \ | |/
| * minor: method doc to explain a lock of OdeLockJustin Clark-Casey (justincc)2011-10-182-1/+3
| |
* | Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmergeMelanie2011-10-254-97/+81
|\ \ | |/
| * Remove the unused CollisionLocker from ODEJustin Clark-Casey (justincc)2011-10-184-97/+81
| | | | | | | | Despite its name, this wasn't actually being used in any collision checking
* | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmergeMelanie2011-10-252-6/+11
|\ \ | |/
| * Allow an avatar to be explicitly named to the "debug packet" commandJustin Clark-Casey (justincc)2011-10-172-6/+11
| |
* | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmergeMelanie2011-10-256-28/+16
|\ \ | |/
| * refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter ↵Justin Clark-Casey (justincc)2011-10-176-28/+16
| | | | | | | | without a getter
* | Merge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmergeMelanie2011-10-251-3/+17
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Add avatar names to debug packet outputJustin Clark-Casey (justincc)2011-10-171-2/+2
| |
* | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmergeMelanie2011-10-253-13/+14
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * refactor: Use SOP.SitTargetAvatar instead of calling a special ↵Justin Clark-Casey (justincc)2011-10-173-11/+10
| | | | | | | | GetAvatarOnSitTarget() which returned exactly the same thing
* | Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * rename OS_NPC_SIT_IMMEDIATE to OS_NPC_SIT_NOW since it's shorter and more ↵Justin Clark-Casey (justincc)2011-10-171-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 bigmergeMelanie2011-10-256-2/+48
|\ \ | |/
| * Implement osNpcStand(<npc-id>)Justin Clark-Casey (justincc)2011-10-176-2/+48
| | | | | | | | Allows you to stand an NPC that has sat.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-171-1/+0
| |\
* | \ Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-2511-15/+74
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-1710-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 bigmergeMelanie2011-10-251-1/+0
|\ \ \ | | |/ | |/|
| * | Bug fix on the bug fix on UserAccountService.csDiva Canto2011-10-161-1/+0
| |/
* | Merge commit 'bbd0e68c06b79acf0781d78e81fa292f549d676b' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Guard HGAssetService against uninitialized variables and null arguments.Diva Canto2011-10-151-0/+3
| |
* | Merge commit 'b9930a6305e9c8bb9197fc9dc49219f4fb7ff32c' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * improve method doc on Scene.OtherRegionUp()Justin Clark-Casey (justincc)2011-10-151-4/+4
| | | | | | | | this is really just to trigger panda.
* | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmergeMelanie2011-10-256-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-156-17/+8
| | | | | | | | the others
generated by cgit v1.1 at 2024-12-20 22:12:14 +0000