summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-06Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-05-06ACME-326 Populate the list with FB users who use SL but are not yet SL ↵Gilbert Gonzales
friends: Code cleanup
2013-05-06ACME-326 Populate the list with FB users who use SL but are not yet SL ↵Gilbert Gonzales
friends: Code cleanup
2013-05-06NORSPEC-94 fix this without setting in getState causing round-trip wierdness ↵Graham Madarasz
with spec color picker
2013-05-06NORSPEC-94 fix this without setting in getState causing round-trip wierdness ↵Graham Madarasz
with spec color picker
2013-05-06Merge. Pull from /lindenlab/viewer-cat prior to push.Monty Brandenberg
2013-05-06BUG-2295/MAINT-2624 unexpected crash around Content-Range: header processingMonty Brandenberg
Not certain what the source of the short data is with one resident but I'm going to make these problems retryable as they are transport-related. Lift the retry detection into a method that should be reusable by others interested in determining what is retryable. Trace output handling on the libcurl debug callback was attrocious. Some unsafe length handling on my part was protected by a second layer of defense. Made that correct and more useful by logging actual data sizes during trace.
2013-05-06MATBUG-78 Fix for alpha lighting falloff not matching for sunlight when ↵Dave Parks
shadows are enabled.
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 ↵Gilbert Gonzales
the 'SL residents you may want to friend' folder is populated only with FB+SL users who are not yet friends.
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
* Fix mute button.
2013-05-03mergeKelly Washington
2013-05-03ACME-324 Populate list with FB only friends: When clicking the '+' button FB ↵Gilbert Gonzales
only friends will appear in the second tab titled 'Invite people you know to SL'.
2013-05-03MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Switch mute to use task id. reviewed with Simon
2013-05-03ACME-323 Create a tab for 'Invite people you know to SL': FBC Test Two tabs ↵Gilbert Gonzales
are now named to match UX spec. Also created a function called createPersonTabs() which simplifies tab creation. The LLPersonFolderView is being turned into the tab manager.
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-03CHUI-963 (Toggling chat fui button twice tears off nearby chat to lower left ↵mberezhnoy
corner also deletes other open conversations)
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
LSL permissions * Change text of dialog * Add callback for mute button reviewed with Richard and Widely.
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 ↵Gilbert Gonzales
existing code which was taking the last focused element and assuming it was a pointer to a LLUICtrl. Now assume the pointer is of type LLView since there is not need to have it as a LLUICtrl pointer.
2013-05-02Pull merge from viewer-fbcMerov Linden
2013-05-02ACME-275 : WIP : Implemented filter(), still arrange() not done timely, ↵Merov Linden
tweaked test values to allow test of sort and filter
2013-05-02Cmake doesn't like mesimon
2013-05-02Fix the cmake fixsimon
2013-05-02Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-02Pull from viewer-releaseMerov Linden
2013-05-02Fix line endingssimon
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
alpha mask pool.
2013-05-02NORSPEC-99 add break statement to fix legacy bump vert program from being ↵Graham Madarasz
stomped with inappropriate material prog sans skinning
2013-05-02Merged lindenlab/viewer-development-materials into defaultgraham linden
2013-05-01NORSPEC-119 redux : fix getState to find the material ID of individually ↵Graham Madarasz
selected faces correctly
2013-05-02NORSPEC-99 add break statement to fix legacy bump vert program from being ↵Graham Madarasz
stomped with inappropriate material prog sans skinning
2013-05-01NORSPEC-119 redux : fix getState to find the material ID of individually ↵Graham Madarasz
selected faces correctly
2013-05-01NORSPEC-145 Fix for improper rendering of glow pass for rigged meshes.Dave Parks
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-05-01More informative light func tex binding messageGraham Madarasz