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.

570d562f

Commit 570d562f authored 13 years ago by Oz Linden

Downloads
- Plain Diff

merge changes for vmrg-209 and vmrg-210 back from beta branch

parents b022ebf1 55f1d95d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/llcommon/llthread.h 5 additions, 2 deletions

indra/llcommon/llthread.h
indra/llmessage/llcurl.cpp 85 additions, 46 deletions

indra/llmessage/llcurl.cpp
indra/llmessage/llcurl.h 5 additions, 0 deletions

indra/llmessage/llcurl.h
indra/newview/llchiclet.cpp 6 additions, 0 deletions

indra/newview/llchiclet.cpp
indra/newview/llscriptfloater.cpp 9 additions, 2 deletions

indra/newview/llscriptfloater.cpp
indra/newview/llsyswellwindow.cpp 12 additions, 1 deletion

indra/newview/llsyswellwindow.cpp
indra/newview/llsyswellwindow.h 1 addition, 0 deletions

indra/newview/llsyswellwindow.h

with 123 additions and 51 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