591c75ebaf
# Conflicts: # indra/llappearance/llavatarappearance.cpp # indra/llmath/llvolume.cpp # indra/llmessage/llcorehttputil.cpp # indra/llrender/llgl.cpp # indra/newview/installers/darwin/apple-notarize.sh # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llfloater360capture.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/llpanelpeople.cpp # indra/newview/llviewertexture.cpp # indra/newview/viewer_manifest.py |
||
|---|---|---|
| .. | ||
| FIRESTORM_DESKTOPINSTALL.txt | ||
| client-readme-joystick.txt | ||
| client-readme-voice.txt | ||
| client-readme.txt | ||
| handle_secondlifeprotocol.sh | ||
| install.sh | ||
| launch_url.sh | ||
| refresh_desktop_app_entry.sh | ||
| register_hopprotocol.sh | ||
| register_secondlifeprotocol.sh | ||
| wrapper.sh | ||