summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-24MergeGraham Linden
2013-06-24NORSPEC-259 nerfed copyContentsToFramebuffer handling of non-FBO sourcesGraham Linden
2013-06-24mergeGilbert Gonzales
2013-06-24ACME-593: Now the photo tab of the facebook panel displays a screenshot ↵Gilbert Gonzales
based upon when the facebook floater was opened.
2013-06-24Pull merge from lindenlab/viewer-fbcMerov Linden
2013-06-24ACME-582 : Checkin feature: Implement the loading and displaying of map ↵Merov Linden
tiles in the LLIconCtrl
2013-06-25made status update actually post to Facebook, for ACME-569 and ACME-573Cho
2013-06-24CHOP-955, CHOP-957: Platform-specific switches files => settings_install.xml.Nat Goodspeed
Instead of generating viewer command-line switch overrides into the Windows shortcut, an arguments.txt file on Mac, or a gridargs.dat file on Linux, generate a platform-independent settings_install.xml file containing 'sourceid' key (if 'sourceid' found in TeamCity environment variables). All command-line override switches previously found in the aforementioned files have happily become moot.
2013-06-24ACME-497 : Clean up the xml code for checkin to use a proper icon widget and ↵Merov Linden
add a decent default image for it
2013-06-24MAINT-2800 revert changes to objectSkinV to make it match 3.6.0 code and not ↵Graham Madarasz (Graham)
slow down on ATI on Mac
2013-06-24ACME-593 Populate the image with the actual screenshot image: Placed ↵Gilbert Gonzales
LLSnapshotLivePreview class into file llsnapshotlivepreview.h/cpp so that it could be utilized by other classes.
2013-06-24merge changes for DRTVWR-326 3.6.1-beta1Oz Linden
2013-06-24MATBUG-194 WIP investigate if light func sampling precision is causing ↵Graham Madarasz (Graham)
whirly's wierdness
2013-06-24NORSPEC-280 include fix to downsampleDepthRect shader making GL 3.3. drivers cryGraham Linden
2013-06-23ACME-497 : Working implementation of Checkin though couple of bugs to fix ↵Merov Linden
and no visible map in the UI
2013-06-22Pull merge from lindenlab/viewer-fbcMerov Linden
2013-06-22ACME-497 : All xml work for the Checkin featureMerov Linden
2013-06-22tweaked numbers to look more like mockup for ACME-568Cho
2013-06-22added text and buttons for update status tab for ACME-568Cho
2013-06-22mergemberezhnoy
2013-06-22build fixmberezhnoy
2013-06-21Merge cleanup.Dave Parks
2013-06-21NORSPEC-280 Fix for shader compilation error on OpenGL 3.3Dave Parks
2013-06-21ACME-588 Make 'Post' button post to facebook: Intial commit is just adding ↵Gilbert Gonzales
callback for clicking the post button
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-21Only render bounding boxes for volumes in info display.Dave Parks
2013-06-20ACME-584: Adjusted name of a couple XUI elements.Gilbert Gonzales
2013-06-20mergeGilbert Gonzales
2013-06-20ACME-584 Create the panel to contain the image detailsGilbert Gonzales
2013-06-20SH-4257 Preparation for a new cap grant: GetMesh2Monty Brandenberg
Mesh repo is using three policy classes now: one for large objects, one for GetMesh2 regions, one for GetMesh regions. It's also detecting the presence of the cap and using the correct class. Class initialization cleaned up significantly in llappcorehttp using data-directed code. Pulled in the changes to HttpHeader done for sunshine-internal then did a refactoring pass on the header callback which now uses a unified approach to clean up and deliver header information to all interested parties. Added support for using Retry-After header information on 503 retries.
2013-06-20NORSPEC-277 WIP backout old-school normal permutationGraham Linden
2013-06-20Try to track down some bad bounding boxes in particles.Dave Parks
2013-06-20MATBUG-204 Fix for crash in genVolumeBBoxesDave Parks
2013-06-20Merge cleanupDave Parks
2013-06-20NORSPEC-262 make drag and drop aware of editing context so that editing ↵Graham Linden
normal/spec textures causes application to the correct tex channel
2013-06-20CHUI-850 FIXED Unread notifications are lost after relog in certain ↵PavelK ProductEngine
circumstances
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-20NORSPEC-278 fix misuse of legacy bumps when rendering objects with TE ↵Graham Linden
bumpmap setting of 18 aka BUMPY_TEXTURE
2013-06-20Handle VRAM in megabytes. This was previously being reported as bytes.Geenz
2013-06-20CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")mberezhnoy
Fixed "Add friend" option always being greyed out, add ability to block object via context menu in compact chat mode.
2013-06-19merge changes for DRTVWR-326Oz Linden
2013-06-19MergeGraham Linden
2013-06-19merge changes for 3.6.0-releaseOz Linden
2013-06-19Pull merge from lindenlab/viewer-releaseMerov Linden
2013-06-19Merge conflict mixup, use noaction instead of none for user preferenceMerov Linden
2013-06-19NORSPEC-272 make sure the tex filtering fix stays putGraham Linden
2013-06-19MergeGraham Linden
2013-06-19Fixups for the transplant of the HttpHeader changes from sunshine.Monty Brandenberg
2013-06-19Merge with viewer-release.Geenz
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden