diff options
| author | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
| commit | 9c4ed8d1138de86041b740139c4deec1bc6bf8ee (patch) | |
| tree | d7452bc7faeae01964f13faaa16e2812b27ba93c /indra/llappearance | |
| parent | e6fb7564b02ba73c8a402efaca65cb944ce7bef2 (diff) | |
| parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) | |
Automated merge with tip of viewer-release to pick up 4.0.5
Diffstat (limited to 'indra/llappearance')
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llavatarappearance.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llavatarappearance.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/lldriverparam.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/lldriverparam.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/lltexglobalcolor.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/lltexglobalcolor.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/lltexlayerparams.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/lltexlayerparams.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llwearable.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llwearable.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llwearabledata.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llwearabledata.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llwearabletype.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llappearance/llwearabletype.h | 0 |
14 files changed, 0 insertions, 0 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index d1eb389013..d1eb389013 100755..100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h index a0ef49b7cb..a0ef49b7cb 100755..100644 --- a/indra/llappearance/llavatarappearance.h +++ b/indra/llappearance/llavatarappearance.h diff --git a/indra/llappearance/lldriverparam.cpp b/indra/llappearance/lldriverparam.cpp index e630c1118b..e630c1118b 100755..100644 --- a/indra/llappearance/lldriverparam.cpp +++ b/indra/llappearance/lldriverparam.cpp diff --git a/indra/llappearance/lldriverparam.h b/indra/llappearance/lldriverparam.h index f71c930e5e..f71c930e5e 100755..100644 --- a/indra/llappearance/lldriverparam.h +++ b/indra/llappearance/lldriverparam.h diff --git a/indra/llappearance/lltexglobalcolor.cpp b/indra/llappearance/lltexglobalcolor.cpp index 3df2254b14..3df2254b14 100755..100644 --- a/indra/llappearance/lltexglobalcolor.cpp +++ b/indra/llappearance/lltexglobalcolor.cpp diff --git a/indra/llappearance/lltexglobalcolor.h b/indra/llappearance/lltexglobalcolor.h index 3b426053de..3b426053de 100755..100644 --- a/indra/llappearance/lltexglobalcolor.h +++ b/indra/llappearance/lltexglobalcolor.h diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp index ff682d6906..ff682d6906 100755..100644 --- a/indra/llappearance/lltexlayerparams.cpp +++ b/indra/llappearance/lltexlayerparams.cpp diff --git a/indra/llappearance/lltexlayerparams.h b/indra/llappearance/lltexlayerparams.h index 0cb2dedbff..0cb2dedbff 100755..100644 --- a/indra/llappearance/lltexlayerparams.h +++ b/indra/llappearance/lltexlayerparams.h diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp index 5ca9f55ac8..5ca9f55ac8 100755..100644 --- a/indra/llappearance/llwearable.cpp +++ b/indra/llappearance/llwearable.cpp diff --git a/indra/llappearance/llwearable.h b/indra/llappearance/llwearable.h index 875c2932f1..875c2932f1 100755..100644 --- a/indra/llappearance/llwearable.h +++ b/indra/llappearance/llwearable.h diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp index 2bf3b9085b..2bf3b9085b 100755..100644 --- a/indra/llappearance/llwearabledata.cpp +++ b/indra/llappearance/llwearabledata.cpp diff --git a/indra/llappearance/llwearabledata.h b/indra/llappearance/llwearabledata.h index a0c446ea9e..a0c446ea9e 100755..100644 --- a/indra/llappearance/llwearabledata.h +++ b/indra/llappearance/llwearabledata.h diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp index 87109a5906..87109a5906 100755..100644 --- a/indra/llappearance/llwearabletype.cpp +++ b/indra/llappearance/llwearabletype.cpp diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h index 519d5b92a2..519d5b92a2 100755..100644 --- a/indra/llappearance/llwearabletype.h +++ b/indra/llappearance/llwearabletype.h |