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.

aaaf3189

Commit aaaf3189 authored 4 years ago by Andrey Lihatskiy

Downloads
- Plain Diff

Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint

parents 847cce91 b86fdf1c

No related branches found

No related tags found

No related merge requests found

Changes 77

Hide whitespace changes

Inline Side-by-side

Showing

doc/contributions.txt 1 addition, 0 deletions

doc/contributions.txt
indra/llrender/llgl.cpp 8 additions, 8 deletions

indra/llrender/llgl.cpp
indra/llui/llfloater.cpp 0 additions, 1 deletion

indra/llui/llfloater.cpp
indra/llui/lluictrl.h 2 additions, 1 deletion

indra/llui/lluictrl.h
indra/llxml/llcontrol.cpp 51 additions, 0 deletions

indra/llxml/llcontrol.cpp
indra/llxml/llcontrol.h 11 additions, 4 deletions

indra/llxml/llcontrol.h
indra/newview/CMakeLists.txt 10 additions, 0 deletions

indra/newview/CMakeLists.txt
indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletion

indra/newview/VIEWER_VERSION.txt
indra/newview/app_settings/camera/Front.xml 142 additions, 0 deletions

indra/newview/app_settings/camera/Front.xml
indra/newview/app_settings/camera/Rear.xml 142 additions, 0 deletions

indra/newview/app_settings/camera/Rear.xml
indra/newview/app_settings/camera/Side.xml 142 additions, 0 deletions

indra/newview/app_settings/camera/Side.xml
indra/newview/app_settings/settings.xml 102 additions, 1 deletion

indra/newview/app_settings/settings.xml
indra/newview/llagentcamera.cpp 126 additions, 42 deletions

indra/newview/llagentcamera.cpp
indra/newview/llagentcamera.h 41 additions, 14 deletions

indra/newview/llagentcamera.h
indra/newview/llappviewer.cpp 7 additions, 4 deletions

indra/newview/llappviewer.cpp
indra/newview/llfloatercamera.cpp 107 additions, 60 deletions

indra/newview/llfloatercamera.cpp
indra/newview/llfloatercamera.h 12 additions, 5 deletions

indra/newview/llfloatercamera.h
indra/newview/llfloatercamerapresets.cpp 145 additions, 0 deletions

indra/newview/llfloatercamerapresets.cpp
indra/newview/llfloatercamerapresets.h 73 additions, 0 deletions

indra/newview/llfloatercamerapresets.h
indra/newview/llfloaterdeleteprefpreset.cpp 13 additions, 6 deletions

indra/newview/llfloaterdeleteprefpreset.cpp

with 1136 additions and 147 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