diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-22 14:45:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-22 14:45:22 -0500 |
| commit | d12627d8f76004d79d552e8414ff6deefbbf5358 (patch) | |
| tree | 3082dfa9cda570ff4fa6a13d64391f47c7838bf2 | |
| parent | 1378d4407f377f25a120beca716683dcce088fdb (diff) | |
| parent | 30b48351f9af386652ea00ca6f3288248f550a2f (diff) | |
merge changes for open-161
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/lltexturecache.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index f53d9f5cfd..ea90dd6b87 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -646,6 +646,7 @@ Jonathan Yap STORM-1872 STORM-1858 STORM-1862 + OPEN-161 Kadah Coba STORM-1060 STORM-1843 @@ -1163,6 +1164,7 @@ Techwolf Lupindo SNOW-746 VWR-12385 VWR-20893 + OPEN-161 Templar Merlin tenebrous pau VWR-247 diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h index e3fc957fd2..deaacc4975 100644 --- a/indra/newview/lltexturecache.h +++ b/indra/newview/lltexturecache.h @@ -24,7 +24,7 @@ * $/LicenseInfo$ */ -#ifndef LL_LLTEXTURECACHE_ +#ifndef LL_LLTEXTURECACHE_H #define LL_LLTEXTURECACHE_H #include "lldir.h" |