Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

XDG Integration
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

f57638f8

Commit f57638f8 authored 4 years ago by Rye Mutt

Downloads
- Patches
- Plain Diff

Fix merge issues and build failures after import of LL 6.4.12-release

parent 691ccb6c

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/llappearance/llavatarappearance.cpp 2 additions, 2 deletions

indra/llappearance/llavatarappearance.cpp
indra/llappearance/llavatarappearancedefines.h 1 addition, 1 deletion

indra/llappearance/llavatarappearancedefines.h
indra/llmessage/llavatarnamecache.cpp 1 addition, 1 deletion

indra/llmessage/llavatarnamecache.cpp
indra/newview/llappviewer.cpp 1 addition, 1 deletion

indra/newview/llappviewer.cpp
indra/newview/llfloaterjoystick.cpp 1 addition, 1 deletion

indra/newview/llfloaterjoystick.cpp
indra/newview/llviewerjoystick.cpp 8 additions, 7 deletions

indra/newview/llviewerjoystick.cpp
indra/newview/llviewerstats.cpp 2 additions, 1 deletion

indra/newview/llviewerstats.cpp
indra/newview/llvoavatar.cpp 3 additions, 4 deletions

indra/newview/llvoavatar.cpp
indra/newview/llvoavatarself.cpp 0 additions, 2 deletions

indra/newview/llvoavatarself.cpp

with 19 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment