Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

XDG Integration
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

a160e084

Commit a160e084 authored 8 years ago by Nat Goodspeed

Downloads
- Plain Diff

Automated merge with ssh://bitbucket.org/lindenlab/viewer64-maint-7177

parents 17c8eadb c1458713

Branches

No related tags found

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

indra/llcommon/llerror.cpp 62 additions, 35 deletions

indra/llcommon/llerror.cpp
indra/llcommon/llevents.cpp 9 additions, 3 deletions

indra/llcommon/llevents.cpp
indra/llcommon/llevents.h 15 additions, 3 deletions

indra/llcommon/llevents.h
indra/llcommon/llhandle.h 1 addition, 0 deletions

indra/llcommon/llhandle.h
indra/llcommon/llsingleton.h 8 additions, 0 deletions

indra/llcommon/llsingleton.h
indra/newview/llappviewer.cpp 4 additions, 5 deletions

indra/newview/llappviewer.cpp
indra/viewer_components/updater/llupdaterservice.cpp 6 additions, 4 deletions

indra/viewer_components/updater/llupdaterservice.cpp

with 105 additions and 50 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