aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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 '246443773ae52420092b483603d0e1daf9b87f00' into bigmergeMelanie2011-10-111-0/+9
|\ \ | |/
| * minor: remove clutter null check from pass in config to AvatarFactoryModule.I...Justin Clark-Casey (justincc)2011-10-011-0/+9
* | 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 '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-111-2/+5
|\ \ | |/
| * Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-231-2/+5
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-09-214-7/+16
| |\
* | \ 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-114-7/+16
|\ \ \ | | |/ | |/|
| * | Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-224-7/+16
| |/
* | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmergeMelanie2011-10-112-1/+202
|\ \ | |/
| * Move code which handles NPC movement into Scene so that this can also be used...Justin Clark-Casey (justincc)2011-09-212-0/+202
* | Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmergeMelanie2011-10-111-8/+0
|\ \ | |/
| * Remove unused and never set SP.PreviousRotationJustin Clark-Casey (justincc)2011-09-211-8/+0
| * get rid of an incredibly noisy logging message from the last commitJustin Clark-Casey (justincc)2011-09-211-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-211-10/+14
| |\
* | \ Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmergeMelanie2011-10-111-1/+16
|\ \ \ | |/ /
| * | When calling osNpcMoveTo(), rotate the avatar in the direction of travel.Justin Clark-Casey (justincc)2011-09-211-2/+21
* | | Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmergeMelanie2011-10-111-9/+13
|\ \ \ | | |/ | |/|
| * | Make debug statements in ScenePresence consistent and add a few moreDan Lake2011-09-201-10/+14
| |/
* | Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmergeMelanie2011-10-111-0/+4
|\ \ | |/
| * On setting a new avatar appearance, if height hasn't changed then don't set t...Justin Clark-Casey (justincc)2011-09-171-0/+4
* | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmergeMelanie2011-10-111-0/+10
|\ \ | |/
| * Stop the avatar stalling on its first boarder cross when using the ODE pluginJustin Clark-Casey (justincc)2011-09-161-0/+10
* | Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmergeMelanie2011-10-111-0/+4
|\ \ | |/
| * minor: I was wrong about OffsetPosition - sometimes it genuinely does return ...Justin Clark-Casey (justincc)2011-09-161-0/+4
* | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmergeMelanie2011-10-113-6/+23
|\ \ | |/
| * Remove setter from SP.OffsetPosition, since all sets should flow through SP.A...Justin Clark-Casey (justincc)2011-09-162-5/+23
* | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-112-1/+17
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue 50...Kevin Houlihan2011-09-162-1/+17
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-82/+0
|\ \ | |/
| * Correctly create a freshly created estate owner's default items and avatar en...Justin Clark-Casey (justincc)2011-09-161-82/+0
* | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmergeMelanie2011-10-111-0/+1
|\ \ | |/
| * Write code to create minimum necessary body parts/clothing and avatar entries...Justin Clark-Casey (justincc)2011-09-151-0/+1
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-115-39/+49
|\ \ | |/
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle...Justin Clark-Casey (justincc)2011-09-155-38/+38
| * Only bother to create an inventory xfer file if there are any items in a prim...Justin Clark-Casey (justincc)2011-09-151-2/+2
| * Shuffle order of code in invnetory connector GetFolderContent() calls to avoi...Justin Clark-Casey (justincc)2011-09-151-1/+1
* | Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmergeMelanie2011-10-111-0/+11
|\ \ | |/
| * If a prim inventory becomes empty through deletion, send an empty xfer file n...Justin Clark-Casey (justincc)2011-09-151-20/+43
* | Fixed a movement regression - Kitto's jump code is no longer needed (plus it'...Tom2011-09-141-37/+9
* | Bring us up to date.Tom2011-09-1414-181/+373
|\ \ | |/
| * Don't try and delete attachments for child agent closeJustin Clark-Casey (justincc)2011-09-131-1/+2