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.

620de712

Commit 620de712 authored 15 years ago by James Cook

Downloads
- Plain Diff

merge, manual conflict fix panel_bottomtray.xml, talk_button.xml, llfloaternearbymedia.cpp

parents 7bfa11ed 070c3a1e

No related branches found

No related tags found

Loading

Changes 70

Hide whitespace changes

Inline Side-by-side

Showing

.hgignore 5 additions, 0 deletions

.hgignore
indra/llrender/llrendertarget.cpp 0 additions, 26 deletions

indra/llrender/llrendertarget.cpp
indra/llui/llbutton.cpp 37 additions, 14 deletions

indra/llui/llbutton.cpp
indra/llui/llbutton.h 5 additions, 3 deletions

indra/llui/llbutton.h
indra/llui/llfloater.cpp 6 additions, 2 deletions

indra/llui/llfloater.cpp
indra/llui/llfocusmgr.cpp 38 additions, 5 deletions

indra/llui/llfocusmgr.cpp
indra/llui/llfocusmgr.h 8 additions, 8 deletions

indra/llui/llfocusmgr.h
indra/llui/lllineeditor.cpp 4 additions, 2 deletions

indra/llui/lllineeditor.cpp
indra/llui/llmenugl.cpp 12 additions, 5 deletions

indra/llui/llmenugl.cpp
indra/llui/llmultislider.cpp 32 additions, 5 deletions

indra/llui/llmultislider.cpp
indra/llui/llmultislider.h 5 additions, 4 deletions

indra/llui/llmultislider.h
indra/llui/llmultisliderctrl.cpp 2 additions, 2 deletions

indra/llui/llmultisliderctrl.cpp
indra/llui/llpanel.cpp 22 additions, 3 deletions

indra/llui/llpanel.cpp
indra/llui/llpanel.h 4 additions, 2 deletions

indra/llui/llpanel.h
indra/llui/llslider.cpp 31 additions, 5 deletions

indra/llui/llslider.cpp
indra/llui/llslider.h 5 additions, 4 deletions

indra/llui/llslider.h
indra/llui/llsliderctrl.cpp 2 additions, 2 deletions

indra/llui/llsliderctrl.cpp
indra/llui/llspinctrl.cpp 3 additions, 3 deletions

indra/llui/llspinctrl.cpp
indra/llui/lltabcontainer.cpp 3 additions, 3 deletions

indra/llui/lltabcontainer.cpp
indra/llui/lltextbase.cpp 5 additions, 0 deletions

indra/llui/lltextbase.cpp

with 229 additions and 98 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