diff options
| author | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
| commit | c6c7c7c71da48b60557dbc4b653398dd6343b6fc (patch) | |
| tree | 6711858f93cb0353d44568c4531ba8392990cea2 /indra/viewer_components/Resources | |
| parent | 07185d300d7879fc4d8d268210fa2c440efe02f4 (diff) | |
| parent | 83cda57b10e1416f2d104941f862f598653c42cb (diff) | |
Automated merge with tip of viewer64
Diffstat (limited to 'indra/viewer_components/Resources')
| -rw-r--r-- | indra/viewer_components/Resources/README | 9 | ||||
| -rw-r--r-- | indra/viewer_components/Resources/summary.json | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/viewer_components/Resources/README b/indra/viewer_components/Resources/README new file mode 100644 index 0000000000..b0863a7f25 --- /dev/null +++ b/indra/viewer_components/Resources/README @@ -0,0 +1,9 @@ +This directory only exists as a place for the build_data.json file to exist when the unit tests are run on a Mac, where the file goes to a sibling directory of the scripts dir. In Linux and Windows, the JSON file goes into the same directory as the script. + +See: + +test_get_summary.py +update_manager.get_summary() + +for more details +- coyot 201606.02 diff --git a/indra/viewer_components/Resources/summary.json b/indra/viewer_components/Resources/summary.json new file mode 100644 index 0000000000..b78859d427 --- /dev/null +++ b/indra/viewer_components/Resources/summary.json @@ -0,0 +1 @@ +{"Type":"viewer","Version":"4.0.5.315117","Channel":"Second Life Release"} |