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.

158ca59a

Commit 158ca59a authored 13 years ago by Richard Linden

Downloads
- Plain Diff

merge

parents e96c6d05 fff9567a

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/llsdparam.cpp 3 additions, 3 deletions

indra/llui/llsdparam.cpp
indra/llui/lluiimage.h 2 additions, 2 deletions

indra/llui/lluiimage.h
indra/llxuixml/llinitparam.cpp 29 additions, 30 deletions

indra/llxuixml/llinitparam.cpp
indra/llxuixml/llinitparam.h 239 additions, 172 deletions

indra/llxuixml/llinitparam.h
indra/llxuixml/llxuiparser.cpp 27 additions, 0 deletions

indra/llxuixml/llxuiparser.cpp
indra/llxuixml/llxuiparser.h 2 additions, 0 deletions

indra/llxuixml/llxuiparser.h
indra/newview/llvoavatar.cpp 200 additions, 210 deletions

indra/newview/llvoavatar.cpp
indra/newview/llvoavatar.h 5 additions, 4 deletions

indra/newview/llvoavatar.h

with 507 additions and 421 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