summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-24merge changes for DRTVWR-309Oz Linden
2013-04-24tag merge of DRTVWR-309Oz Linden
2013-04-24mergeBrad Payne (Vir Linden)
2013-04-24SH-4128 WIP - misc cleanupBrad Payne (Vir Linden)
2013-04-24Follow-up code cleaning for LLToast work trying to get branch healthy.simon
Reviewed by Kelly
2013-04-24SH-4128 WIP - cleanup around item link removal and callbacksBrad Payne (Vir Linden)
2013-04-24updating appearance utility source packageNyx Linden
2013-04-24FIX INTL-114 translation for 9 languages of major update from CHUI (based on ↵eli
latest merge with viewer-development)
2013-04-24sync with viewer-development (per DRTVWR-309)eli
2013-04-24SH-4128 - more cleanup of COF-link manipulating functionsBrad Payne (Vir Linden)
2013-04-24Trivial change to note that earlier changeset 27742 (1c3262183eb5) is asimon
re-work of the LLInstanceTracker code done by Richard. The commit comment is cryptic
2013-04-24Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-04-24Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-04-24Correct fix to include affect on ambient term and make work on Mac nVGraham Madarasz
2013-04-24Fix mismerge that lost Geenz colorspace conversion of diffuse in alphaVGraham Madarasz
2013-04-24CHUI-849 WIP, SH-4116 WIP - added simpler match check in inventory for when ↵Brad Payne (Vir Linden)
we don't need the list of matches to be returned.
2013-04-24Fix crash discovered during other testing. Reviewed by Kellysimon
2013-04-24diff -r 59c7bed66dfd indra/llcommon/lleventapi.hsimon
2013-04-24Merge vwr-dev-matGraham Madarasz
2013-04-24NORSPEC-59 NORSPEC-125 make materials and alpha shaders work on Mac laptops ↵Graham Madarasz
with nV mobile graphics cards
2013-04-24Fix for overbrigtened alpha blended objects in deferred. Linearize diffuse ↵Geenz
surface color in the vertex shader before passing it to the fragment shader.
2013-04-23Pull merge from viewer-fbcMerov Linden
2013-04-23Merged lindenlab/viewer-development-materials into defaultgraham 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-23Mergesimon
2013-04-23Revert LLThreadSafeRefCount optimization; caps fetching was failing. ↵simon
Reviewed by Kelly
2013-04-23Fix Windows Debug buildsimon
2013-04-23Restore deferred avi alpha program vert color usageGraham Madarasz
2013-04-23Tweak to remove usage of GL_DEPTH_CLAMP for now until projectors can be made ↵Dave Parks
to work with it.
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-23NORSPEC-132 Correct rotation limits to +/- 180 for all texturesOz Linden
2013-04-23SH-4128 WIP - rewiring various link-deleting operations to support callbacksBrad Payne (Vir Linden)
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-23NORSPEC-142 Fix for unusable performance on GTX 285Dave Parks
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-23mergeBrad Payne (Vir Linden)