summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-24sync with viewer-development (per DRTVWR-309)eli
2013-04-23Pull merge from viewer-fbcMerov Linden
2013-04-23ACME-251 Create AvatarFolderItemView: Re-adding llpersonfolderview.h/cpp and ↵Gilbert Gonzales
to use a class called LLPersonFolderView to manage the creation of subwidgits and selection of tabs.
2013-04-23Pull merge from viewer-fbcMerov Linden
2013-04-23Pull merge from viewer-fbcMerov Linden
2013-04-23ACME-251 Create AvatarFolderItemView: forgot to remove deleted files from ↵Gilbert Gonzales
indra/newview/CMakeLists.txt.
2013-04-23Fix build failures on Mac : suppress cruft that tripped gccMerov Linden
2013-04-23ACME-251 Create AvatarFolderItemView: Now the facebook friends tab is using ↵Gilbert Gonzales
LLPersonFolderViewModel instead of mConversationViewModel
2013-04-23ACME-251 Create AvatarFolderItemView: When making the folderview using ↵Gilbert Gonzales
LLPersonModelCommon instead of LLConverationItem. Also the .xml file file read in for LLPersonTabView was incorrect, now using person_tab_view.xml. And lastly made a new file called llpersonfolderview which which be the implementation of folderview.
2013-04-23ACME-251 Create AvatarFolderItemView: Changed classes name from ↵Gilbert Gonzales
LLPersonFolder* to LLPersonTab*
2013-04-23merge changes for latest viewer-developmentOz Linden
2013-04-23merge changes for 3.5.1-beta3Oz Linden
2013-04-23Pull merge from lindenlab/viewer-chuiMerov Linden
2013-04-23Added tag 3.5.1-beta3 for changeset 65ae89aeb7eaOz Linden
2013-04-23mergemberezhnoy
2013-04-23CHUI-950 (Reduce min width of messages panel )mberezhnoy
2013-04-23tag merge of DRTVWR-314Oz Linden
2013-04-23merging in tags from beta 2Nyx Linden
2013-04-23Pull merge from lindenlab/viewer-chuiMerov Linden
2013-04-23CHUI-943 FIXED "Chat history" menu item is added to context menu for Nearby ↵Mnikolenko ProductEngine
chat.
2013-04-22Pull merge from lindenlab/viewer-chuiMerov Linden
2013-04-22ACME-252: Created a folder view for the facebook connect tabGilbert Gonzales
2013-04-22ACME 162: Implemented a foundation model for the facebook connect folder view.Gilbert Gonzales
2013-04-22SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special ↵Nyx Linden
characters. Integrated Nicky Dasmijn's patch to handle the unicode file paths properly. Code reviewed, patch was clean. Tested locally, correctly allows wearables to load where they would fail before. Should be ready for automated build & QA.
2013-04-22CHUI-912 : Fixed! Filtering with types do work correctly again (including None).Merov Linden
2013-04-22merge changes for OPEN-173Oz Linden
2013-04-19CHUI-912 : Some clean up of vestigial debug codeMerov Linden
2013-04-19OPEN-173 FIX FMODEx Music stutters once every few seconds (OSS patch via ↵callum
Latif Khalifa & Siana Gearz) - additional fix. Team City gave me the wrong MD5 for 3p-package
2013-04-19CHUI-849 : Use a time limit for filtering instead of number limit, use a ↵Merov Linden
different limit for visible and unvisible lists
2013-04-19OPEN-173 FIX FMODEx Music stutters once every few seconds (OSS patch via ↵callum
Latif Khalifa & Siana Gearz)
2013-04-19merge up to latest viewer-development for merge to 3.5.2Oz Linden
2013-04-19mergemberezhnoy
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-19tag merge of DRTVWR-294Oz Linden
2013-04-19CHUI-915 ([CHUIBUG]Control+W hides Conversations floater instead of closing ↵mberezhnoy
active tab)
2013-04-19CHUI-946 FIXED Return FALSE if key is not handled here.Mnikolenko ProductEngine
2013-04-18CHUI-849 : WIP : Filter limit on time instead of number of itemsMerov Linden
2013-04-19CHUI-808 FIXED Draggable separator between conversations and message pane is ↵maksymsproductengine
not discoverable: minor fix;
2013-04-18merge changes for DRTVWR-298Oz Linden
2013-04-18tag merge of DRTVWR-298Oz Linden
2013-04-18add newlineOz Linden
2013-04-18Blank line on end of files as per commit hook requirementscallum_linden
2013-04-18merge changes for 3.5.1-beta2Oz Linden
2013-04-18Added tag 3.5.1-beta2 for changeset 9d8726eca785Oz Linden
2013-04-18tag merge of DRTVWR-313Oz Linden
2013-04-17BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident ↵Nyx Linden
picker Added checks to validate that the selection list is non-empty
2013-04-17New fix for the fix for Linux build now that gcc upgraded to 4.6 by defaultcallum_linden
2013-04-17Fix for Linux build now that gcc upgraded to 4.6 by defaultcallum_linden
2013-04-17merging with viewer-betaNyx Linden
2013-04-17SUN-70 MAINT-2597 FIX Crash when trying to edit no-modify objectsNyx Linden
Added protection for invalid / empty inventory contents