aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-10-192-72/+100
| |\
* | \ Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-259-344/+319
|\ \ \ | |/ /
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ...Dan Lake2011-10-199-344/+319
* | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmergeMelanie2011-10-252-41/+118
|\ \ \ | | |/ | |/|
| * | Extend scripts stop/start/suspend/resume console commands to allow action on ...Justin Clark-Casey (justincc)2011-10-192-72/+100
| |/
| * Add "scripts stop" and "scripts start" console commands.Justin Clark-Casey (justincc)2011-10-191-2/+48
| * minor: improve command help on scripts suspend/resumeJustin Clark-Casey (justincc)2011-10-191-2/+5
* | Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmergeMelanie2011-10-252-22/+54
|\ \ | |/
| * Fix resume scripts.Justin Clark-Casey (justincc)2011-10-192-9/+33
* | Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmergeMelanie2011-10-252-4/+52
|\ \ | |/
| * Add "scripts suspend" and "scripts resume" commands.Justin Clark-Casey (justincc)2011-10-192-3/+53
* | Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * on log and "show scripts" messages, show script item UUID rather than asset UUIDJustin Clark-Casey (justincc)2011-10-191-4/+4
* | Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmergeMelanie2011-10-253-7/+31
|\ \ | |/
| * add current script status to "scripts show" command (running, suspended, etc.)Justin Clark-Casey (justincc)2011-10-193-7/+31
* | Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmergeMelanie2011-10-252-2/+28
|\ \ | |/
| * Add "show scripts" command to show all scripts currently known to the script ...Justin Clark-Casey (justincc)2011-10-192-2/+28
* | Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmergeMelanie2011-10-252-23/+46
|\ \ | |/
| * Add option to allow remote http calls to setpassword in the AuthenticationSer...Justin Clark-Casey (justincc)2011-10-192-23/+46
* | 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
* | 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
* | 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 Use...Justin Clark-Casey (justincc)2011-10-191-3/+3
* | Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmergeMelanie2011-10-251-3/+59
|\ \ | |/
| * Allow an http call to set account details if AllowSetAccount = true in [UserA...Justin Clark-Casey (justincc)2011-10-191-3/+59
* | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-253-7/+73
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the UserA...Justin Clark-Casey (justincc)2011-10-183-7/+73
* | 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
* | 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
|\ \ | |/
generated by cgit v1.1 at 2024-12-28 23:38:17 +0000