summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-05Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-12-05MAINT-2040 Fix for rigged meshes sometimes not updating properly with color ↵Dave Parks
changes.
2012-12-05merge changes for DRTVWR-257Nat Goodspeed
2012-12-05tag merge of DRTVWR-257Nat Goodspeed
2012-12-05merge changes for MAINT-1953Nat Goodspeed
2012-12-05removed yet another unintended commit of logcontrol.xmlBrad Payne (Vir Linden)
2012-12-05mergeBrad Payne (Vir Linden)
2012-12-05Possible fix for TC build failureBrad Payne (Vir Linden)
2012-12-05Merge.Logan Dethrow
2012-12-05Linux Viewer build fixes.Logan Dethrow
* Removed no longer used unpack_bufsize from bitpack_test.cpp * Added llviewertexture_stub.cpp to the newview tests directory to fix llworldmap_test.cpp and llworldmipmap_test.cpp linker errors.
2012-12-05mergeBrad Payne (Vir Linden)
2012-12-05SH-3604 WIP - backed out logcontrol.xml changeBrad Payne (Vir Linden)
2012-12-05SH-3604 WIP - retry mechanism for batch inventory ops, handle either ↵Brad Payne (Vir Linden)
completion or failure
2012-12-05merge changes for DRTVWR-258Nat Goodspeed
2012-12-05tag merge of DRTVWR-258Nat Goodspeed
2012-12-05merge changes for MAINT-1979Nat Goodspeed
2012-12-05CHUI 571: Code review changes, now LLFloaterIMContainer::showStub inlines ↵Gilbert Gonzales
code for hiding all tab panels and then showing the stub panel. Before the function would call hideAllTabs()
2012-12-05Added back in mesa package for linux buildsprep
2012-12-05Pull and merge ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-12-05merge changes for DRTVWR-256Nat Goodspeed
2012-12-05tag merge of DRTVWR-256Nat Goodspeed
2012-12-05CHUI-519 FIXED Do not put offered items into the trash while in Busy / DND modemaksymsproductengine
2012-12-05CHUI-577 FIXED "Mute text" and "Block voice" items are added to context menu ↵maxim@mnikolenko
instead of "Block\unblock"
2012-12-05Pull from viewer-developmentprep
2012-12-05merge changes for MAINT-1955, MAINT-1958Nat Goodspeed
2012-12-05merging in latest changesGilbert Gonzales
2012-12-05CHUI-530 Additional fixmaxim@mnikolenko
2012-12-05merge changes for DRTVWR-254Nat Goodspeed
2012-12-05tag merge of DRTVWR-254Nat Goodspeed
2012-12-04merging in latest changesGilbert Gonzales
2012-12-04CHUI-571: Fixed bug where when the converation floater was torn off and a ↵Gilbert Gonzales
new im received, the incorrect conversation would be displayed and focused. In order to do this removed the conversation floater panels from being focused immediately when set visible. Also there was a bug when showing the stub panel for torn off conversations. The tab container was not setting the stub panel index properly to 0, which is where the stub panel existed in the tab container's list. This is post code review submit. Will submit another with minor code review changes.
2012-12-04merge changes for DRTVWR-253Nat Goodspeed
2012-12-04tag merge of DRTVWR-253Nat Goodspeed
2012-12-04merge changes for BUG-768Nat Goodspeed
2012-12-04Fix merge breakagesimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-12-04Pull merge from richard/viewer-chuiMerov Linden
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull merge from richard/viewer-chuiMerov Linden
2012-12-04CHUI-550, CHUI-551 : Fixed : Changed conversation sorting according to ↵Merov Linden
designer's desires.
2012-12-04SH-3604 WIPBrad Payne (Vir Linden)
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-04MAINT-1953 Run through viewer stats and update GPU table with missing ↵Dave Parks
entries and new expected OpenGL versions
2012-12-04merge changes for DRTVWR-251Nat Goodspeed
2012-12-04tag merge of DRTVWR-251Nat Goodspeed
2012-12-04merge changes for MAINT-1953Nat Goodspeed
2012-12-04Pull back upstream fixes from viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04CHUI-504 FIXED Open Conversation floater on first login.AlexanderP ProductEngine
added toggleInstanceOrBringToFront("im_container") to LLStartup; typo corr.
2012-12-05CHUI-572 FIXED Changed initial position for floaters according to description.maxim@mnikolenko
2012-12-04tag merge of DRTVWR-255Nat Goodspeed