<feed xmlns='http://www.w3.org/2005/Atom'>
<title>viewer.git/indra/lscript/lscript_execute.h, branch 26.1.1</title>
<subtitle>Megapahit's fork of the Second Life viewer.
</subtitle>
<id>https://www.megapahit.org/viewer.git/atom?h=26.1.1</id>
<link rel='self' href='https://www.megapahit.org/viewer.git/atom?h=26.1.1'/>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/'/>
<updated>2015-02-08T19:53:39Z</updated>
<entry>
<title>OPEN-292 - Remove lscript from project,</title>
<updated>2015-02-08T19:53:39Z</updated>
<author>
<name>Cinder</name>
<email>cinder@sdf.org</email>
</author>
<published>2015-02-08T19:53:39Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=ca08bd5aba5e69fce3b0f5b4f861ffec9fe4d2e5'/>
<id>urn:sha1:ca08bd5aba5e69fce3b0f5b4f861ffec9fe4d2e5</id>
<content type='text'>
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.
</content>
</entry>
<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://www.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>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://www.megapahit.org/viewer.git/commit/?id=bf6182daa8b4d7cea79310547f71d7a3155e17b0'/>
<id>urn:sha1:bf6182daa8b4d7cea79310547f71d7a3155e17b0</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://www.megapahit.org/viewer.git/commit/?id=06b0d72efa96b6a0ed665f7cd46f358c48929e7b'/>
<id>urn:sha1:06b0d72efa96b6a0ed665f7cd46f358c48929e7b</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge with trunk</title>
<updated>2009-08-31T20:47:47Z</updated>
<author>
<name>Bryan O'Sullivan</name>
<email>bos@lindenlab.com</email>
</author>
<published>2009-08-31T20:47:47Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=30ff6cabd61f2f083df5df1e6e70cc94742af477'/>
<id>urn:sha1:30ff6cabd61f2f083df5df1e6e70cc94742af477</id>
<content type='text'>
</content>
</entry>
<entry>
<title>svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654</title>
<updated>2009-07-01T00:22:05Z</updated>
<author>
<name>Christian Goetze</name>
<email>cg@lindenlab.com</email>
</author>
<published>2009-07-01T00:22:05Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=e588d1f28419745ee1e1ee98dc1852e0364a4088'/>
<id>urn:sha1:e588d1f28419745ee1e1ee98dc1852e0364a4088</id>
<content type='text'>
QAR-1654 merge completed.
</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://www.megapahit.org/viewer.git/commit/?id=9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8'/>
<id>urn:sha1:9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8</id>
<content type='text'>
ignore-dead-branch
</content>
</entry>
<entry>
<title>svn merge -r 108748:109731 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25</title>
<updated>2009-02-06T19:14:32Z</updated>
<author>
<name>Robert Knop</name>
<email>prospero@lindenlab.com</email>
</author>
<published>2009-02-06T19:14:32Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=ea8e83274ae76598ff7a97eb50991e9f4826091b'/>
<id>urn:sha1:ea8e83274ae76598ff7a97eb50991e9f4826091b</id>
<content type='text'>
Merge server 1.25 back to trunk

Conflicts:

C    indra/llcommon/llversionserver.h  : svn reverted

C    indra/tools/bill/MoneyMachine.pm : one conflict, only difference
                                        was a blank line.

C    indra/newsim/lllslmanager.cpp : kept merge-right, in consultation
C    indra/newsim/lllslmanager.h   :   with babbage
C    indra/newsim/llagentinfo.cpp  : (runNested, not runSpecial)

C    indra/test/test_entity_query.py        : Kept merge-right
C    indra/test/test_agent_linden_dollar.py : Kept merge-right
                  --&gt; Kartic fixed these testes in server-1.25

C    indra/test/template/httpd.tmpl : Kept merge-right
                                      (the IfModule version)
</content>
</entry>
<entry>
<title>svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113</title>
<updated>2009-01-17T01:29:45Z</updated>
<author>
<name>Andrew Meadows</name>
<email>andrew@lindenlab.com</email>
</author>
<published>2009-01-17T01:29:45Z</published>
<link rel='alternate' type='text/html' href='https://www.megapahit.org/viewer.git/commit/?id=15a6d273cc00e1f4f9f9d56d8c878b46b283b289'/>
<id>urn:sha1:15a6d273cc00e1f4f9f9d56d8c878b46b283b289</id>
<content type='text'>
</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://www.megapahit.org/viewer.git/commit/?id=e3cf284388e7c8a4c0755ba9e689f6a6264a5a26'/>
<id>urn:sha1:e3cf284388e7c8a4c0755ba9e689f6a6264a5a26</id>
<content type='text'>
</content>
</entry>
</feed>
