aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'Melanie Thielker2014-06-2110-27/+42
|\
| * BulletSim: create axis lock constraint with proper orientation andRobert Adams2013-04-021-4/+2
| | | | | | | | enable axis lock functionality.
| * BulletSim: update unmanaged API for HACD parameter passing. Bullet HACDRobert Adams2013-04-017-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 flowRobert Adams2013-04-011-15/+18
| | | | | | | | a little clearer.
| * Use Output instead of OutputFormat in appropriate places of XEngine status ↵Justin Clark-Casey (justincc)2013-04-021-2/+2
| | | | | | | | reporting.
* | Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e'Melanie Thielker2014-06-211-2/+1
|\ \ | |/
| * minor: Remove unnecessary call to GetAttachments() in ↵Justin Clark-Casey (justincc)2013-04-021-2/+0
| | | | | | | | AttachmentsModule.UpdateUserInventoryWithAttachment()
| * Fix what appears to be a bug in HGUserManagementModule where it enables on ↵Justin Clark-Casey (justincc)2013-04-021-2/+1
| | | | | | | | the base.Name rather than its own Name.
* | Merge commit '600087ab49e9489e37471ccfb7360ac14d31b7f2'Melanie Thielker2014-06-210-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-04-0213-203/+567
| |\
* | \ Merge commit '4153cfbf14132931b981168b7b3e7c5b8d5be8b5'Melanie Thielker2014-06-211-6/+6
|\ \ \ | |/ /
| * | Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is ↵Justin Clark-Casey (justincc)2013-04-021-6/+6
| | | | | | | | | | | | | | | | | | either not syntactical or unnecessary. May fix http://opensimulator.org/mantis/view.php?id=6593
* | | Merge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2'Melanie Thielker2014-06-2110-193/+493
|\ \ \ | | |/ | |/|
| * | BulletSim: stop an avatar from moving if standing on a stationaryRobert Adams2013-03-311-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 Adams2013-03-315-35/+43
| | |
| * | BulletSim: start the renaming of local variables to m_ form to match the ↵Robert Adams2013-03-311-23/+23
| | | | | | | | | | | | OpenSim coding conventions.
| * | BulletSim: fix line endings in BSActor*Robert Adams2013-03-312-291/+302
| | |
| * | BulletSim: convert BSDynamic to a BSActor and change BSPrim to setRobert Adams2013-03-315-112/+149
| | | | | | | | | | | | up the vehicle actor.
| * | BulletSim: Add physical 'actors' that operate on the physical object.Robert Adams2013-03-314-74/+311
| | | | | | | | | | | | Add first 'actor' for locked axis.
* | | Add forgotten fileMelanie Thielker2014-06-211-0/+249
| | |
* | | Differentiate between requests only the owner should be able to do and thoseMelanie Thielker2014-04-267-29/+29
| | | | | | | | | | | | that managers can do when setting parcel data
* | | Convert region loading to new formatMelanie Thielker2014-04-262-6/+8
| | |
* | | Allow opening a https port using only http so that nginx can be used for sslMelanie Thielker2014-04-263-18/+42
| | |
* | | minor: Remove unused System.Linq reference and use ParcelFlags.None instead ↵Justin Clark-Casey (justincc)2014-04-231-2/+1
| | | | | | | | | | | | of 0 from previous commit cb1f28
* | | Prevent sending Land Properties for unprivileged usersDev Random2014-04-231-5/+8
| | |
* | | Implement Oren's fix to prevent a privilege escalation with groupsMelanie Thielker2014-04-201-3/+6
| | |
* | | Change OfflineMessageModule to support more differentiated return values and ↵Melanie Thielker2014-04-061-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 Thielker2014-03-251-14/+16
| | | | | | | | | | | | the process of logging out.
* | | Remove the spammy "voice not enabled" message some viewers trigger in non ↵Melanie Thielker2014-03-251-4/+4
| | | | | | | | | | | | voice parcels
* | | Reinstate the timed region change signalMelanie Thielker2014-03-251-0/+4
| | |
* | | Add delete maptile ability to MapImageService - yet untestedMelanie Thielker2014-03-183-2/+92
| | |
* | | Minor: Add prentheses to make a condition clearerMelanie2014-01-151-2/+1
| | |
* | | Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-084-5/+19
| | |
* | | Fix exception when brokering HG asset idsMelanie Thielker2013-09-081-1/+7
| | |
* | | Harmonize the class name, ID and Name of the default perms moduleMelanie Thielker2013-09-084-11/+11
| | |
* | | Reinstate SecurePermissionsLoading functionality, default ONMelanie Thielker2013-09-081-24/+16
| | |
* | | Bring Core Groups up to current versionroot2013-09-0712-284/+504
| | |
* | | Add two argument constructor to GridInstantMessageroot2013-09-071-0/+18
| | |
* | | Add support for simple external CAPS texture servicesroot2013-09-071-19/+31
| | |
* | | Fix the root cause of keyframe motion region crossing offset - UpdateSceneObjectMelanie2013-08-252-23/+5
| | | | | | | | | | | | was being called twice on each crossing.
* | | * This fixes the border crossing offsets by storing the final keyframe ↵teravus2013-08-241-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 ↵teravus2013-08-243-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.. ↵teravus2013-08-241-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 ↵teravus2013-08-231-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 againMelanie2013-08-011-1/+1
| | |
* | | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| | |
* | | Allow coalesced objects to be rezzed even if they extend past the sim boundsMelanie2013-06-181-2/+6
| | |
* | | Forward the reason to the scriptMelanie2013-06-131-1/+1
| | |
* | | Add a result param to te money module interfaceMelanie2013-06-133-4/+7
| | |
* | | * This fixes having to select and deselect prim to get keyframemotion to ↵Melanie2013-06-133-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | start running when pulled from data storage. Conflicts: OpenSim/Data/SQLite/SQLiteSimulationData.cs