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

17 Commits (1d4d4fec00aacb1e1e00a4f60a6af4d8ed3b8bde)

Author SHA1 Message Date
Steve Bennetts 642d368ecc merge 2009-10-21 18:49:19 -07:00
Richard Nelson fdc848cf72 removed unnecessary static variable instantiations to improve compile times 
moved a bunch of template class statics to cpp files
also added filename parameter to LLXUIParser::readXUI for better debugging of XUI errors

reviewed by James
 2009-10-20 22:05:00 +00:00
brad kittenbrink 33cc363a68 Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup. 2009-08-04 15:34:34 -07:00
Richard Nelson eb853f55c0 svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-08-04 01:12:59 +00:00
brad kittenbrink a7efd0d8dd Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups. 2009-07-30 19:39:08 -07:00
Steven Bennetts e97f7728a9 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 2009-07-30 23:22:41 +00:00
James Cook 8f7ec64899 Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete. 
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
 2009-07-27 17:56:26 +00:00
Mark Palange (Mani) 9538328d5f Adding LLLoginInstance unit test. 
- Added LLNotificationsInterface class.
 - Removed LLLoginInstance use of LLNotifications EventAPI
 2009-07-24 15:08:16 -07:00
brad kittenbrink 61c27f2663 Oops, LLNotificationsListener can't just be forward declared under gcc. 2009-07-15 17:54:11 -07:00
brad kittenbrink 429bd9b55c Added LLNotificationsListener to hook LLNotifications to the event system according to https://wiki.lindenlab.com/wiki/Incremental_Viewer_Automation/Event_API 
reviewed by palmer.
 2009-07-08 12:07:31 -07:00
Palmer Truelson e2655d4c4b DEV-34569 
new --nonotifications command line option for automated testing

Reviewed by Q
 2009-06-26 12:17:35 +00:00
Steven Bennetts ade6bbb06c merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3 2009-06-21 17:16:27 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 
ignore-dead-branch
 2009-06-21 08:04:56 +00:00
Brad Kittenbrink 087bd26553 Merge of QAR-1383 event-system-7 into trunk. 
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
 2009-06-04 16:24:21 +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
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Kent Quirk 667ca55bad svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00