# Conflicts: # indra/llcommon/llmemory.cpp # indra/newview/llpanelsnapshot.cpp # indra/newview/llsnapshotlivepreview.cpp # indra/newview/rlvinventory.cpp