aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | 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
* | 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 w...Justin Clark-Casey (justincc)2011-10-176-28/+16
* | Merge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmergeMelanie2011-10-251-3/+17
|\ \ | |/
| * Add avatar names to debug packet outputJustin Clark-Casey (justincc)2011-10-171-2/+2
* | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmergeMelanie2011-10-253-13/+14
|\ \ | |/
| * refactor: Use SOP.SitTargetAvatar instead of calling a special GetAvatarOnSit...Justin Clark-Casey (justincc)2011-10-173-11/+10
* | 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 und...Justin Clark-Casey (justincc)2011-10-171-1/+1
* | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmergeMelanie2011-10-256-2/+48
|\ \ | |/
| * Implement osNpcStand(<npc-id>)Justin Clark-Casey (justincc)2011-10-176-2/+48
| * 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
|\ \ \ | |/ /
| * | Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-1710-5/+75
* | | 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
* | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmergeMelanie2011-10-256-17/+8
|\ \ | |/
| * move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t...Justin Clark-Casey (justincc)2011-10-156-17/+8
* | MergeMelanie2011-10-252-3/+1
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-257-45/+24
|\ \ | |/
| * fetch physical_prim switch from [Startup] config from inside scene, as is don...Justin Clark-Casey (justincc)2011-10-157-48/+23
* | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmergeMelanie2011-10-253-7/+7
|\ \ | |/
| * remove now redundant m_physical_prim flag from SOP.ApplyPhysics()Justin Clark-Casey (justincc)2011-10-153-7/+7
* | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmergeMelanie2011-10-252-1/+12
|\ \ | |/
| * Restore [Startup] physical_prim flag which can stop any prims being subject t...Justin Clark-Casey (justincc)2011-10-152-1/+12
* | Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmergeMelanie2011-10-251-4/+0
|\ \ | |/
| * remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ...Justin Clark-Casey (justincc)2011-10-151-4/+0
* | Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmergeMelanie2011-10-251-27/+21
|\ \ | |/
| * refactor: Remove redundant code in SOP.UpdatePrimFlags()Justin Clark-Casey (justincc)2011-10-151-27/+21
* | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmergeMelanie2011-10-253-11/+19
|\ \ | |/
| * factor common code out into SOP.RemoveFromPhysics()Justin Clark-Casey (justincc)2011-10-153-11/+19
* | Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmergeMelanie2011-10-252-53/+36
|\ \ | |/
| * reduce access to ODECharacter methods to make code analysis easier. Eliminat...Justin Clark-Casey (justincc)2011-10-152-54/+36
* | Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmergeMelanie2011-10-251-19/+17
|\ \ | |/
| * restrict unnecessary access levels on ODEPrim fields/propertiesJustin Clark-Casey (justincc)2011-10-151-19/+17
generated by cgit v1.1 at 2024-11-17 16:44:40 +0000