aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmergeMelanie2011-10-113-0/+20
|\
| * llAvatarOnLinkSitTarget ImplementationPixel Tomsen2011-09-293-0/+20
* | Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmergeMelanie2011-10-111-0/+5
|\ \ | |/
| * Add en_US culture setting to the async delete to inventory thread, to avoid a...Justin Clark-Casey (justincc)2011-09-261-0/+5
* | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmergeMelanie2011-10-112-1/+14
|\ \ | |/
| * Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ar...Snoopy Pfeffer2011-09-252-2/+11
* | Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmergeMelanie2011-10-111-9/+0
|\ \ | |/
| * Remove the unimplented "clear assets" command.Justin Clark-Casey (justincc)2011-09-241-9/+0
* | Merge commit 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmergeMelanie2011-10-111-30/+0
|\ \ | |/
| * Removed uncalled region load method.Kevin Houlihan2011-09-241-30/+0
* | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmergeMelanie2011-10-116-38/+78
|\ \ | |/
| * Added a setting to [Startup] section of config that will allow the simulator ...Kevin Houlihan & Michelle Argus2011-09-246-24/+67
* | Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmergeMelanie2011-10-111-1/+11
|\ \ | |/
| * Don't try and resolve user account for authorization if the agent has come in...Justin Clark-Casey (justincc)2011-09-241-1/+11
* | Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmergeMelanie2011-10-111-14/+17
|\ \ | |/
| * Improve locking when access queue in EventQueueGetModuleJustin Clark-Casey (justincc)2011-09-241-14/+17
* | Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmergeMelanie2011-10-112-5/+13
|\ \ | |/
| * Clarify explanation of the "DeleteScriptsOnStartup" config switch and add thi...Justin Clark-Casey (justincc)2011-09-242-5/+13
* | Merge commit 'def74404f1ea6b2a0f479c602fd67bcfced41426' into bigmergeMelanie2011-10-111-0/+1
|\ \ | |/
| * make distribution creating code to copy FlotsamCache.ini.example to FlotsamCa...Justin Clark-Casey (justincc)2011-09-241-0/+1
* | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmergeMelanie2011-10-111-14/+0
|\ \ | |/
| * remove unused SOP.Create() methodJustin Clark-Casey (justincc)2011-09-231-14/+0
* | Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Correct asset id of library default iris texture.Justin Clark-Casey (justincc)2011-09-231-1/+1
* | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-118-109/+270
|\ \ | |/
| * Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-238-93/+270
* | Merge commit '41616cad09ad5a2936635dfca4caf38c89d00b38' into bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-221-5/+5
| |\
* | \ Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmergeMelanie2011-10-112-9/+18
|\ \ \ | |/ /
| * | Fix failure to teleport when an agent is lured on the same sim (and probably ...Justin Clark-Casey (justincc)2011-09-222-9/+18
* | | Merge commit '28a482a7ee2cebab1aa720477af175d7e26d702e' into bigmergeMelanie2011-10-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-2112-90/+28
| |\ \ | | |/
* | | Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmergeMelanie2011-10-111-5/+5
|\ \ \ | |/ /
| * | Commented out new debug statements in ScenePresenceDan Lake2011-09-211-5/+5
* | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-1112-90/+28
|\ \ \ | | |/ | |/|
| * | Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-2212-90/+28
| |/
* | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmergeMelanie2011-10-113-2/+203
|\ \ | |/
| * Move code which handles NPC movement into Scene so that this can also be used...Justin Clark-Casey (justincc)2011-09-213-1/+203
* | Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmergeMelanie2011-10-111-8/+0
|\ \ | |/
| * Remove unused and never set SP.PreviousRotationJustin Clark-Casey (justincc)2011-09-211-8/+0
* | Merge commit '572b680cb01a856f860b1e3fb40a7153a36113f2' into bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * get rid of an incredibly noisy logging message from the last commitJustin Clark-Casey (justincc)2011-09-211-1/+1
* | Merge commit 'c9c40343afb313ee6999c6dfb2663fb06bfac407' into bigmergeMelanie2011-10-110-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-212-12/+18
| |\
* | \ Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmergeMelanie2011-10-113-5/+110
|\ \ \ | |/ /
| * | When calling osNpcMoveTo(), rotate the avatar in the direction of travel.Justin Clark-Casey (justincc)2011-09-213-6/+115
* | | Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmergeMelanie2011-10-111-2/+4
|\ \ \ | | |/ | |/|
| * | Null simulation data must return a non-null region settings or other parts of...Dan Lake2011-09-201-2/+4
* | | Merge commit '7829b7a6019454b8e83497456bea81539c9a4234' into bigmergeMelanie2011-10-110-0/+0
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-203-66/+0
| |\ \ | | |/