<feed xmlns='http://www.w3.org/2005/Atom'>
<title>viewer.git/indra/newview/llmenucommands.h, branch 26.3</title>
<subtitle>Megapahit's fork of the Second Life viewer.
</subtitle>
<id>https://megapahit.org/viewer.git/atom?h=26.3</id>
<link rel='self' href='https://megapahit.org/viewer.git/atom?h=26.3'/>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/'/>
<updated>2011-12-02T20:03:24Z</updated>
<entry>
<title>EXP-1451 FIX -- I want to put my NEARBY CHAT window at the bottom left, but then it obscures chatted text.</title>
<updated>2011-12-02T20:03:24Z</updated>
<author>
<name>Leslie Linden</name>
<email>leslie@lindenlab.com</email>
</author>
<published>2011-12-02T20:03:24Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=4d14bb02b908c37f73e915af811027c1d193b667'/>
<id>urn:sha1:4d14bb02b908c37f73e915af811027c1d193b667</id>
<content type='text'>
I repositioned the chat, move and camera floaters.  Chat toasts now start 80 up from the bottom left rather than 10.
</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>Merge inspectors UI project, gooey-4, into viewer-2 trunk.  Added new tooltips to 3D avatars, 2D avatar names, and 3D objects.  Refactors tooltips and text boxes, line editors, and text editors.  Breaks LLExpandableTextBox, but a fix is coming.</title>
<updated>2009-10-03T23:40:28Z</updated>
<author>
<name>James Cook</name>
<email>james@lindenlab.com</email>
</author>
<published>2009-10-03T23:40:28Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=ada0f4fa221f2c7070fb02a2b7ff903bdde11c45'/>
<id>urn:sha1:ada0f4fa221f2c7070fb02a2b7ff903bdde11c45</id>
<content type='text'>
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
</content>
</entry>
<entry>
<title>merge -r 122421-124917 viewer-2.0.0-2 -&gt; viewer-2.0.0-3</title>
<updated>2009-06-21T08:04:56Z</updated>
<author>
<name>Steven Bennetts</name>
<email>steve@lindenlab.com</email>
</author>
<published>2009-06-21T08:04:56Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8'/>
<id>urn:sha1:9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8</id>
<content type='text'>
ignore-dead-branch
</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>Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165</title>
<updated>2009-01-08T00:05:06Z</updated>
<author>
<name>Aaron Brashears</name>
<email>aaronb@lindenlab.com</email>
</author>
<published>2009-01-08T00:05:06Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=e3cf284388e7c8a4c0755ba9e689f6a6264a5a26'/>
<id>urn:sha1:e3cf284388e7c8a4c0755ba9e689f6a6264a5a26</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.</title>
<updated>2007-10-04T23:19:43Z</updated>
<author>
<name>Aaron Brashears</name>
<email>aaronb@lindenlab.com</email>
</author>
<published>2007-10-04T23:19:43Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=5595a996234cbe610f9681dbe8ed26880decd94a'/>
<id>urn:sha1:5595a996234cbe610f9681dbe8ed26880decd94a</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Print done when done.</title>
<updated>2007-01-02T08:33:20Z</updated>
<author>
<name>James Cook</name>
<email>james@lindenlab.com</email>
</author>
<published>2007-01-02T08:33:20Z</published>
<link rel='alternate' type='text/html' href='https://megapahit.org/viewer.git/commit/?id=420b91db29485df39fd6e724e782c449158811cb'/>
<id>urn:sha1:420b91db29485df39fd6e724e782c449158811cb</id>
<content type='text'>
</content>
</entry>
</feed>
