summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2013-01-31Merging in main repository.Tonya Souther
2013-01-31Mergemaxim@mnikolenko
2013-01-31CHUI-719 FIXED Font color was changed.maxim@mnikolenko
2013-01-31Pull merge with lindenlab/viewer-chuiMerov Linden
2013-01-31merge workaround for llprocess test failuresOz Linden
2013-01-31workaround by skipping llprocess tests that frequently fail on WindowsOz Linden
2013-01-31merge workarounds for failing testsOz Linden
2013-01-31disable timing sensitive check in the pipe and pump fitness testOz Linden
2013-01-31skip some http core tests on Windows because they fail too frequentlyOz Linden
2013-01-31CHUI-711 FIXED Load logs from file only once to avoid duplicating. This will ...maxim@mnikolenko
2013-01-31CHUI-718 (User does not see own chat in conference IM)mberezhnoy
2013-01-31Control reorganization and bugfixes.Tonya Souther
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-31CHUI-612 FIXED Blank conversation names showing in conversation listmaksymsproductengine
2013-01-30mergingmberezhnoy
2013-01-30Merge with latest viewer-dev-materials.Geenz
2013-01-30merging latest changesCho
2013-01-30Specular map support. This is the vast majority of the material parameters i...Geenz
2013-01-30merge build floater updatesOz Linden
2013-01-30merge MAINT-2252 fixOz Linden
2013-01-30CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears...mberezhnoy
2013-01-29Compile fix for potentially uninitialized variable.Tonya Souther
2013-01-29pull back more 3.4.5 beta fixesOz Linden
2013-01-29Editing interface for normal and specular maps and other parameters.Tonya Souther
2013-01-30merging latest changesCho
2013-01-30CHUI-647 FIX "Conversations" floater is not opened when user wants to share s...Cho
2013-01-29Pull merge from lindenlab/viewer-chuiMerov Linden
2013-01-29CHUI-436 : Fixed : Do not skip yourself or group chat when checked Only frien...Merov Linden
2013-01-29merge changes for MAINT-2276Oz Linden
2013-01-29MAINT-2281: correct test for XP (corrected fix I applied incorrectly)Oz Linden
2013-01-29CHUI-88 I shouldn't see Conference IMs from people I muted. Fix: In order to ...Gilbert Gonzales
2013-01-29mergeGilbert Gonzales
2013-01-29CHUI-667: Attempting to correct Mac/Linux build issue.Gilbert Gonzales
2013-01-28CHUI-667: Post code review changesGilbert Gonzales
2013-01-28Basic normal mapping support.Geenz
2013-01-29merging latest changesCho
2013-01-29merging latest changesCho
2013-01-29CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication Cons...Cho
2013-01-28Fix test failureMerov Linden
2013-01-28merge linearlize lightingOz Linden
2013-01-28rename "Lighting and Shadows" (deferred rendering) to "Advanced Lighting Model"Oz Linden
2013-01-28mergemberezhnoy
2013-01-28For MAINT-2276 a workaround to unblock 3.4.5 beta review: tedGraham Madarasz (Graham)
2013-01-28mergeGilbert Gonzales
2013-01-28CHUI-706 FIXED Appropriate function is now called in xmlmaxim@mnikolenko
2013-01-28CHUI-395 (Group moderators are not shown as Moderators in group conversation)mberezhnoy
2013-01-28CHUI-701 FIXED Don't show toasts and flashing, if conversation is opened but ...maxim@mnikolenko
2013-01-26[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
2013-01-25CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. So...Gilbert Gonzales
2013-01-26undid accidental revert of someone else's fixCho