9a2b83b294
# Conflicts: # indra/llcommon/llmemory.cpp # indra/llmessage/CMakeLists.txt # indra/llmessage/llfiltersd2xmlrpc.cpp # indra/newview/lldebugview.cpp # indra/newview/lldrawpoolbump.cpp # indra/newview/llheroprobemanager.cpp # indra/newview/llnetmap.cpp # indra/newview/llslurl.cpp # indra/newview/llsurface.cpp # indra/newview/lltextureview.cpp # indra/newview/llversioninfo.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewertexturelist.h # indra/newview/llviewerwindow.cpp # indra/newview/llvlcomposition.cpp # indra/newview/llvoiceclient.cpp # indra/newview/llworld.cpp # indra/newview/llxmlrpctransaction.cpp # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/de/floater_about.xml # indra/newview/skins/default/xui/de/menu_viewer.xml # indra/newview/skins/default/xui/en/floater_about.xml # indra/newview/skins/default/xui/es/floater_about.xml # indra/newview/skins/default/xui/es/menu_viewer.xml # indra/newview/skins/default/xui/fr/floater_about.xml # indra/newview/skins/default/xui/it/floater_about.xml # indra/newview/skins/default/xui/it/menu_viewer.xml # indra/newview/skins/default/xui/ja/menu_viewer.xml # indra/newview/skins/default/xui/pl/menu_viewer.xml # indra/newview/skins/default/xui/pt/floater_about.xml # indra/newview/skins/default/xui/pt/menu_viewer.xml # indra/newview/skins/default/xui/ru/floater_about.xml # indra/newview/skins/default/xui/ru/menu_viewer.xml # indra/newview/skins/default/xui/tr/floater_about.xml # indra/newview/skins/default/xui/tr/menu_viewer.xml # indra/newview/skins/default/xui/zh/floater_about.xml # indra/newview/skins/default/xui/zh/menu_viewer.xml # scripts/messages/message_template.msg.sha1 |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| llwebrtc.cpp | ||
| llwebrtc.h | ||
| llwebrtc_impl.h | ||