diff options
| author | Richard Linden <none@none> | 2011-10-21 15:04:01 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-21 15:04:01 -0700 |
| commit | aaabea2ced46015385a2528d0ca24e8d2a96da55 (patch) | |
| tree | 2f4e2cd47807a99f09ef3651193e9dfb038de1f9 /indra/newview | |
| parent | 2456573925567ed91d4cc227d7fc97b90248a1fa (diff) | |
| parent | f2952ded0396e98e1010ebe39de5bba0ae6ba5f7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/paulgproductengine/exp-1404/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llhudeffectblob.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llhudeffectblob.h | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 52aa2a3be3..75bd396449 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1836,7 +1836,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>Cursor3D</key> <map> diff --git a/indra/newview/llhudeffectblob.cpp b/indra/newview/llhudeffectblob.cpp index d8687eed8d..c909551b51 100644 --- a/indra/newview/llhudeffectblob.cpp +++ b/indra/newview/llhudeffectblob.cpp @@ -44,12 +44,20 @@ LLHUDEffectBlob::~LLHUDEffectBlob() { } +void LLHUDEffectBlob::markDead() +{ + mImage = NULL; + + LLHUDEffect::markDead(); +} + void LLHUDEffectBlob::render() { F32 time = mTimer.getElapsedTimeF32(); if (mDuration < time) { markDead(); + return; } LLVector3 pos_agent = gAgent.getPosAgentFromGlobal(mPositionGlobal); diff --git a/indra/newview/llhudeffectblob.h b/indra/newview/llhudeffectblob.h index f4c1691108..ce3e8500fc 100644 --- a/indra/newview/llhudeffectblob.h +++ b/indra/newview/llhudeffectblob.h @@ -35,6 +35,8 @@ class LLHUDEffectBlob : public LLHUDEffect public: friend class LLHUDObject; + void markDead(); + void setPixelSize(S32 pixels) { mPixelSize = pixels; } protected: diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f2617556e6..308208869d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2028,7 +2028,7 @@ Returns a string with the requested data about the region <string name="PlacesNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search].</string> <string name="FavoritesNoMatchingItems">Drag a landmark here to add it to your favorites.</string> <string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string> - <string name="InventoryInboxNoItems">Items purchased through the marketplace will be delivered here.</string> + <string name="InventoryInboxNoItems">When you purchase or otherwise receive an item, it will appear here so you can drag it to a folder in your inventory, or delete it if you do not wish to keep it.</string> <string name="MarketplaceURL">http://marketplace.[DOMAIN_NAME]</string> <string name="MarketplaceURL_CreateStore">http://marketplace.[DOMAIN_NAME]/create_store</string> <string name="MarketplaceURL_LearnMore">http://marketplace.[DOMAIN_NAME]/learn_more</string> |