summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2015-10-29merge changes for 3.8.6-releaseOz Linden
2015-10-06merge changes for 3.8.4-releaseOz Linden
2015-09-30Merge downstream code, version 3.8.5AndreyL ProductEngine
2015-09-04merge changes for 3.8.3-releaseOz Linden
2015-08-07Merge fix - clearing duplicatesandreykproductengine
2015-08-04merge changes for MAINT-4734pavelkproductengine
2015-08-04Merge downstream code and become version 3.8.3andreykproductengine
2015-07-14merge 3.8.0-release and correct xml errors caused by reformattingOz Linden
2015-07-10merge up to 3.8.0-release (and fix for unit tests with a proxy enabled)'Oz Linden
2015-07-03Merge from viewer-relese and become version 3.8.1andreykproductengine
2015-07-02Merge downstream code and become version 3.8.1andreykproductengine
2015-06-26try to avoid cmake error CMP0046Oz Linden
2015-06-08merge changes for 3.7.29-releaseOz Linden
2015-05-18merge changes for MAINT-4734pavelkproductengine
2015-04-29Merge from viewer-releaseandreykproductengine
2015-04-28Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-04-15Merge viewer-releasesimon
2015-03-24Merge with viewer-release and become 3.7.27andreykproductengine
2015-03-23Pull merge from lindenlab/viewer-releaseMerov Linden
2015-03-16Merge lindenlab/viewer-tools-updateMerov Linden
2015-03-05Simplify CMake code to generate viewer_version.txt and summary.json.Nat Goodspeed
The quoting used for the cygwin printf command didn't work for 'cmake -E echo'. The whole content was enclosed in single quotes, with individual string elements enclosed in double quotes. But we ended up with a summary.json containing (e.g.): '{Type:viewer,Version:3.7.26.33262}' instead of the desired: {"Type":"viewer","Version":"3.7.26.33262"} HOWEVER: I see no compelling reason why either of these files must be deferred to build time. It's simpler and more robust to generate them both directly from CMake at configure time.
2015-03-03Commit Callum's fix to eliminate dependency on cygwin printf.Nat Goodspeed
Use 'cmake -E echo' instead.
2015-02-27Pull merge from lindenlab/viewer-releaseMerov Linden
2015-03-23merge changes for 3.7.26-releaseOz Linden
2015-02-27Merge viewer-release and become 3.7.26andreykproductengine
2015-02-25mergeBrad Payne (Vir Linden)
2015-02-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-02-24merge changes for 3.7.25-releaseOz Linden
2015-02-03MAINT-4734 (Separate transaction notices from group notice/invites)pavelk_productengine
- added code to sort notifications between tabs: Invites, Transactions, System messages - made cosmetic changes according to comment from 27/Jan/15 in Jira - added code to show correct number of notifications on each tab - added code to close all notifications on current tab via "Delete all" button
2015-01-19On Linux, don't try to copy SLPlugin or the webkit or gstreamer pluginsNat Goodspeed
since we're not building them as part of the viewer build any more.
2015-01-19Link viewer with OpenAL if appropriateNat Goodspeed
2015-01-09MAINT-4734 (Separate transaction notices from group notice/invites) - ↵pavelk_productengine
initial version Works: 1) All new notices shown on "Invites" tab of new floater "NOTIFICATIONS TABBED" in condensed view To be done: 1) Show other types of notices, like transactions and system 2) Separate notices between tabs "Invites", "System", "Transactions" 3) Design full notice view (in addition to condensed view)
2015-01-07First cut at consuming new slplugins autobuild package.Nat Goodspeed
The contents are extracted, but not yet built into the viewer installer.
2014-12-19Sort include(...) lines to make it easier for a person to verify.Nat Goodspeed
2014-12-17Delete misleading comment about testing llcapabilitylistener.Nat Goodspeed
There was a comment in CMakeLists.txt left over from 2009 (!) about commenting out the unit test for llcapabilitylistener. Fortunately we've since reinstated the test as an integration test, but the comment was never removed -- until now.
2014-11-21automate keeping the About SL -> Licenses tab correctOz Linden
2014-11-05mergeBrad Payne (Vir Linden)
2014-10-21fix version number generation for cmake 3.x and autobuild 1.0 compatibilityOz Linden
2014-10-13fixes for cmake warnings about policy changes. could not fully test these ↵JJ Linden
changes
2014-10-09Mergedolphin
2014-09-29SL-92 WIP - can edit hover height debug setting via sliderBrad Payne (Vir Linden)
2014-09-28Pull merge from lindenlab/viewer-releaseMerov Linden
2014-09-25Merge viewer-release 3.7.17Graham Linden
2014-09-24MAINT-4482 FIXED [viewer-lion] Mac build fails due to weirdo ↵Savchenko Maksym
LLTextBase::normalizeUri() issue
2014-09-08Merge with 3.7.15-releasedolphin
2014-09-08Pull merge from lindenlab/viewer-releaseMerov Linden
2014-09-04Mergedolphin
2014-08-29MergevilleGraham Linden
2014-08-28Pull merge from viewer-releaseMerov Linden
2014-09-09Merge viewer-release and become version 3.7.16maksymsproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 08:03:18 +0000