aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-233-3/+74
|\
| * Revert "Fix issue where sitting on non-root linked prims would send camera to...Justin Clark-Casey (justincc)2013-11-231-7/+2
| * Revert "Add line accidentally left out of recent non-root prim sit fix"Justin Clark-Casey (justincc)2013-11-231-2/+0
| * Revert "Fix non-root prim sit positions for prims where a sit target has been...Justin Clark-Casey (justincc)2013-11-231-1/+1
| * Revert "Refix fix for sitting on non-root linked prims with explicit sit targ...Justin Clark-Casey (justincc)2013-11-231-1/+1
| * Revert "fix avatar rotation when sitting on a linked part"Justin Clark-Casey (justincc)2013-11-231-1/+1
| * fix avatar rotation when sitting on a linked partJustin Clark-Casey (justincc)2013-11-231-1/+1
| * Refix fix for sitting on non-root linked prims with explicit sit targets.Justin Clark-Casey (justincc)2013-11-231-1/+1
| * Fix non-root prim sit positions for prims where a sit target has been specifi...Justin Clark-Casey (justincc)2013-11-231-1/+1
| * Add line accidentally left out of recent non-root prim sit fixJustin Clark-Casey (justincc)2013-11-231-0/+2
| * Fix issue where sitting on non-root linked prims would send camera to wrong p...Justin Clark-Casey (justincc)2013-11-231-2/+7
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-152-3/+3
| * Fix bug where removing a physical linkset would only decrement the Active Obj...Justin Clark-Casey (justincc)2013-11-132-2/+73
* | Merge branch 'master' into careminsterMelanie2013-11-036-83/+186
|\ \ | |/
| * After finishing to edit an attachment, let other avatars see the changes. (Th...Oren Hurvitz2013-10-172-8/+4
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-153-72/+158
| * Made terrain uploads thread-safeOren Hurvitz2013-10-151-0/+5
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-10-062-2/+24
|\ \
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it sho...teravus2013-10-051-1/+3
| * | Merge branch 'master' of careminster:/var/git/careminsterteravus2013-10-0411-88/+251
| |\ \
| * \ \ Merge branch 'master' of careminster:/var/git/careminsterteravus2013-09-166-25/+26
| |\ \ \
| * | | | * This fixes the border crossing offsets by storing the final keyframe locati...teravus2013-09-161-2/+22
* | | | | Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
* | | | Merge branch 'master' into careminsterMelanie2013-10-0411-88/+251
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | minor: Disable logging left active on regression test TestSameSimulatorIsolat...Justin Clark-Casey (justincc)2013-09-271-1/+1
| * | refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ...Justin Clark-Casey (justincc)2013-09-274-12/+12
| * | refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ...Justin Clark-Casey (justincc)2013-09-274-29/+17
| * | minor: Add scene name to baked textures in cache log messageJustin Clark-Casey (justincc)2013-09-261-1/+1
| * | Reinsert client.SceneAgent checks into LLUDPServer.HandleCompleteMovementInto...Justin Clark-Casey (justincc)2013-09-251-0/+3
| * | Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-222-0/+21
| * | Lock around read/write of ScenePresence.m_originRegionID to make sure that al...Justin Clark-Casey (justincc)2013-09-201-5/+33
| * | Change some message log levels in Scene.IncomingUpdateChildAgent() for debugg...Justin Clark-Casey (justincc)2013-09-201-3/+3
| * | UUID Gatherer: find assets used in Light Projection, Particle Systems, and Co...Oren Hurvitz2013-09-191-1/+14
| * | For debug purposes, allow simulators to force use of earlier SIMULATION/0.1 t...Justin Clark-Casey (justincc)2013-09-191-1/+1
| * | minor: Make SP.MakeRootAgent() private - no external code has any business ca...Justin Clark-Casey (justincc)2013-09-191-1/+1
| * | minor: Make log message at top of ScenePresence.CompleteMovement info level a...Justin Clark-Casey (justincc)2013-09-191-5/+5
| * | Revert "Also check user authorization if looking to upgrade from a child to a...Justin Clark-Casey (justincc)2013-09-191-13/+0
| * | Create regression TestCrossOnSameSimulatorNoRootDestPerm() to check that avat...Justin Clark-Casey (justincc)2013-09-192-1/+88
| * | minor: correct method name in commentJustin Clark-Casey (justincc)2013-09-181-1/+1
| * | refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent()Justin Clark-Casey (justincc)2013-09-182-6/+7
| * | minor: Make log message when Scene.IncomingChildAgentDateUpdate() more explic...Justin Clark-Casey (justincc)2013-09-182-4/+12
| * | Reinsert comments about possible race conditions when sending bulk inventory ...Justin Clark-Casey (justincc)2013-09-161-0/+3
| * | BulletSim: remove chatty debug message from previous commit.Robert Adams2013-09-111-3/+3
| * | BulletSim: add position and rotation update for child prim physics update eve...Robert Adams2013-09-111-0/+20
| * | Change collision logic in SceneObjectPart so land_collision will happen.Robert Adams2013-09-091-6/+3
* | | Merge branch 'avination-current' into careminsterMelanie2013-09-167-26/+27
|\ \ \ | |_|/ |/| |
| * | Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-082-4/+6
| * | Harmonize the class name, ID and Name of the default perms moduleMelanie Thielker2013-09-083-8/+8
| * | Fix the root cause of keyframe motion region crossing offset - UpdateSceneObjectMelanie2013-08-252-23/+5