Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
can be distinguished from others
|
|
exceeding the L$ balance
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/llfloaterbuycurrency.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.h
# indra/newview/skins/default/xui/en/floater_buy_currency.xml
|
|
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
|
|
# Conflicts:
# indra/newview/llgroupmgr.cpp
|
|
# Conflicts:
# indra/newview/pipeline.cpp
|
|
|
|
|
|
|
|
following promotion of DRTVWR-497
|
|
|
|
|
|
|
|
These logs were not logging for very long due to supressed logging system, no point showing them now
|
|
Depends onto SL-13979 for proper logging
|
|
|
|
|
|
|
|
LLSingleton depends onto logging system, having logging system be based on LLSingleton causes crashes and deadlocks
|
|
new lldiskcache implementation
|
|
Due to conflicts picked up ptolemy's fix manually
|
|
|
|
|
|
since it's responsible for performing file system operations and (will eventually) delegrate to a separate disk cache component to save/load data and keep track of metadata etc.
|
|
to login
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|