summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2013-05-06Merge with lindenlab/viewer-development-materialscallum_linden
2013-05-06Pull merge from viewer-fbcMerov Linden
2013-05-06Pull merge from viewer-fbcMerov Linden
2013-05-06ACME-275 : Fixed! Filtering on FB list works (tested with simulated data only...Merov Linden
2013-05-06ACME-341 Hide the avatar icon and use the FB icon instead: Adjusted positioni...Gilbert Gonzales
2013-05-06ACME-340 Get facebook icon from spec and add to viewer: Added a facebook icon...Gilbert Gonzales
2013-05-06MAINT-2657 Fix (speculative) for Crash in LLAudioEngine_FMODEX::shutdown()callum_linden
2013-05-06Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-05-06ACME-338 Hide info button for FB only friends: Upon hover of FB only friends ...Gilbert Gonzales
2013-05-06NORSPEC-118 fix regression of 118 from extra conditions added for 151Graham Madarasz
2013-05-06NORSPEC-118 fix regression of 118 from extra conditions added for 151Graham Madarasz
2013-05-06NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.Dave Parks
2013-05-06ACME-326 Populate the list with FB users who use SL but are not yet SL friend...Gilbert Gonzales
2013-05-06ACME-326 Populate the list with FB users who use SL but are not yet SL friend...Gilbert Gonzales
2013-05-06NORSPEC-94 fix this without setting in getState causing round-trip wierdness ...Graham Madarasz
2013-05-06NORSPEC-94 fix this without setting in getState causing round-trip wierdness ...Graham Madarasz
2013-05-06MATBUG-78 Fix for alpha lighting falloff not matching for sunlight when shado...Dave Parks
2013-05-06NORSPEC-126 Make objects with normal maps applied obey legacy shiny settingsGraham Madarasz
2013-05-06NORSPEC-126 Make objects with normal maps applied obey legacy shiny settingsGraham Madarasz
2013-05-04Remove unnecessary assert as ternary protects against null ptr derefGraham Madarasz
2013-05-04Remove unnecessary assert as ternary protects against null ptr derefGraham Madarasz
2013-05-03ACME-275 : WIP : FilteringMerov Linden
2013-05-03ACME-326 Add ‘connect to facebook’ on menu bar with functionality: Now th...Gilbert Gonzales
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-03MAINT-2655: "Block button in permissions dialog prompt does not block object"Kelly Washington
2013-05-03mergeKelly Washington
2013-05-03ACME-324 Populate list with FB only friends: When clicking the '+' button FB ...Gilbert Gonzales
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ...Kelly Washington
2013-05-03ACME-323 Create a tab for 'Invite people you know to SL': FBC Test Two tabs a...Gilbert Gonzales
2013-05-03NORSPEC-151 make disabling bumpyshiny disable adv lighting model as wellGraham Madarasz (Graham)
2013-05-03NORSPEC-151 make disabling bumpyshiny disable adv lighting model as wellGraham Madarasz (Graham)
2013-05-03Merge with headcallum_linden
2013-05-03Merge with vwr-dev-matGraham Madarasz (Graham)
2013-05-02Pull from viewer-fbcMerov Linden
2013-05-02CHUI-275 : WIP : Cleaned up commentsMerov Linden
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ...Kelly Washington
2013-05-02ACME-306 : Pull merge from viewer-chuiMerov Linden
2013-05-02mergeGilbert Gonzales
2013-05-02ACME-307 Fix crash when clicking profile button: The crash was caused by exis...Gilbert Gonzales
2013-05-02Pull merge from viewer-fbcMerov Linden
2013-05-02ACME-275 : WIP : Implemented filter(), still arrange() not done timely, tweak...Merov Linden
2013-05-02Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-05-02Pull from viewer-releaseMerov Linden
2013-05-02NORSPEC-157 make texture repeats/offsets controls display in media modeGraham Madarasz
2013-05-02NORSPEC-157 make texture repeats/offsets controls display in media modeGraham Madarasz
2013-05-02NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into ...Dave Parks
2013-05-02NORSPEC-99 add break statement to fix legacy bump vert program from being sto...Graham Madarasz
2013-05-02Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-05-01NORSPEC-119 redux : fix getState to find the material ID of individually sele...Graham Madarasz