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.

68a718c1

Commit 68a718c1 authored 14 years ago by Tofu Linden

Downloads
- Patches
- Plain Diff

Conflict resolution. Erring on the side of viewer-release.

parent 7ac8658c

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llcofwearables.cpp 4 additions, 4 deletions

indra/newview/llcofwearables.cpp
indra/newview/llpaneloutfitedit.cpp 20 additions, 227 deletions

indra/newview/llpaneloutfitedit.cpp
indra/newview/llpaneloutfitedit.h 3 additions, 10 deletions

indra/newview/llpaneloutfitedit.h
indra/newview/llwearableitemslist.cpp 1 addition, 32 deletions

indra/newview/llwearableitemslist.cpp
indra/newview/llwearableitemslist.h 0 additions, 26 deletions

indra/newview/llwearableitemslist.h

with 28 additions and 299 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