diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-12-02 20:35:40 +0000 |
| commit | fd46865a502036b9e4414e7ec4950faf551b1f14 (patch) | |
| tree | 634dbca07e829d3906ed555341118c361aa1bb14 /indra/newview/llviewermenu.cpp | |
| parent | de7d6cf4dfa1db2945e3ed4a3e8257d72674a496 (diff) | |
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 645d68a13a..e8ce3e02ea 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5368,7 +5368,15 @@ class LLPromptShowURL : public view_listener_t std::string alert = param.substr(0, offset); std::string url = param.substr(offset+1); std::string* url_copy = new std::string(url); - gViewerWindow->alertXml(alert, callback_show_url, url_copy); + + if(gSavedSettings.getBOOL("UseExternalBrowser")) + { + gViewerWindow->alertXml(alert, callback_show_url, url_copy); + } + else + { + callback_show_url(0, url_copy); + } } else { @@ -5777,8 +5785,7 @@ class LLAttachmentEnableDrop : public view_listener_t { bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) { - LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); - BOOL can_build = gAgent.isGodlike() || (parcel && parcel->getAllowModify()); + BOOL can_build = gAgent.isGodlike() || (LLViewerParcelMgr::getInstance()->agentCanBuild()); //Add an inventory observer to only allow dropping the newly attached item //once it exists in your inventory. Look at Jira 2422. |