diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 01:52:28 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 01:52:28 -0800 |
| commit | 2d7697dfade4ecbb8fbe9b26a5332fc9e93f5669 (patch) | |
| tree | 5e956b1e9bfc1efd65bcd365abac613b4d4baf04 /indra/newview/skins/default/textures | |
| parent | 5c73a908353cdd7210e3148f7162d30afab7873a (diff) | |
| parent | 6ea944b38f1e619df2c52283f6b33bbcc1cbbc40 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/skins/default/textures')
| -rw-r--r-- | indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png | bin | 393 -> 3347 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png | bin | 424 -> 3221 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png | bin | 429 -> 3235 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png | bin | 271 -> 3077 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_M_Dark.png | bin | 333 -> 348 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_M_Light.png | bin | 322 -> 335 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png | bin | 407 -> 400 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_PG_Light.png | bin | 387 -> 403 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_R_Dark.png | bin | 319 -> 357 bytes |
| -rw-r--r-- | indra/newview/skins/default/textures/icons/Parcel_R_Light.png | bin | 309 -> 355 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png b/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png Binary files differindex 28ff6ba976..9e7291d6fb 100644 --- a/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png +++ b/indra/newview/skins/default/textures/bottomtray/Move_Fly_Off.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png Binary files differindex 0455a52fdc..e0b18b2451 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png Binary files differindex be0c379d84..101aaa42b1 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_FlyNo_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png Binary files differindex ed4a512e04..c27f18e3c7 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_Fly_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png Binary files differindex 2f5871b8ff..60e6a00a25 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_M_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_M_Light.png b/indra/newview/skins/default/textures/icons/Parcel_M_Light.png Binary files differindex 724ac22744..55f97f3b4e 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_M_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_M_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png Binary files differindex f0565f02dd..11ab1f1e60 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_PG_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png b/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png Binary files differindex f32b0570a1..b536762ddc 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_PG_Light.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png Binary files differindex e0e6e14cca..bf618752f6 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png +++ b/indra/newview/skins/default/textures/icons/Parcel_R_Dark.png diff --git a/indra/newview/skins/default/textures/icons/Parcel_R_Light.png b/indra/newview/skins/default/textures/icons/Parcel_R_Light.png Binary files differindex efca6776da..a67bbd0cc5 100644 --- a/indra/newview/skins/default/textures/icons/Parcel_R_Light.png +++ b/indra/newview/skins/default/textures/icons/Parcel_R_Light.png |
