aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmergeMelanie2011-10-111-1/+1
|\
| * Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather...Justin Clark-Casey (justincc)2011-10-041-1/+1
* | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmergeMelanie2011-10-111-1/+16
|\ \ | |/
| * For llGetTexture(), if the face texture asset is in the inventory, return the...Justin Clark-Casey (justincc)2011-10-041-1/+16
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-034-12/+11
| |\
* | \ Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmergeMelanie2011-10-113-58/+51
|\ \ \ | |/ /
| * | Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)2011-10-033-63/+49
* | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmergeMelanie2011-10-114-11/+10
|\ \ \ | | |/ | |/|
| * | Remove usage of Linden packet types from inside Attachments Module and interfaceDan Lake2011-10-034-12/+11
| |/
* | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmergeMelanie2011-10-114-17/+1
|\ \ | |/
| * Remove unimplementated UpdateMovement() methods from SOG, SOP.Justin Clark-Casey (justincc)2011-10-014-17/+1
* | Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmergeMelanie2011-10-117-1640/+0
|\ \ | |/
| * Remove OpenSim.Region.Examples.SimpleModuleJustin Clark-Casey (justincc)2011-10-017-1634/+0
* | Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmergeMelanie2011-10-111-0/+41
|\ \ | |/
| * llGetLinkKey, llGetLinkName Fix for sitting AvatarPixel Tomsen2011-10-011-0/+41
* | Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmergeMelanie2011-10-111-1/+8
|\ \ | |/
| * Add ability to pass in the permissions option (perm) to save oar via RemoteAdminJustin Clark-Casey (justincc)2011-10-011-1/+8
* | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmergeMelanie2011-10-112-8/+14
|\ \ | |/
| * minor: remove clutter null check from pass in config to AvatarFactoryModule.I...Justin Clark-Casey (justincc)2011-10-012-8/+14
* | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-113-6/+55
|\ \ | |/
| * Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all...Justin Clark-Casey (justincc)2011-09-303-5/+54
* | 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-114-38/+69
|\ \ | |/
| * Added a setting to [Startup] section of config that will allow the simulator ...Kevin Houlihan & Michelle Argus2011-09-244-24/+58
* | 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 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmergeMelanie2011-10-111-14/+0
|\ \ | |/
| * remove unused SOP.Create() methodJustin Clark-Casey (justincc)2011-09-231-14/+0
* | 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 branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-221-5/+5
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-2112-90/+28
| | |\
* | | \ 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 '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
|\ \ | |/
generated by cgit v1.1 at 2024-12-16 18:01:52 +0000