diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-18 23:41:19 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-18 23:41:19 +0300 |
| commit | 510574dc1416b02d6f045feda2555f87e99d1c0c (patch) | |
| tree | afa1acea9b30cafaa368779e10d94a3ff335232f /indra/newview/viewer_manifest.py | |
| parent | ebc629ffc45e7d1cf66e3f98ee4ca90dea18af33 (diff) | |
| parent | ed3d9abdd01304b5a9708880d9b150fb6568256b (diff) | |
Merge branch 'master' into DRTVWR-501-maint
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.cpp
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index a403760670..82740c9623 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -78,6 +78,9 @@ class ViewerManifest(LLManifest): contributor_names = self.extract_names(contributions_path) self.put_in_file(contributor_names, "contributors.txt", src=contributions_path) + # ... and the default camera position settings + self.path("camera") + # ... and the entire windlight directory self.path("windlight") |