summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-14Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui.William Todd Stinson
2012-12-14Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-12-14CHUI-549: Updating the conversations floater according to specs.William Todd Stinson
2012-12-14mergiing in latest changesGilbert Gonzales
2012-12-14CHUI-520: Now when have a P2P conversation torn off a voice indicator icon ↵Gilbert Gonzales
will be displayed allowing the user to adjust the voice volume when clicked. Also did a code cleanup on conversationview.h/cpp which was showing the speaking indicator icon too soon when joining another voice session. This was due to calling switchIndicator(..) directly inside ::onCurrentVoiceSessionChanged. The proper solution is to wait for SpeeakingIndicatorManager::switchSpeakerIndicators() call switchIndicators().
2012-12-14CHUI-554: Updating the people panel according to specs.William Todd Stinson
2012-12-14Automated mergeDon Kjer
2012-12-14CHUI-599 : Use the account name in all places that are not UI related but ↵Merov Linden
use avatar names to index, search and other code only uses.
2012-12-14CHUI-595: Updating the people panel according to specs.William Todd Stinson
2012-12-14BOOL vs bool FIGHTAura Linden
2012-12-14Reverting back to 32-bit colordepth requirement on linuxDon Kjer
2012-12-14Updating shaders to not crash when compiled in llvmDon Kjer
2012-12-14MAINT-2121 Fixed case where changing other parcel option disables 'Show ↵Maestro Linden
place in search'. Reviewed by Simon.
2012-12-14Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-12-14merge changes for DRTVWR-224Oz Linden
2012-12-14tag merge of DRTVWR-224Oz Linden
2012-12-14CHUI-566 Flashing and color on Conversations FUI button and conversation ↵AlexanderP ProductEngine
line item
2012-12-14mergeMaximB ProductEngine
2012-12-13CHUI-599 : Fixed : Avatar name provides now a method to get the regular ↵Merov Linden
account name.
2012-12-13Fixes from Oz's merge.Aura Linden
2012-12-13Pull merge from richard/viewer-chuiMerov Linden
2012-12-14Attempt at fixing linux shader support on ubuntu 12.04Don Kjer
2012-12-13CHUI-574, CHUI-575 : Fixed inventory regressions : select the first filtered ↵Merov Linden
item when searching the inventory, simply made the folder selection secondary to item selection.
2012-12-13CHUI-595, CHU-554: Updating the people panel to new specs.William Todd Stinson
2012-12-13Merged SH-3339 work with sunshine-internal. Still a WIP.Logan Dethrow
2012-12-13MAINT-2123 remove WARNINGS about unknown local_id in KillObject messageAndrew Meadows
We now ignore unkown local_id's in KillObject. Reviewed with davep.
2012-12-13merge fixes from 3.4.3-beta3Oz Linden
2012-12-13Added tag 3.4.3-beta3 for changeset 870e2d79e006Oz Linden
2012-12-13WIP SH-3339. Commit to merge from trunk to get build fixes, etc.Logan Dethrow
2012-12-13Fix for SH-3591.prep@lindenlab.com
2012-12-13merge changes for DRTVWR-267Oz Linden
2012-12-13tag merge of DRTVWR-267Oz Linden
2012-12-13merge changes for DRTVWR-244Oz Linden
2012-12-13tag merge of DRTVWR-244Oz Linden
2012-12-13Fixed whitespace issues for merge.Aura Linden
2012-12-13MAINT-2109 Added ATTACH_NECK and ATTACH_AVATAR_CENTER definitions for LSL ↵Maestro Linden
scripts and script information floater. Reviewed by Andrew.
2012-12-13merge changes for DRTVWR-266Oz Linden
2012-12-13tag merge of DRTVWR-266Oz Linden
2012-12-13Removed tag 3.4.3-releaseOz Linden
2012-12-13merge changes for DRTVWR-265Oz Linden
2012-12-13tag merge of DRTVWR-265Oz Linden
2012-12-13Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-12-13Fix line endings.Kelly Washington
2012-12-13merging in latest changesGilbert Gonzales
2012-12-13MAINT-1995 Names of banned and allowed residents are not shown in Access tab ↵Kelly Washington
of the About Land dialog Code by Richard, reviewed by merov and kelly
2012-12-13Fixed path for correct assembly of the projectAlexanderP ProductEngine
2012-12-12CHUI-499: Refactoring the persistent notification storage so that I can ↵William Todd Stinson
reuse the functionality for do-not-disturb mode.
2012-12-12CHUI-526: Slight bug fix. Problem was that the 'Teleport Offer' sound was ↵Gilbert Gonzales
turn on by default when the user cleared their settings. Resolution: Inside settings.xml changed the PlaySoundTeleportOffer to no longer have an intial value of 1 (true). Now it is 0 (false).
2012-12-12CHUI-545: Minor logic fix, inside ::switchIndicator(), make sure that in the ↵Gilbert Gonzales
case that the parent is visible and the parent makes the visibility changes...that mIndicatorToggled becomes false because the parent has already made the visiblity changes.
2012-12-12sync with viewer-developmenteli