Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

6b48a59c

Commit 6b48a59c authored 15 years ago by Kent Quirk

Downloads
- Plain Diff

merge changes from backing out the directory change of default to base

parents 2d00beee c4b42ca7

No related branches found

No related tags found

No related merge requests found

Changes 21

Hide whitespace changes

Inline Side-by-side

Showing

indra/llrender/llfontfreetype.cpp 23 additions, 0 deletions

indra/llrender/llfontfreetype.cpp
indra/llrender/llfontfreetype.h 2 additions, 0 deletions

indra/llrender/llfontfreetype.h
indra/llrender/llfontgl.cpp 46 additions, 11 deletions

indra/llrender/llfontgl.cpp
indra/llui/llfloater.cpp 10 additions, 3 deletions

indra/llui/llfloater.cpp
indra/llui/llkeywords.cpp 81 additions, 1 deletion

indra/llui/llkeywords.cpp
indra/llui/llkeywords.h 27 additions, 2 deletions

indra/llui/llkeywords.h
indra/llui/llmenugl.cpp 32 additions, 8 deletions

indra/llui/llmenugl.cpp
indra/llui/llmenugl.h 3 additions, 7 deletions

indra/llui/llmenugl.h
indra/llui/llresizehandle.cpp 45 additions, 41 deletions

indra/llui/llresizehandle.cpp
indra/llui/lltextbase.cpp 28 additions, 12 deletions

indra/llui/lltextbase.cpp
indra/llui/lltextbase.h 6 additions, 2 deletions

indra/llui/lltextbase.h
indra/newview/app_settings/settings.xml 1 addition, 12 deletions

indra/newview/app_settings/settings.xml
indra/newview/llagentwearables.cpp 1 addition, 0 deletions

indra/newview/llagentwearables.cpp
indra/newview/llbottomtray.cpp 1 addition, 1 deletion

indra/newview/llbottomtray.cpp
indra/newview/llfloaterpreference.cpp 0 additions, 26 deletions

indra/newview/llfloaterpreference.cpp
indra/newview/llpanelnearbymedia.cpp 24 additions, 7 deletions

indra/newview/llpanelnearbymedia.cpp
indra/newview/llpanelnearbymedia.h 5 additions, 5 deletions

indra/newview/llpanelnearbymedia.h
indra/newview/lltexlayer.cpp 2 additions, 2 deletions

indra/newview/lltexlayer.cpp
indra/newview/llvieweraudio.cpp 1 addition, 1 deletion

indra/newview/llvieweraudio.cpp
indra/newview/llviewermedia.cpp 3 additions, 0 deletions

indra/newview/llviewermedia.cpp

with 341 additions and 141 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