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.

95705539

Commit 95705539 authored 15 years ago by James Cook

Downloads
- Plain Diff

merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp

parents ef46d407 59eb8a43

No related branches found

No related tags found

No related merge requests found

Changes 104

Hide whitespace changes

Inline Side-by-side

Showing

indra/llrender/llrendertarget.cpp 4 additions, 22 deletions

indra/llrender/llrendertarget.cpp
indra/llrender/llrendertarget.h 0 additions, 7 deletions

indra/llrender/llrendertarget.h
indra/llui/llconsole.cpp 0 additions, 5 deletions

indra/llui/llconsole.cpp
indra/llui/llflatlistview.h 1 addition, 1 deletion

indra/llui/llflatlistview.h
indra/llui/llfloater.h 1 addition, 0 deletions

indra/llui/llfloater.h
indra/llui/lltextbase.cpp 3 additions, 3 deletions

indra/llui/lltextbase.cpp
indra/llui/llurlentry.cpp 33 additions, 0 deletions

indra/llui/llurlentry.cpp
indra/llui/llurlentry.h 13 additions, 0 deletions

indra/llui/llurlentry.h
indra/llui/llurlregistry.cpp 1 addition, 0 deletions

indra/llui/llurlregistry.cpp
indra/newview/CMakeLists.txt 2 additions, 2 deletions

indra/newview/CMakeLists.txt
indra/newview/llagent.cpp 5 additions, 1 deletion

indra/newview/llagent.cpp
indra/newview/llagent.h 1 addition, 1 deletion

indra/newview/llagent.h
indra/newview/llagentwearables.cpp 96 additions, 11 deletions

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

indra/newview/llagentwearables.h
indra/newview/llappearancemgr.cpp 4 additions, 7 deletions

indra/newview/llappearancemgr.cpp
indra/newview/llappviewer.cpp 1 addition, 8 deletions

indra/newview/llappviewer.cpp
indra/newview/llavataractions.cpp 22 additions, 1 deletion

indra/newview/llavataractions.cpp
indra/newview/llavataractions.h 5 additions, 0 deletions

indra/newview/llavataractions.h
indra/newview/llbottomtray.cpp 73 additions, 73 deletions

indra/newview/llbottomtray.cpp
indra/newview/llchathistory.cpp 23 additions, 4 deletions

indra/newview/llchathistory.cpp

with 289 additions and 146 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