livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,776 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

9 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Yuri Chebotarev 6ed8c492f5 fix for EXT-4082 Normal Uploading huge image crashes viewer 
https://codereview.productengine.com/secondlife/r/11/
reviewed Tofu Linden

--HG--
branch : product-engine
 2010-04-20 15:47:02 +03:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
 2009-05-04 17:43:26 +00:00
James Cook 9b2d9c6e6e Retry. Build system fixes for library-library dependencies, ported from skinning-7. OK by CG. 
svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
 2009-04-20 16:24:21 +00:00
James Cook 5c2fd1e4fe Back out last commit, because it breaks mapserver build on linux, dammit. 2009-04-17 22:00:04 +00:00
James Cook 57b47705d7 Build system fixes for library-library dependencies, ported from skinning-7. OK by CG. 
svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
 2009-04-17 20:39:07 +00:00
Bryan O'Sullivan 4cccb812de libpng needs linking against zlib 2008-08-30 03:55:11 +00:00
Bryan O'Sullivan 1496c3d0ee Switch llimage and llxml to target_link_libraries 2008-08-29 21:46:30 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
 2008-06-02 21:14:31 +00:00