<feed xmlns='http://www.w3.org/2005/Atom'>
<title>viewer.git/indra/llcommon/imageids.h, branch cef_147</title>
<subtitle>Megapahit's fork of the Second Life viewer.
</subtitle>
<id>https://megapahit.org/viewer.git/atom?h=cef_147</id>
<link rel='self' href='https://megapahit.org/viewer.git/atom?h=cef_147'/>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/'/>
<updated>2013-07-31T02:13:45Z</updated>
<entry>
<title>Summer cleaning - removed a lot of llcommon dependencies to speed up build times</title>
<updated>2013-07-31T02:13:45Z</updated>
<author>
<name>Richard Linden</name>
<email>none@none</email>
</author>
<published>2013-07-31T02:13:45Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=a2e22732f195dc075a733c79f15156752f522a43'/>
<id>urn:sha1:a2e22732f195dc075a733c79f15156752f522a43</id>
<content type='text'>
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
</content>
</entry>
<entry>
<title>merge changes for DRTVWR-294</title>
<updated>2013-04-19T14:11:29Z</updated>
<author>
<name>Oz Linden</name>
<email>oz@lindenlab.com</email>
</author>
<published>2013-04-19T14:11:29Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=ddd5659f815a39e9a8ef0e86c911fea75a7d8848'/>
<id>urn:sha1:ddd5659f815a39e9a8ef0e86c911fea75a7d8848</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Update Mac and Windows breakpad builds to latest</title>
<updated>2013-03-29T14:50:08Z</updated>
<author>
<name>Graham Madarasz</name>
<email>graham@lindenlab.com</email>
</author>
<published>2013-03-29T14:50:08Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=bf6182daa8b4d7cea79310547f71d7a3155e17b0'/>
<id>urn:sha1:bf6182daa8b4d7cea79310547f71d7a3155e17b0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>merge</title>
<updated>2013-03-11T19:17:13Z</updated>
<author>
<name>prep</name>
<email>prep@lindenlab.com</email>
</author>
<published>2013-03-11T19:17:13Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=8e3b190e919fde84a2189d974208f9d199d4bea6'/>
<id>urn:sha1:8e3b190e919fde84a2189d974208f9d199d4bea6</id>
<content type='text'>
</content>
</entry>
<entry>
<title>SH-3228 WIP - always respond to processAppearance for self, convert baked textures to checkerboards</title>
<updated>2012-06-28T18:24:04Z</updated>
<author>
<name>Brad Payne (Vir Linden)</name>
<email>vir@lindenlab.com</email>
</author>
<published>2012-06-28T18:24:04Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=e4a0dda457039b1a04c74024d9fbcf02e071b13d'/>
<id>urn:sha1:e4a0dda457039b1a04c74024d9fbcf02e071b13d</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Change license from GPL to LGPL (version 2.1)</title>
<updated>2010-08-13T11:24:57Z</updated>
<author>
<name>Oz Linden</name>
<email>oz@lindenlab.com</email>
</author>
<published>2010-08-13T11:24:57Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=06b0d72efa96b6a0ed665f7cd46f358c48929e7b'/>
<id>urn:sha1:06b0d72efa96b6a0ed665f7cd46f358c48929e7b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fix build, missed a file and items need LL_COMMON_API</title>
<updated>2009-11-29T07:10:38Z</updated>
<author>
<name>James Cook</name>
<email>james@lindenlab.com</email>
</author>
<published>2009-11-29T07:10:38Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=e9b07c480abdc130fcacbbb75872edef71d0826b'/>
<id>urn:sha1:e9b07c480abdc130fcacbbb75872edef71d0826b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Move hard-coded image IDs to .cpp file to speed link time.</title>
<updated>2009-11-29T00:39:50Z</updated>
<author>
<name>James Cook</name>
<email>james@lindenlab.com</email>
</author>
<published>2009-11-29T00:39:50Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=cb29ce124378f068009a7e0c930f86bc17b7257f'/>
<id>urn:sha1:cb29ce124378f068009a7e0c930f86bc17b7257f</id>
<content type='text'>
</content>
</entry>
<entry>
<title>QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3</title>
<updated>2009-05-04T17:43:26Z</updated>
<author>
<name>Adam Moss</name>
<email>moss@lindenlab.com</email>
</author>
<published>2009-05-04T17:43:26Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=cc92525b0df952659102d2e5adcc4140fea7f371'/>
<id>urn:sha1:cc92525b0df952659102d2e5adcc4140fea7f371</id>
<content type='text'>
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
</content>
</entry>
<entry>
<title>Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).</title>
<updated>2009-03-05T00:29:27Z</updated>
<author>
<name>Eric Tulla</name>
<email>tulla@lindenlab.com</email>
</author>
<published>2009-03-05T00:29:27Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=6db6d81b0a90fe7b48a3ccf64ba768e5772397c8'/>
<id>urn:sha1:6db6d81b0a90fe7b48a3ccf64ba768e5772397c8</id>
<content type='text'>
No conflicts in the merge.

Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
</content>
</entry>
</feed>
