Age | Commit message (Collapse) | Author |
|
--HG--
branch : product-engine
|
|
Checker: UNINIT_CTOR
Function: LLNotification::LLNotification(LLUUID)
File: /indra/llui/llnotifications.h
|
|
|
|
Gosh, I don't know why this unused ctor actually matters, but it does. o.O
|
|
Checker: UNINIT_CTOR
Function: LLNotificationComparators::orderBy<const LLUUID &>::orderBy(boost::function<const LLUUID &(boost::shared_ptr<LLNotification>)>, LLNotificationComparators::e_direction)
File: /indra/llui/llnotifications.h
|
|
Checker: UNINIT_CTOR
Function: LLNotification::LLNotification(LLUUID)
File: /indra/llui/llnotifications.h
'don't use this for anything real' code shouldn't exist. :)
|
|
Cuts number of includes of llnotifications.h from 300+ to 40.
|
|
Fixed many more includes
|
|
|
|
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
|
|
some post-merge cleanup.
|
|
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
|
|
I'll need to rebuild that, plus a couple other minor clenaups.
|
|
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
|
|
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
|
|
- Added LLNotificationsInterface class.
- Removed LLLoginInstance use of LLNotifications EventAPI
|
|
|
|
according to https://wiki.lindenlab.com/wiki/Incremental_Viewer_Automation/Event_API
reviewed by palmer.
|
|
new --nonotifications command line option for automated testing
Reviewed by Q
|
|
|
|
ignore-dead-branch
|
|
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
|
|
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
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
|