diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/app_settings/std_bump.ini | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/app_settings/std_bump.ini')
| -rw-r--r-- | indra/newview/app_settings/std_bump.ini | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/app_settings/std_bump.ini b/indra/newview/app_settings/std_bump.ini index f34e21ce32..561e04c33c 100644 --- a/indra/newview/app_settings/std_bump.ini +++ b/indra/newview/app_settings/std_bump.ini @@ -1,18 +1,18 @@ LLStandardBumpmap version 1 -woodgrain 058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c -bark 6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c -bricks b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c -checker 9deab416-9c63-78d6-d558-9a156f12044c.j2c -concrete db9d39ec-a896-c287-1ced-64566217021e.j2c -crustytile f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c -cutstone d9258671-868f-7511-c321-7baef9e948a4.j2c -discs d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c -gravel 4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c -petridish e569711a-27c2-aad4-9246-0c910239a179.j2c -siding 073c9723-540c-5449-cdd4-0e87fdc159e3.j2c -stonetile ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c -stucco 92e66e00-f56f-598a-7997-048aa64cde18.j2c -suction 83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c -weave 735198cf-6ea0-2550-e222-21d3c6a341ae.j2c +woodgrain 058c75c0-a0d5-f2f8-43f3-e9699a89c2fc +bark 6c9fa78a-1c69-2168-325b-3e03ffa348ce +bricks b8eed5f0-64b7-6e12-b67f-43fa8e773440 +checker 9deab416-9c63-78d6-d558-9a156f12044c +concrete db9d39ec-a896-c287-1ced-64566217021e +crustytile f2d7b6f6-4200-1e9a-fd5b-96459e950f94 +cutstone d9258671-868f-7511-c321-7baef9e948a4 +discs d21e44ca-ff1c-a96e-b2ef-c0753426b7d9 +gravel 4726f13e-bd07-f2fb-feb0-bfa2ac58ab61 +petridish e569711a-27c2-aad4-9246-0c910239a179 +siding 073c9723-540c-5449-cdd4-0e87fdc159e3 +stonetile ae874d1a-93ef-54fb-5fd3-eb0cb156afc0 +stucco 92e66e00-f56f-598a-7997-048aa64cde18 +suction 83b77fc6-10b4-63ec-4de7-f40629f238c5 +weave 735198cf-6ea0-2550-e222-21d3c6a341ae |