| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | fix minor race condition in SOP.SitTargetPositionLL where inconsistency ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | could occur if the sit target position changed whilst the property was fetched | |||||
| | | * | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-04-02 | 22 | -231/+545 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | | | * | | | | | | | | | | minor: Make SOP.UpdateOffset() more consistent by checking against the same ↵ | Justin Clark-Casey (justincc) | 2013-04-03 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old OffsetPosition rather than one which may vary if it simultaneously changes. | |||||
| | | | * | | | | | | | | | | Fix minor race condition where SOP.GetGeometricCenter() and ↵ | Justin Clark-Casey (justincc) | 2013-04-02 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running No need to create new Vector3s since these are structs. | |||||
| * | | | | | | | | | | | | | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' | Melanie Thielker | 2014-06-21 | 10 | -27/+42 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | BulletSim: create axis lock constraint with proper orientation and | Robert Adams | 2013-04-02 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable axis lock functionality. | |||||
| | * | | | | | | | | | | | | BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD | Robert Adams | 2013-04-01 | 7 | -6/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mesh to hull conversion calls in place but code not working. Update BulletSim DLLs and SOs for new API and HACD code. | |||||
| | * | | | | | | | | | | | | BulletSim: rearrange mega-region terrain code to make the thread flow | Robert Adams | 2013-04-01 | 1 | -15/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a little clearer. | |||||
| | * | | | | | | | | | | | | Use Output instead of OutputFormat in appropriate places of XEngine status ↵ | Justin Clark-Casey (justincc) | 2013-04-02 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reporting. | |||||
| * | | | | | | | | | | | | | Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e' | Melanie Thielker | 2014-06-21 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | minor: Remove unnecessary call to GetAttachments() in ↵ | Justin Clark-Casey (justincc) | 2013-04-02 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AttachmentsModule.UpdateUserInventoryWithAttachment() | |||||
| | * | | | | | | | | | | | | Fix what appears to be a bug in HGUserManagementModule where it enables on ↵ | Justin Clark-Casey (justincc) | 2013-04-02 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the base.Name rather than its own Name. | |||||
| * | | | | | | | | | | | | | Merge commit '600087ab49e9489e37471ccfb7360ac14d31b7f2' | Melanie Thielker | 2014-06-21 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-04-02 | 13 | -203/+567 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '4153cfbf14132931b981168b7b3e7c5b8d5be8b5' | Melanie Thielker | 2014-06-21 | 1 | -6/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is ↵ | Justin Clark-Casey (justincc) | 2013-04-02 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | either not syntactical or unnecessary. May fix http://opensimulator.org/mantis/view.php?id=6593 | |||||
| * | | | | | | | | | | | | | | Merge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2' | Melanie Thielker | 2014-06-21 | 10 | -193/+493 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | BulletSim: stop an avatar from moving if standing on a stationary | Robert Adams | 2013-03-31 | 1 | -1/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object. This will stop avatars from sliding down steep terrains or objects while still allowing an avatar to be moved if standing on a moving object. | |||||
| | * | | | | | | | | | | | | | BulletSim: not quite functional axis lock code. | Robert Adams | 2013-03-31 | 5 | -35/+43 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | BulletSim: start the renaming of local variables to m_ form to match the ↵ | Robert Adams | 2013-03-31 | 1 | -23/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSim coding conventions. | |||||
| | * | | | | | | | | | | | | | BulletSim: fix line endings in BSActor* | Robert Adams | 2013-03-31 | 2 | -291/+302 | |
| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | BulletSim: convert BSDynamic to a BSActor and change BSPrim to set | Robert Adams | 2013-03-31 | 5 | -112/+149 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up the vehicle actor. | |||||
| | * | | | | | | | | | | | | | BulletSim: Add physical 'actors' that operate on the physical object. | Robert Adams | 2013-03-31 | 4 | -74/+311 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add first 'actor' for locked axis. | |||||
| * | | | | | | | | | | | | | | Add forgotten file | Melanie Thielker | 2014-06-21 | 1 | -0/+249 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Differentiate between requests only the owner should be able to do and those | Melanie Thielker | 2014-04-26 | 7 | -29/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that managers can do when setting parcel data | |||||
| * | | | | | | | | | | | | | Convert region loading to new format | Melanie Thielker | 2014-04-26 | 2 | -6/+8 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Allow opening a https port using only http so that nginx can be used for ssl | Melanie Thielker | 2014-04-26 | 3 | -18/+42 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | minor: Remove unused System.Linq reference and use ParcelFlags.None instead ↵ | Justin Clark-Casey (justincc) | 2014-04-23 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of 0 from previous commit cb1f28 | |||||
| * | | | | | | | | | | | | | Prevent sending Land Properties for unprivileged users | Dev Random | 2014-04-23 | 1 | -5/+8 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Implement Oren's fix to prevent a privilege escalation with groups | Melanie Thielker | 2014-04-20 | 1 | -3/+6 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Change OfflineMessageModule to support more differentiated return values and ↵ | Melanie Thielker | 2014-04-06 | 1 | -8/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow support for mobile devices and other non-viewer logins | |||||
| * | | | | | | | | | | | | | Guard against Scene being null in attachments it the wearing avatar is in ↵ | Melanie Thielker | 2014-03-25 | 1 | -14/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the process of logging out. | |||||
| * | | | | | | | | | | | | | Remove the spammy "voice not enabled" message some viewers trigger in non ↵ | Melanie Thielker | 2014-03-25 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | voice parcels | |||||
| * | | | | | | | | | | | | | Reinstate the timed region change signal | Melanie Thielker | 2014-03-25 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Add delete maptile ability to MapImageService - yet untested | Melanie Thielker | 2014-03-18 | 3 | -2/+92 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Minor: Add prentheses to make a condition clearer | Melanie | 2014-01-15 | 1 | -2/+1 | |
| | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Mono 2.0 fix - call ToArray() explicitly | Melanie | 2013-09-08 | 4 | -5/+19 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix exception when brokering HG asset ids | Melanie Thielker | 2013-09-08 | 1 | -1/+7 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Harmonize the class name, ID and Name of the default perms module | Melanie Thielker | 2013-09-08 | 4 | -11/+11 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Reinstate SecurePermissionsLoading functionality, default ON | Melanie Thielker | 2013-09-08 | 1 | -24/+16 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Bring Core Groups up to current version | root | 2013-09-07 | 12 | -284/+504 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add two argument constructor to GridInstantMessage | root | 2013-09-07 | 1 | -0/+18 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add support for simple external CAPS texture services | root | 2013-09-07 | 1 | -19/+31 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Fix the root cause of keyframe motion region crossing offset - UpdateSceneObject | Melanie | 2013-08-25 | 2 | -23/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was being called twice on each crossing. | |||||
| * | | | | | | | | | | | | * This fixes the border crossing offsets by storing the final keyframe ↵ | teravus | 2013-08-24 | 1 | -2/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper. | |||||
| * | | | | | | | | | | | | * Fix a null ref that causes a stack unwind when crossing borders. Less ↵ | teravus | 2013-08-24 | 3 | -11/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work. | |||||
| * | | | | | | | | | | | | Revert "* This increases accuracy when border crossing (the reason is.. ↵ | teravus | 2013-08-24 | 1 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop." This reverts commit 55400ff7be55b1c8dbededca68e6fce42cd6ce0f. | |||||
| * | | | | | | | | | | | | * This increases accuracy when border crossing (the reason is.. the border ↵ | teravus | 2013-08-23 | 1 | -7/+7 | |
| | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop. | |||||
| * | | | | | | | | | | | Make attachment state load work again | Melanie | 2013-08-01 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / / / |/| | | | | | | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |