summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-02-28 23:43:05 -0800
committerRichard Linden <none@none>2011-02-28 23:43:05 -0800
commite062a2778b034d2f5df67cc8ec6f98203c6dbf73 (patch)
tree6c0e00a415458bac6bc05553198330087e1c1403 /indra
parente02b83c350d9b642baa610829098539f18efa651 (diff)
SOCIAL-608 FIX Create Classified link is available in Basic mode
SOCIAL-609 FIX Create Pick link is available in Basic mode in the web profile SOCIAL-610 FIX View group info in Viewer sidebar are available in Basic mode
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llgroupactions.cpp4
-rwxr-xr-xindra/newview/llpanelpicks.cpp9
2 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 7b7780cba8..6953723f0c 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -55,8 +55,8 @@ public:
{
if (!LLUI::sSettingGroups["config"]->getBOOL("EnableGroupInfo"))
{
- LLNotificationsUtil::add("NoGroupInfo");
- return false;
+ LLNotificationsUtil::add("NoGroupInfo", LLSD(), LLSD(), std::string("ConfirmQuit"));
+ return true;
}
if (tokens.size() < 1)
diff --git a/indra/newview/llpanelpicks.cpp b/indra/newview/llpanelpicks.cpp
index 72db138ef0..d27f29ca14 100755
--- a/indra/newview/llpanelpicks.cpp
+++ b/indra/newview/llpanelpicks.cpp
@@ -70,6 +70,7 @@ static const std::string CLASSIFIED_NAME("classified_name");
static LLRegisterPanelClassWrapper<LLPanelPicks> t_panel_picks("panel_picks");
+
class LLPickHandler : public LLCommandHandler,
public LLAvatarPropertiesObserver
{
@@ -85,8 +86,8 @@ public:
{
if (!LLUI::sSettingGroups["config"]->getBOOL("EnablePicks"))
{
- LLNotificationsUtil::add("NoPicks");
- return false;
+ LLNotificationsUtil::add("NoPicks", LLSD(), LLSD(), std::string("ConfirmQuit"));
+ return true;
}
// handle app/classified/create urls first
@@ -197,8 +198,8 @@ public:
{
if (!LLUI::sSettingGroups["config"]->getBOOL("EnableClassifieds"))
{
- LLNotificationsUtil::add("NoClassifieds");
- return false;
+ LLNotificationsUtil::add("NoClassifieds", LLSD(), LLSD(), std::string("ConfirmQuit"));
+ return true;
}
// handle app/classified/create urls first