aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmergeMelanie2011-10-112-6/+23
|\
| * Stop the avatar stalling on its first boarder cross when using the ODE pluginJustin Clark-Casey (justincc)2011-09-162-6/+23
* | 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-114-7/+24
|\ \ | |/
| * Remove setter from SP.OffsetPosition, since all sets should flow through SP.A...Justin Clark-Casey (justincc)2011-09-162-5/+23
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-09-161-1/+2
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimjustincc2011-09-161-1/+4
| | |\
* | | \ Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmergeMelanie2011-10-111-91/+88
|\ \ \ \ | |/ / /
| * | | Updated some variables to be closer to the coding standards (and easier to un...Kevin Houlihan2011-09-161-91/+88
| | |/ | |/|
* | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmergeMelanie2011-10-111-1/+2
|\ \ \ | | |/ | |/|
| * | Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-161-1/+2
* | | Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmergeMelanie2011-10-111-1/+4
|\ \ \ | | |/ | |/|
| * | Passwords could be revealed in console by pressing backspace.Kevin Houlihan2011-09-161-1/+4
| |/
* | Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmergeMelanie2011-10-113-7/+71
|\ \ | |/
| * MSSQL Bug fix in user account retrieval, plus migrations for FriendsStore and...Chris Hart2011-09-163-7/+71
* | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-118-146/+267
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue 50...Kevin Houlihan2011-09-168-146/+267
* | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmergeMelanie2011-10-112-4/+14
|\ \ | |/
| * Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-162-4/+14
* | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmergeMelanie2011-10-112-45/+52
|\ \ | |/
| * refactor: move estate owner setup code into separate methodJustin Clark-Casey (justincc)2011-09-162-45/+52
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-114-93/+67
|\ \ | |/
| * Correctly create a freshly created estate owner's default items and avatar en...Justin Clark-Casey (justincc)2011-09-164-94/+68
* | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmergeMelanie2011-10-113-8/+147
|\ \ | |/
| * Write code to create minimum necessary body parts/clothing and avatar entries...Justin Clark-Casey (justincc)2011-09-153-8/+147
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-118-44/+54
|\ \ | |/
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle...Justin Clark-Casey (justincc)2011-09-158-43/+43
| * 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
* | Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmergeMelanie2011-10-112-12/+18
|\ \ | |/
| * Shuffle order of code in invnetory connector GetFolderContent() calls to avoi...Justin Clark-Casey (justincc)2011-09-153-13/+19
* | 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
* | Fix a rather stupid VS warning "The operation overflows at compile time in ch...Tom2011-09-141-3/+3
* | Bring us up to date.Tom2011-09-1447-623/+1314
|\ \ | |/
| * Don't try and delete attachments for child agent closeJustin Clark-Casey (justincc)2011-09-132-1/+34
| * Remove code from DetachSingleAttachmentToInv() that sets group changed on all...Justin Clark-Casey (justincc)2011-09-131-11/+0
| * remove redunant itemID and agentID arguments from UpdateKnownItem().Justin Clark-Casey (justincc)2011-09-131-6/+4
| * Remove UpdateKnownItem() from IAttachmentsModule.Justin Clark-Casey (justincc)2011-09-132-10/+1
| * minor: remove redundant grp != null check from AM.UpdateKnownItem()Justin Clark-Casey (justincc)2011-09-131-36/+33
| * Stop attempts to rewear already worn items from removing and reattaching.Justin Clark-Casey (justincc)2011-09-134-44/+97
| * Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID ...Justin Clark-Casey (justincc)2011-09-133-13/+47
| * stop the duplicate remove of the root part ids from the full part and local p...Justin Clark-Casey (justincc)2011-09-132-3/+1
| * extend TestGetSceneObjectByPartLocalId() to test state after scene object del...Justin Clark-Casey (justincc)2011-09-131-0/+6
| * In SG.AddSceneObject(), stop unnecessarily adding the root part to object ind...Justin Clark-Casey (justincc)2011-09-131-7/+5
| * Add new TestGetSceneObjectByPartLocalId() for retrieving a scene object via t...Justin Clark-Casey (justincc)2011-09-131-0/+27
| * improve TestAddSceneObject() to test a multi-part object rather than a single...Justin Clark-Casey (justincc)2011-09-131-11/+14
| * In an object return message, send a null-terminated empty string in binary bu...Justin Clark-Casey (justincc)2011-09-132-3/+43
| * eliminate redundant SP.m_regionInfo since it always has the scene.Justin Clark-Casey (justincc)2011-09-121-8/+6