diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/contrast/textures/cloud-particle.j2c | bin | 4049 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/skins/contrast/textures/cloud-particle.png | bin | 0 -> 42378 bytes | |||
| -rw-r--r-- | indra/newview/skins/contrast/textures/textures.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/cloud-particle.j2c | bin | 4049 -> 0 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/cloud-particle.png | bin | 0 -> 42378 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 2 | 
7 files changed, 3 insertions, 3 deletions
| diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a6d50af025..7ea70a781b 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -1191,7 +1191,7 @@ void LLVOAvatar::initClass()      LLControlAvatar::sRegionChangedSlot = gAgent.addRegionChangedCallback(&LLControlAvatar::onRegionChanged); -    sCloudTexture = LLViewerTextureManager::getFetchedTextureFromFile("cloud-particle.j2c"); +    sCloudTexture = LLViewerTextureManager::getFetchedTextureFromFile("cloud-particle.png");  } diff --git a/indra/newview/skins/contrast/textures/cloud-particle.j2c b/indra/newview/skins/contrast/textures/cloud-particle.j2cBinary files differ deleted file mode 100644 index 6c03bf6d05..0000000000 --- a/indra/newview/skins/contrast/textures/cloud-particle.j2c +++ /dev/null diff --git a/indra/newview/skins/contrast/textures/cloud-particle.png b/indra/newview/skins/contrast/textures/cloud-particle.pngBinary files differ new file mode 100644 index 0000000000..f2080ddb9f --- /dev/null +++ b/indra/newview/skins/contrast/textures/cloud-particle.png diff --git a/indra/newview/skins/contrast/textures/textures.xml b/indra/newview/skins/contrast/textures/textures.xml index f824816183..1fe1ff333a 100644 --- a/indra/newview/skins/contrast/textures/textures.xml +++ b/indra/newview/skins/contrast/textures/textures.xml @@ -796,7 +796,7 @@ with the same filename but different name    <texture name="script_error.j2c" use_mips="true" />    <texture name="silhouette.j2c" use_mips="true" />    <texture name="foot_shadow.j2c" use_mips="true" /> -  <texture name="cloud-particle.j2c" use_mips="true" /> +  <texture name="cloud-particle.png" use_mips="true" />    <texture name="transparent.j2c" use_mips="true" />    <!--WARNING OLD ART BELOW *do not use*--> diff --git a/indra/newview/skins/default/textures/cloud-particle.j2c b/indra/newview/skins/default/textures/cloud-particle.j2cBinary files differ deleted file mode 100644 index 6c03bf6d05..0000000000 --- a/indra/newview/skins/default/textures/cloud-particle.j2c +++ /dev/null diff --git a/indra/newview/skins/default/textures/cloud-particle.png b/indra/newview/skins/default/textures/cloud-particle.pngBinary files differ new file mode 100644 index 0000000000..f2080ddb9f --- /dev/null +++ b/indra/newview/skins/default/textures/cloud-particle.png diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index f824816183..1fe1ff333a 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -796,7 +796,7 @@ with the same filename but different name    <texture name="script_error.j2c" use_mips="true" />    <texture name="silhouette.j2c" use_mips="true" />    <texture name="foot_shadow.j2c" use_mips="true" /> -  <texture name="cloud-particle.j2c" use_mips="true" /> +  <texture name="cloud-particle.png" use_mips="true" />    <texture name="transparent.j2c" use_mips="true" />    <!--WARNING OLD ART BELOW *do not use*--> | 
