Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

838c01e8

Commit 838c01e8 authored 14 years ago by Oz Linden

Downloads
- Plain Diff

re-merge change from Thickbrick (minor collisions with changes from viewer-public merge)

parents 1a8d917a b2b670d7

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

doc/contributions.txt 3 additions, 0 deletions

doc/contributions.txt
indra/newview/llface.cpp 67 additions, 0 deletions

indra/newview/llface.cpp
indra/newview/llface.h 3 additions, 0 deletions

indra/newview/llface.h
indra/newview/llpanelface.cpp 160 additions, 2 deletions

indra/newview/llpanelface.cpp
indra/newview/llpanelface.h 1 addition, 0 deletions

indra/newview/llpanelface.h
indra/newview/skins/default/xui/en/floater_tools.xml 19 additions, 7 deletions

indra/newview/skins/default/xui/en/floater_tools.xml

with 253 additions and 9 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