summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
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-09merge changes for 3.8.0-releaseOz Linden
2015-07-07merge changes for 3.8.0-releaseOz 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-07-01MergeRider Linden
2015-06-30Initial checkin for uploading via coroutine.Rider Linden
2015-06-30Merge with head of viewer-releasecallum_linden
2015-06-26try to avoid cmake error CMP0046Oz Linden
2015-06-23Start work on coprocedure manager.Rider Linden
2015-06-17Coding policy fixesRider Linden
2015-06-09Removed dead code, llsdmessage, llcapabilitylistener and the associated tests.Rider Linden
2015-06-09Removed homelocation responder (rolled into llagent)Rider Linden
Removed sdhandler from llagent. Removed unused values from llacountingccostmgr Fixed smart pontier creation in llfacebook
2015-06-08merge changes for 3.7.29-releaseOz Linden
2015-05-28Remove the display name floaterRider Linden
2015-05-19Changes to remove zlib and vivoxplatform dlls from the windows buildBjoseph Wombat
2015-05-18Merge with Viewer Release (after Viewer Release updated with Viewer Tools ↵callum_linden
Update)
2015-05-18merge changes for MAINT-4734pavelkproductengine
2015-05-14Converted the Server release notes URL,Rider Linden
classified and click tracker, Avatar hover height Pass the http_results on successfull call back style completion as well.
2015-05-08Updated llfloatermodeluploadbase to LLCore::HttpRider Linden
2015-05-01Move remote parcel request to a coro in LLRemoteParcelInfoProcessorRider Linden
Fix typo in twitter. Disable unit test for remote parcel info request until test infrastructure for new core is done.
2015-04-29Merge from viewer-releaseandreykproductengine
2015-04-28Convert some elements to STLRider Linden
2015-04-28Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-04-28Converting llmediaclient to new order.Rider Linden
Temp disable llmediaclient's unit tests for link issues.
2015-04-15Merge viewer-releasesimon
2015-04-03Merged lindenlab/viewer-tools-update into defaultRider Linden
2015-04-02OrderingRider Linden
2015-04-02Explicitly call out the RT library for tests in LinuxRider Linden
2015-04-02Linux linker order.Rider Linden
2015-03-26merge changes for tools update tipOz Linden
2015-03-24Add new media plugin (currently renders squares as example) in preparation ↵callum_linden
for new CEF code
2015-03-24Merged lindenlab/viewer-tools-update into defaultCinder Biscuits
2015-03-24Merge with viewer-release and become 3.7.27andreykproductengine
2015-03-24Refer to new QuickTime third party package with fixes for VS2013 & re-add ↵callum_linden
QuickTime media plugin
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 up to 3.7.25-releaseOz Linden
2015-02-27Merge viewer-release and become 3.7.26andreykproductengine
2015-02-26Merged lindenlab/viewer-tools-update into defaultCinder Biscuits
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-08OPEN-292 - Remove lscript from project,Cinder
Remove legacy udp script upload methods, Refactor script runtime perms from three arrays to one struct array so we don't have to juggle array order anymore.
2015-02-04merge storm-2082 changesOz Linden