summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-19MAINT-2506 added viewer support for PERMISSION_SILENT_ESTATE_MANAGEMENT and ↵Maestro Linden
PERMISSION_OVERRIDE_ANIMATIONS. Reviewed by Simon.
2013-03-18MAINT-2497 FIX (Viewer) - viewer side change that goes with server side fix ↵callum_linden
- adds direction when you set a TP landing point
2013-03-14Fix mismerge losing rollback changeGraham Madarasz
2013-03-14MergeGraham Madarasz (Graham Linden)
2013-03-14Rollback Maestro interp changesGraham Madarasz (Graham Linden)
2013-03-14Rollback fix for Maestro 'Jitter Bug' which is causing issues elsewhereGraham Madarasz (Graham Linden)
2013-03-14Fix for broken LoD.Dave Parks
Reviewed by Graham.
2013-03-13Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-03-13MergeDave Parks
2013-03-13MAINT-2410 Remove unused particle packing code and fix integration test to ↵Dave Parks
work without a packer.
2013-03-13Resurrect merge victim...restoring ll_memcpy_nonaliased_aligned_16 definitionGraham Madarasz (Graham Linden)
2013-03-13MergeGraham Madarasz (Graham Linden)
2013-03-13MergeGraham Madarasz (Graham Linden)
2013-03-13MergeDave Parks
2013-03-13MAINT-2410 Extra Particle Parameters -- viewer implementationDave Parks
Reviewed by Kelly and Graham
2013-03-13Cleanup per code review of prev change with DavePGraham Madarasz (Graham Linden)
2013-03-13Move fast memcpy to llcommon and use it in llalignedarray pushback on all ↵Graham Madarasz (Graham Linden)
platforms. Code Review: DaveP
2013-03-13build fixAlexanderP ProductEngine
2013-03-12Mods to make compile on gcc 4.6.3 work mo bettaGraham Madarasz
2013-03-12Fix linux_crash_logger freetype fail (now finds prebuilts as it should)Graham Madarasz
2013-03-12Merged lindenlab/viewer-cat into defaultgraham linden
2013-03-12Restore cmake to use 10.6 hacked locally to 10.8 of which TC does not approveGraham Madarasz (Graham Linden)
2013-03-12CHUI-847 Fixed [CHUIBUG]Collapse Participant List, operates on all torn off ↵AlexanderP ProductEngine
chats: make flag mIsPartListExpanded for saving of the participant list panel expand/collapse state
2013-03-12CHUI-831 Minimized conversation floater is not opened with Open Conversation ↵AlexanderP ProductEngine
Window preference if conversation receiving message is selected : force unminimized of the session's floater
2013-03-12Pull merge from lindenlab/viewer-chuiMerov Linden
2013-03-12CHUI-845 : Avoid some xml param parsing error that seems to be linked with ↵Merov Linden
crashers
2013-03-12Merge pragma warning hack to fix linux buildGraham Madarasz (Graham Linden)
2013-03-12Fix for linux (and likely other platform) shutdown crash from mismatched ↵Graham Madarasz
alloc/free in VBOPool client data
2013-03-12Better compat with non-Ubuntu distros (bare typedef sometimes conflicts with ↵Graham Madarasz
OS decl of same).
2013-03-12Fix eol at eof on wl param files.Graham Madarasz (Graham Linden)
2013-03-12Remove pragma diags which ALSO cause gcc-4.1 to warning and thus error out. ↵Graham Madarasz (Graham Linden)
*sigh*
2013-03-12Fix -Wno-uninitialized disableGraham Madarasz (Graham Linden)
2013-03-12CMake hack to work around gcc-4.1 lack of pragma warning disable processing.Graham Madarasz (Graham Linden)
2013-03-12Disable more warnings to try to get llface.cpp to compile in the TC linux farmGraham Madarasz (Graham Linden)
2013-03-12Add pragma warning disable for linux only to work-around spurious used ↵Graham Madarasz (Graham Linden)
before set warnings from GCC 4.3.4 on Vector4a with empty ctor
2013-03-11Pull merge from lindenlab/viewer-chuimerov
2013-03-11CHUI-793 : Fixed! Introduced ChatLoadGroupTimeout and ↵merov
ChatLoadGroupMaxMembers to mitigate slow group loading.
2013-03-11mergeGilbert Gonzales
2013-03-12CHUI-846 FIXED [crashhunters] crash in LLFontGL::maxDrawableCharsmaksymsproductengine
2013-03-12CHUI-809 FIXED Changes in menu items to make them consistent. Do not start ↵Mnikolenko ProductEngine
IM if selected person is self.
2013-03-12mergemberezhnoy
2013-03-11CHUI-810 : Merged Marine Kelley's patch on selected text and use of return ↵merov_linden
key in chat
2013-03-11CHUI-778: Adjusted text in prompts for deleting chat log and chat ↵Gilbert Gonzales
transcripts (per UX).
2013-03-11Clean up moving llalignedarray and fast memcpy to llcommonGraham Madarasz
2013-03-11Move 16b aligned memcpy and alignment utilities to llmem in llcommon for ↵Graham Madarasz
easier use elsewhere
2013-03-11Work around bogus gcc 4.3.4 warning from alignment assertGraham Madarasz (Graham)
2013-03-11Work around 'interesting' forced include order in vmath stuff on WindowsGraham Madarasz
2013-03-11Merged vwr-cat..#$%$% whitespace diffsGraham Madarasz
2013-03-11MergeGraham Madarasz