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.

46ab23c9

Commit 46ab23c9 authored 12 years ago by prep

Downloads
- Patches
- Plain Diff

llinventory merge fixes

parent 9ea6a96b

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/llappearance/llwearable.cpp 4 additions, 4 deletions

indra/llappearance/llwearable.cpp
indra/llinventory/CMakeLists.txt 0 additions, 10 deletions

indra/llinventory/CMakeLists.txt
indra/llinventory/llinventory.cpp 12 additions, 14 deletions

indra/llinventory/llinventory.cpp
indra/llinventory/llpermissions.cpp 158 additions, 35 deletions

indra/llinventory/llpermissions.cpp
indra/llinventory/llpermissions.h 2 additions, 2 deletions

indra/llinventory/llpermissions.h
indra/llinventory/llsaleinfo.cpp 69 additions, 26 deletions

indra/llinventory/llsaleinfo.cpp
indra/llinventory/llsaleinfo.h 2 additions, 2 deletions

indra/llinventory/llsaleinfo.h
indra/test/llpermissions_tut.cpp 2 additions, 2 deletions

indra/test/llpermissions_tut.cpp
indra/test/llsaleinfo_tut.cpp 2 additions, 2 deletions

indra/test/llsaleinfo_tut.cpp

with 251 additions and 97 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