diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2017-04-03 18:35:21 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2017-04-03 18:35:21 +0300 |
| commit | 5580080276bd120a65d49267fc10e08c92706e1e (patch) | |
| tree | 73067b1975855755a225c92461b77b06bea8f9ea | |
| parent | ab927f7991acb9fb0b005f786b21cfe073192c2e (diff) | |
MAINT-7274 Placeholder text shouldn't be shown
| -rw-r--r-- | indra/newview/llinventorymodelbackgroundfetch.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 12 |
3 files changed, 21 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index ee803d5e68..406c8b89d0 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -387,7 +387,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch() // Process completed background HTTP requests gInventory.handleResponses(false); // Just processed a bunch of items. - // Note: do we really need it? + // Note: do we really need notifyObservers() here? // OnIdle it will be called anyway due to Add flag for processed item. // It seems like in some cases we are updaiting on fail (no flag), // but is there anything to update? diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 1a533dace7..f7e0e32256 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3626,7 +3626,15 @@ void LLMeshRepository::notifyLoadedMeshes() //popup queued error messages from background threads while (!mUploadErrorQ.empty()) { - LLNotificationsUtil::add("MeshUploadError", mUploadErrorQ.front()); + LLSD substitutions(mUploadErrorQ.front()); + if (substitutions.has("DETAILS")) + { + LLNotificationsUtil::add("MeshUploadErrorDetails", substitutions); + } + else + { + LLNotificationsUtil::add("MeshUploadError", substitutions); + } mUploadErrorQ.pop(); } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 3fcd91f89b..feadf5e3b6 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8508,12 +8508,22 @@ Select residents to share with. </notification> <notification - name="MeshUploadError" + name="MeshUploadErrorDetails" icon="alert.tga" type="alert"> [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] [DETAILS]See SecondLife.log for details </notification> + + <notification + name="MeshUploadError" + icon="alert.tga" + type="alert"> + [LABEL] failed to upload: [MESSAGE] +[IDENTIFIER] + +See SecondLife.log for details + </notification> <notification name="MeshUploadPermError" |