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 @@ Type Boolean Value - 0 + 1 Cursor3D 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 Didn't find what you're looking for? Try [secondlife:///app/search/places/[SEARCH_TERM] Search]. Drag a landmark here to add it to your favorites. You do not have a copy of this texture in your inventory - Items purchased through the marketplace will be delivered here. + 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. http://marketplace.[DOMAIN_NAME] http://marketplace.[DOMAIN_NAME]/create_store http://marketplace.[DOMAIN_NAME]/learn_more