summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-02Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
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
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
2013-05-01Fix for sky being too bright with advanced lighting enabledDave Parks
2013-05-01Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-01Fix up specular highlights and gamma correction for projectors.Dave Parks
2013-05-01Add some diag for debugging light func tex bindingGraham Madarasz
2013-05-01NORSPEC-51 Fix for Incorrect Texture icon used in build tool when normal or ↵callum_linden
specular map is not set to 'Use Texture'
2013-05-01mergeCho
2013-05-01made secondlife:///app/fbc/connect avoid 'the slurl you click on is not ↵Cho
supported' messages
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect ↵Graham Madarasz (Graham)
Mac too
2013-05-01NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect ↵Graham Madarasz (Graham)
Mac too
2013-05-01Restore mismerged sunshine changeGraham Madarasz
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-05-01MAINT-2629: limit stream searches to prevent hangs on bad streamscallum
2013-04-30mergeGilbert Gonzales
2013-04-30ACME-252 Create AvatarFolderItemView: Fixed focusing issue when hovering ↵Gilbert Gonzales
over a people view and then selected an icon. Now when selecting the icon upon hover the corresponding people view will be selected as well.
2013-04-30Pull from viewer-fbcMerov Linden
2013-04-30ACME-275 : WIP : Write all LLPersonViewerFilter methods and clean up interfaceMerov Linden
2013-04-30MAINT-2646 Viewer should neither grant nor display prompts for unimplemented ↵Kelly Washington
LSL permissions * Add the newer run time permissions to the viewer * Filter requested permissions by those the viewer knows about * Show a dialog indicating unknown permissions were requested and a new viewer will be needed to grant them. reviewed with Simon and Soft
2013-04-30ACME-252 Create AvatarFolderItemView: Slight xml change for person view to ↵Gilbert Gonzales
make the profile button display lower.
2013-04-30ACME-252 Create AvatarFolderItemView: Now the people view shows both the ↵Gilbert Gonzales
facebook name and the SL name (assuming this connection exists).
2013-04-30ACME-252 Create AvatarFolderItemView: Now clicking the profile button and ↵Gilbert Gonzales
info button will show a facebook user's SL profile or info respectively.
2013-04-30Merge vwr-dev-mat againGraham Madarasz
2013-04-30Fix gcc ternary type inference fail to unbreak Mac and Linux buildsGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham Madarasz
2013-04-30MATBUG-78 Fix for alpha lighting distance attenuation not matching opaque ↵Dave Parks
distance attenuation
2013-04-30ACME-252 Create AvatarFolderItemView: Optimization. Now the widths for the ↵Gilbert Gonzales
personview are computed once and stored staticically since they don't change per control.
2013-04-30MAINT-2640 Fix for Wrong name of the checkbox Pathfinding view/test floater.callum_linden
2013-04-30mergeGilbert Gonzales
2013-04-30mergeGilbert Gonzales