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.

4f05d71e

Commit 4f05d71e authored 4 years ago by Kitty Barnett

Downloads
- Plain Diff

Merge branch 'rlva/development' into rlva/development

parents b0e3bb91 1bee1e0e

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llaisapi.cpp 5 additions, 0 deletions

indra/newview/llaisapi.cpp
indra/newview/llappviewer.cpp 4 additions, 0 deletions

indra/newview/llappviewer.cpp
indra/newview/llinventoryfunctions.cpp 8 additions, 2 deletions

indra/newview/llinventoryfunctions.cpp
indra/newview/llinventoryfunctions.h 4 additions, 1 deletion

indra/newview/llinventoryfunctions.h
indra/newview/rlvhandler.cpp 52 additions, 2 deletions

indra/newview/rlvhandler.cpp
indra/newview/rlvhandler.h 2 additions, 0 deletions

indra/newview/rlvhandler.h
indra/newview/rlvinventory.cpp 57 additions, 31 deletions

indra/newview/rlvinventory.cpp
indra/newview/rlvinventory.h 7 additions, 6 deletions

indra/newview/rlvinventory.h

with 139 additions and 42 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