Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add LLWebProfile and responders.

Browse Source 
Adds finding and using libjsoncpp. Note that the old cmake file
found libjson, not the same thing.

Adds Debug Setting WebProfileNonProductionURL (next to already existing
WebProfileURL) to mimic V3's behavior and use a different URL for aditi.
These Debug Settings are using by (the new) getProfileURL() (copied
from V3 with just a minor fix).

Adds HippoGridInfo::isInProductionGrid() next to the existing
LLViewerLogin::isInProductionGrid that always returned true.
The former should only be called SL grids and then only returns
true for agni (and false for aditi et al). The latter was changed
to now always return true except on SL when the grid isn't agni.
The first is used for SL-only cases, the latter for things like
colors and for godmode decision logic.

V3's llwebprofile.cpp was fixed to compile on singu, with only real
difference that I dropped the Content-Type headers for the GET methods.
This commit is contained in:
Aleric Inglewood
2012-11-16 02:00:06 +01:00
parent fdfe0cae87
commit fce64f8f12
14 changed files with 637 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
indra/cmake/FindJsonCpp.cmake
View File

@@ -3,16 +3,18 @@
# - Find JSONCpp
# Find the JSONCpp includes and library
# This module defines
# JSONCPP_INCLUDE_DIR, where to find json.h, etc.
# JSONCPP_LIBRARIES, the libraries needed to use jsoncpp.
# JSONCPP_FOUND, If false, do not try to use jsoncpp.
# also defined, but not for general use are
# JSONCPP_LIBRARY, where to find the jsoncpp library.
# JSONCPP_FOUND, System has libjsoncpp.
# JSONCPP_INCLUDE_DIRS - The libjsoncpp include directories.
# JSONCPP_LIBRARIES - The libraries needed to use libjsoncpp.
# JSONCPP_DEFINITIONS - Compiler switches required for using libjsoncpp.
FIND_PATH(JSONCPP_INCLUDE_DIR json/json.h
/usr/local/include
/usr/include
)
FIND_PACKAGE(PkgConfig)
PKG_CHECK_MODULES(PC_JSONCPP jsoncpp)
SET(JSONCPP_DEFINITIONS ${PC_JSONCPP_CFLAGS_OTHER})
FIND_PATH(JSONCPP_INCLUDE_DIR json/reader.h
HINTS ${PC_JSONCPP_INCLUDE_DIR} ${PC_JSONCPP_INCLUDE_DIRS}
PATH_SUFFIXES jsoncpp)
# Get the GCC compiler version
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
@@ -22,39 +24,16 @@ EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
)
# Try to find a library that was compiled with the same compiler version as we currently use.
SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so)
IF (STANDALONE)
# On standalone, assume that the system installed library was compiled with the used compiler.
SET(JSONCPP_NAMES ${JSONCPP_NAMES} libjson.so)
ENDIF (STANDALONE)
FIND_LIBRARY(JSONCPP_LIBRARY
NAMES ${JSONCPP_NAMES}
PATHS /usr/lib /usr/local/lib
)
NAMES libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so libjsoncpp.so
HINTS ${PC_JSONCPP_LIBDIR} ${PC_JSONCPP_LIBRARY_DIRS}
PATHS /usr/lib /usr/local/lib)
IF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
SET(JSONCPP_FOUND "YES")
ELSE (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
SET(JSONCPP_FOUND "NO")
ENDIF (JSONCPP_LIBRARY AND JSONCPP_INCLUDE_DIR)
SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
SET(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(JSONCPP DEFAULT_MSG
JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)
IF (JSONCPP_FOUND)
IF (NOT JSONCPP_FIND_QUIETLY)
MESSAGE(STATUS "Found JSONCpp: ${JSONCPP_LIBRARIES}")
ENDIF (NOT JSONCPP_FIND_QUIETLY)
ELSE (JSONCPP_FOUND)
IF (JSONCPP_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find JSONCpp library")
ENDIF (JSONCPP_FIND_REQUIRED)
ENDIF (JSONCPP_FOUND)
# Deprecated declarations.
SET (NATIVE_JSONCPP_INCLUDE_PATH ${JSONCPP_INCLUDE_DIR} )
GET_FILENAME_COMPONENT (NATIVE_JSONCPP_LIB_PATH ${JSONCPP_LIBRARY} PATH)
MARK_AS_ADVANCED(
JSONCPP_LIBRARY
JSONCPP_INCLUDE_DIR
)
MARK_AS_ADVANCED(JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)

2
indra/cmake/JsonCpp.cmake
View File

@@ -2,7 +2,7 @@
include(Prebuilt)
set(JSONCPP_FIND_QUIETLY ON)
set(JSONCPP_FIND_QUIETLY OFF)
set(JSONCPP_FIND_REQUIRED ON)
if (STANDALONE)

1
indra/llmessage/aihttptimeoutpolicy.cpp
View File

@@ -889,6 +889,7 @@ P(viewerStatsResponder);
P(viewerVoiceAccountProvisionResponder);
P(voiceCallCapResponder);
P(voiceClientCapResponder);
P(webProfileResponders);
P(wholeModelFeeResponder);
P(wholeModelUploadResponder);
P2(XMLRPCResponder, connect_40s);

4
indra/newview/CMakeLists.txt
View File

@@ -17,7 +17,7 @@ endif(FMOD)
include(OPENAL)
include(FindOpenGL)
include(Hunspell)
#include(JsonCpp)
include(JsonCpp)
include(LLAddBuildTest)
include(LLAudio)
include(LLCharacter)
@@ -370,6 +370,7 @@ set(viewer_SOURCE_FILES
llpanelpermissions.cpp
llpanelpick.cpp
llpanelplace.cpp
llpanelprofile.cpp
llpanelskins.cpp
llpanelvolume.cpp
llpanelweb.cpp
@@ -875,6 +876,7 @@ set(viewer_HEADER_FILES
llpanelpermissions.h
llpanelpick.h
llpanelplace.h
llpanelprofile.h
llpanelskins.h
llpanelvolume.h
llpanelweb.h

13
indra/newview/app_settings/settings.xml
View File

@@ -7402,7 +7402,7 @@ Found in Advanced->Rendering->Info Displays</string>
<key>WebProfileURL</key>
<map>
<key>Comment</key>
<string>URL for Web Profiles</string>
<string>URL for SL Web Profiles</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -7410,6 +7410,17 @@ Found in Advanced->Rendering->Info Displays</string>
<key>Value</key>
<string>https://my.secondlife.com/[AGENT_NAME]</string>
</map>
<key>WebProfileNonProductionURL</key>
<map>
<key>Comment</key>
<string>URL for SL Web Profiles on Non-Production grids</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>https://my-demo.secondlife.com/[AGENT_NAME]</string>
</map>
<key>HighResSnapshot</key>
<map>
<key>Comment</key>

8
indra/newview/hippogridmanager.cpp
View File

@@ -51,6 +51,7 @@ HippoGridInfo::HippoGridInfo(const std::string& gridName) :
mGridMessage(""),
mXmlState(XML_VOID),
mVoiceConnector("SLVoice"),
mIsInProductionGrid(false),
mRenderCompat(true),
mInvLinks(false),
mAutoUpdate(false),
@@ -80,6 +81,12 @@ bool HippoGridInfo::isSecondLife() const
return (mPlatform == HippoGridInfo::PLATFORM_SECONDLIFE);
}
bool HippoGridInfo::isInProductionGrid() const
{
llassert(mPlatform == HippoGridInfo::PLATFORM_SECONDLIFE);
return mIsInProductionGrid;
}
const std::string& HippoGridInfo::getGridName() const
{
return mGridName;
@@ -211,6 +218,7 @@ void HippoGridInfo::setGridName(const std::string& gridName)
{
setGridNick(gridName);
}*/
mIsInProductionGrid = gridName == "secondlife";
}
void HippoGridInfo::setGridNick(std::string gridNick)

2
indra/newview/hippogridmanager.h
View File

@@ -39,6 +39,7 @@ public:
Platform getPlatform();
bool isOpenSimulator() const;
bool isSecondLife() const;
bool isInProductionGrid() const; // Should only be called if isSecondLife() returns true.
const std::string& getGridName() const;
const std::string& getGridOwner() const;
const std::string& getLoginUri() const;
@@ -110,6 +111,7 @@ private:
std::string mPasswordUrl;
std::string mSearchUrl;
std::string mVoiceConnector;
bool mIsInProductionGrid;
bool mRenderCompat;
bool mInvLinks;
bool mAutoUpdate;

10
indra/newview/llfloateravatarinfo.cpp
View File

@@ -294,13 +294,3 @@ LLPreview::EAssetStatus LLFloaterAvatarInfo::getAssetStatus()
}
return mAssetStatus;
}
std::string getProfileURL(const std::string& agent_name)
{
std::string url = gSavedSettings.getString("WebProfileURL");
LLSD subs;
subs["AGENT_NAME"] = agent_name;
url = LLWeb::expandURLSubstitutions(url,subs);
LLStringUtil::toLower(url);
return url;
}

2
indra/newview/llfloatermodelpreview.cpp
View File

@@ -455,7 +455,7 @@ BOOL LLFloaterModelPreview::postBuild()
std::string validate_url;
if (gHippoGridManager->getCurrentGrid()->isSecondLife())
{
if (LLViewerLogin::getInstance()->isInProductionGrid())
if (gHippoGridManager->getConnectedGrid()->isInProductionGrid())
{
validate_url = "http://secondlife.com/my/account/mesh.php";
}

2
indra/newview/llmarketplacefunctions.cpp
View File

@@ -46,7 +46,7 @@ static std::string getMarketplaceDomain()
std::string domain = "secondlife.com";
if (gHippoGridManager->getCurrentGrid()->isSecondLife())
{
if (!LLViewerLogin::getInstance()->isInProductionGrid())
if (!gHippoGridManager->getConnectedGrid()->isInProductionGrid())
{
domain = "secondlife.aditi.lindenlab.com";
}

441
indra/newview/llpanelprofile.cpp Normal file
View File

@@ -0,0 +1,441 @@
/**
* @file llpanelprofile.cpp
* @brief Profile panel implementation
*
* $LicenseInfo:firstyear=2009&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "llpanelprofile.h"
#ifdef AI_UNUSED
#include "llagent.h"
#include "llavataractions.h"
#include "llfloaterreg.h"
#include "llcommandhandler.h"
#include "llnotificationsutil.h"
#include "llpanelpicks.h"
#include "lltabcontainer.h"
#include "llviewercontrol.h"
#include "llviewernetwork.h"
static const std::string PANEL_PICKS = "panel_picks";
#endif // AI_UNUSED
#include "hippogridmanager.h"
#include "llcontrol.h"
#include "llweb.h"
std::string getProfileURL(const std::string& agent_name)
{
std::string url;
if (gHippoGridManager->getConnectedGrid()->isInProductionGrid())
{
url = gSavedSettings.getString("WebProfileURL");
}
else
{
url = gSavedSettings.getString("WebProfileNonProductionURL");
}
LLSD subs;
subs["AGENT_NAME"] = agent_name;
url = LLWeb::expandURLSubstitutions(url,subs);
LLStringUtil::toLower(url);
return url;
}
#ifdef AI_UNUSED
class LLProfileHandler : public LLCommandHandler
{
public:
// requires trusted browser to trigger
LLProfileHandler() : LLCommandHandler("profile", UNTRUSTED_THROTTLE) { }
bool handle(const LLSD& params, const LLSD& query_map,
LLMediaCtrl* web)
{
if (params.size() < 1) return false;
std::string agent_name = params[0];
llinfos << "Profile, agent_name " << agent_name << llendl;
std::string url = getProfileURL(agent_name);
LLWeb::loadURLInternal(url);
return true;
}
};
LLProfileHandler gProfileHandler;
class LLAgentHandler : public LLCommandHandler
{
public:
// requires trusted browser to trigger
LLAgentHandler() : LLCommandHandler("agent", UNTRUSTED_THROTTLE) { }
bool handle(const LLSD& params, const LLSD& query_map,
LLMediaCtrl* web)
{
if (params.size() < 2) return false;
LLUUID avatar_id;
if (!avatar_id.set(params[0], FALSE))
{
return false;
}
const std::string verb = params[1].asString();
if (verb == "about")
{
LLAvatarActions::showProfile(avatar_id);
return true;
}
if (verb == "inspect")
{
LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", avatar_id));
return true;
}
if (verb == "im")
{
LLAvatarActions::startIM(avatar_id);
return true;
}
if (verb == "pay")
{
if (!LLUI::sSettingGroups["config"]->getBOOL("EnableAvatarPay"))
{
LLNotificationsUtil::add("NoAvatarPay", LLSD(), LLSD(), std::string("SwitchToStandardSkinAndQuit"));
return true;
}
LLAvatarActions::pay(avatar_id);
return true;
}
if (verb == "offerteleport")
{
LLAvatarActions::offerTeleport(avatar_id);
return true;
}
if (verb == "requestfriend")
{
LLAvatarActions::requestFriendshipDialog(avatar_id);
return true;
}
if (verb == "mute")
{
if (! LLAvatarActions::isBlocked(avatar_id))
{
LLAvatarActions::toggleBlock(avatar_id);
}
return true;
}
if (verb == "unmute")
{
if (LLAvatarActions::isBlocked(avatar_id))
{
LLAvatarActions::toggleBlock(avatar_id);
}
return true;
}
return false;
}
};
LLAgentHandler gAgentHandler;
//-- LLPanelProfile::ChildStack begins ----------------------------------------
LLPanelProfile::ChildStack::ChildStack()
: mParent(NULL)
{
}
LLPanelProfile::ChildStack::~ChildStack()
{
while (mStack.size() != 0)
{
view_list_t& top = mStack.back();
for (view_list_t::const_iterator it = top.begin(); it != top.end(); ++it)
{
LLView* viewp = *it;
if (viewp)
{
viewp->die();
}
}
mStack.pop_back();
}
}
void LLPanelProfile::ChildStack::setParent(LLPanel* parent)
{
llassert_always(parent != NULL);
mParent = parent;
}
/// Save current parent's child views and remove them from the child list.
bool LLPanelProfile::ChildStack::push()
{
view_list_t vlist = *mParent->getChildList();
for (view_list_t::const_iterator it = vlist.begin(); it != vlist.end(); ++it)
{
LLView* viewp = *it;
mParent->removeChild(viewp);
}
mStack.push_back(vlist);
dump();
return true;
}
/// Restore saved children (adding them back to the child list).
bool LLPanelProfile::ChildStack::pop()
{
if (mStack.size() == 0)
{
llwarns << "Empty stack" << llendl;
llassert(mStack.size() == 0);
return false;
}
view_list_t& top = mStack.back();
for (view_list_t::const_iterator it = top.begin(); it != top.end(); ++it)
{
LLView* viewp = *it;
mParent->addChild(viewp);
}
mStack.pop_back();
dump();
return true;
}
/// Temporarily add all saved children back.
void LLPanelProfile::ChildStack::preParentReshape()
{
mSavedStack = mStack;
while(mStack.size() > 0)
{
pop();
}
}
/// Add the temporarily saved children back.
void LLPanelProfile::ChildStack::postParentReshape()
{
mStack = mSavedStack;
mSavedStack = stack_t();
for (stack_t::const_iterator stack_it = mStack.begin(); stack_it != mStack.end(); ++stack_it)
{
const view_list_t& vlist = (*stack_it);
for (view_list_t::const_iterator list_it = vlist.begin(); list_it != vlist.end(); ++list_it)
{
LLView* viewp = *list_it;
lldebugs << "removing " << viewp->getName() << llendl;
mParent->removeChild(viewp);
}
}
}
void LLPanelProfile::ChildStack::dump()
{
unsigned lvl = 0;
lldebugs << "child stack dump:" << llendl;
for (stack_t::const_iterator stack_it = mStack.begin(); stack_it != mStack.end(); ++stack_it, ++lvl)
{
std::ostringstream dbg_line;
dbg_line << "lvl #" << lvl << ":";
const view_list_t& vlist = (*stack_it);
for (view_list_t::const_iterator list_it = vlist.begin(); list_it != vlist.end(); ++list_it)
{
dbg_line << " " << (*list_it)->getName();
}
lldebugs << dbg_line.str() << llendl;
}
}
//-- LLPanelProfile::ChildStack ends ------------------------------------------
LLPanelProfile::LLPanelProfile()
: LLPanel()
, mAvatarId(LLUUID::null)
{
mChildStack.setParent(this);
}
BOOL LLPanelProfile::postBuild()
{
LLPanelPicks* panel_picks = findChild<LLPanelPicks>(PANEL_PICKS);
panel_picks->setProfilePanel(this);
getTabContainer()[PANEL_PICKS] = panel_picks;
return TRUE;
}
// virtual
void LLPanelProfile::reshape(S32 width, S32 height, BOOL called_from_parent)
{
// Temporarily add saved children back and reshape them.
mChildStack.preParentReshape();
LLPanel::reshape(width, height, called_from_parent);
mChildStack.postParentReshape();
}
void LLPanelProfile::onOpen(const LLSD& key)
{
getTabContainer()[PANEL_PICKS]->onOpen(getAvatarId());
// support commands to open further pieces of UI
if (key.has("show_tab_panel"))
{
std::string panel = key["show_tab_panel"].asString();
if (panel == "create_classified")
{
LLPanelPicks* picks = dynamic_cast<LLPanelPicks *>(getTabContainer()[PANEL_PICKS]);
if (picks)
{
picks->createNewClassified();
}
}
else if (panel == "classified_details")
{
LLPanelPicks* picks = dynamic_cast<LLPanelPicks *>(getTabContainer()[PANEL_PICKS]);
if (picks)
{
LLSD params = key;
params.erase("show_tab_panel");
params.erase("open_tab_name");
picks->openClassifiedInfo(params);
}
}
else if (panel == "edit_classified")
{
LLPanelPicks* picks = dynamic_cast<LLPanelPicks *>(getTabContainer()[PANEL_PICKS]);
if (picks)
{
LLSD params = key;
params.erase("show_tab_panel");
params.erase("open_tab_name");
picks->openClassifiedEdit(params);
}
}
else if (panel == "create_pick")
{
LLPanelPicks* picks = dynamic_cast<LLPanelPicks *>(getTabContainer()[PANEL_PICKS]);
if (picks)
{
picks->createNewPick();
}
}
else if (panel == "edit_pick")
{
LLPanelPicks* picks = dynamic_cast<LLPanelPicks *>(getTabContainer()[PANEL_PICKS]);
if (picks)
{
LLSD params = key;
params.erase("show_tab_panel");
params.erase("open_tab_name");
picks->openPickEdit(params);
}
}
}
}
void LLPanelProfile::onTabSelected(const LLSD& param)
{
std::string tab_name = param.asString();
if (NULL != getTabContainer()[tab_name])
{
getTabContainer()[tab_name]->onOpen(getAvatarId());
}
}
void LLPanelProfile::openPanel(LLPanel* panel, const LLSD& params)
{
// Hide currently visible panel (STORM-690).
mChildStack.push();
// Add the panel or bring it to front.
if (panel->getParent() != this)
{
addChild(panel);
}
else
{
sendChildToFront(panel);
}
panel->setVisible(TRUE);
panel->setFocus(TRUE); // prevent losing focus by the floater
panel->onOpen(params);
LLRect new_rect = getRect();
panel->reshape(new_rect.getWidth(), new_rect.getHeight());
new_rect.setLeftTopAndSize(0, new_rect.getHeight(), new_rect.getWidth(), new_rect.getHeight());
panel->setRect(new_rect);
}
void LLPanelProfile::closePanel(LLPanel* panel)
{
panel->setVisible(FALSE);
if (panel->getParent() == this)
{
removeChild(panel);
// Make the underlying panel visible.
mChildStack.pop();
// Prevent losing focus by the floater
const child_list_t* child_list = getChildList();
if (child_list->size() > 0)
{
child_list->front()->setFocus(TRUE);
}
else
{
llwarns << "No underlying panel to focus." << llendl;
}
}
}
S32 LLPanelProfile::notifyParent(const LLSD& info)
{
std::string action = info["action"];
// lets update Picks list after Pick was saved
if("save_new_pick" == action)
{
onOpen(info);
return 1;
}
return LLPanel::notifyParent(info);
}
#endif // AI_UNUSED

106
indra/newview/llpanelprofile.h Normal file
View File

@@ -0,0 +1,106 @@
/**
* @file llpanelprofile.h
* @brief Profile panel
*
* $LicenseInfo:firstyear=2009&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_LLPANELPROFILE_H
#define LL_LLPANELPROFILE_H
#ifdef AI_UNUSED
#include "llpanel.h"
#include "llpanelavatar.h"
class LLTabContainer;
#endif // AI_UNUSED
std::string getProfileURL(const std::string& agent_name);
#ifdef AI_UNUSED
/**
* Base class for Profile View and My Profile.
*/
class LLPanelProfile : public LLPanel
{
LOG_CLASS(LLPanelProfile);
public:
/*virtual*/ BOOL postBuild();
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
/*virtual*/ void onOpen(const LLSD& key);
virtual void openPanel(LLPanel* panel, const LLSD& params);
virtual void closePanel(LLPanel* panel);
S32 notifyParent(const LLSD& info);
protected:
LLPanelProfile();
virtual void onTabSelected(const LLSD& param);
const LLUUID& getAvatarId() { return mAvatarId; }
void setAvatarId(const LLUUID& avatar_id) { mAvatarId = avatar_id; }
typedef std::map<std::string, LLPanelProfileTab*> profile_tabs_t;
profile_tabs_t& getTabContainer() { return mTabContainer; }
private:
//-- ChildStack begins ----------------------------------------------------
class ChildStack
{
LOG_CLASS(LLPanelProfile::ChildStack);
public:
ChildStack();
~ChildStack();
void setParent(LLPanel* parent);
bool push();
bool pop();
void preParentReshape();
void postParentReshape();
private:
void dump();
typedef LLView::child_list_t view_list_t;
typedef std::list<view_list_t> stack_t;
stack_t mStack;
stack_t mSavedStack;
LLPanel* mParent;
};
//-- ChildStack ends ------------------------------------------------------
profile_tabs_t mTabContainer;
ChildStack mChildStack;
LLUUID mAvatarId;
};
#endif // AI_UNUSED
#endif //LL_LLPANELPROFILE_H

3
indra/newview/llviewernetwork.cpp
View File

@@ -77,6 +77,7 @@ bool LLViewerLogin::isSecondLife()
bool LLViewerLogin::isInProductionGrid()
{
return true;
// Return true (as before) on opensim grids, but return the real thing (agni or not) on SL.
return !gHippoGridManager->getConnectedGrid()->isSecondLife() || gHippoGridManager->getConnectedGrid()->isInProductionGrid();
}

55
indra/newview/llwebprofile.cpp
View File

@@ -35,11 +35,15 @@
#include "llplugincookiestore.h"
// newview
#include "llpanelprofile.h" // for getProfileURL(). FIXME: move the method to LLAvatarActions
#include "llpanelprofile.h" // <edit>getProfileURL (this is the original location LL put it).</edit>
#include "llviewermedia.h" // FIXME: don't use LLViewerMedia internals
// third-party
#include "reader.h" // JSON
#ifdef LL_STANDALONE
#include <json/reader.h> // JSONCPP
#else
#include "reader.h" // prebuilt jsoncpp is wrongly packaged.
#endif
/*
* Workflow:
@@ -57,7 +61,9 @@
///////////////////////////////////////////////////////////////////////////////
// LLWebProfileResponders::ConfigResponder
class LLWebProfileResponders::ConfigResponder : public LLHTTPClient::Responder
extern AIHTTPTimeoutPolicy webProfileResponders_timeout;
class LLWebProfileResponders::ConfigResponder : public LLHTTPClient::ResponderWithCompleted
{
LOG_CLASS(LLWebProfileResponders::ConfigResponder);
@@ -71,7 +77,7 @@ public:
U32 status,
const std::string& reason,
const LLChannelDescriptors& channels,
const LLIOPipe::buffer_ptr_t& buffer)
const buffer_ptr_t& buffer)
{
LLBufferStream istr(channels, buffer.get());
std::stringstream strstrm;
@@ -116,13 +122,16 @@ public:
LLWebProfile::post(mImagep, config, upload_url);
}
protected:
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return webProfileResponders_timeout; }
private:
LLPointer<LLImageFormatted> mImagep;
};
///////////////////////////////////////////////////////////////////////////////
// LLWebProfilePostImageRedirectResponder
class LLWebProfileResponders::PostImageRedirectResponder : public LLHTTPClient::Responder
class LLWebProfileResponders::PostImageRedirectResponder : public LLHTTPClient::ResponderWithCompleted
{
LOG_CLASS(LLWebProfileResponders::PostImageRedirectResponder);
@@ -131,7 +140,7 @@ public:
U32 status,
const std::string& reason,
const LLChannelDescriptors& channels,
const LLIOPipe::buffer_ptr_t& buffer)
const buffer_ptr_t& buffer)
{
if (status != 200)
{
@@ -149,6 +158,9 @@ public:
LLWebProfile::reportImageUploadStatus(true);
}
protected:
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return webProfileResponders_timeout; }
private:
LLPointer<LLImageFormatted> mImagep;
};
@@ -156,11 +168,13 @@ private:
///////////////////////////////////////////////////////////////////////////////
// LLWebProfileResponders::PostImageResponder
class LLWebProfileResponders::PostImageResponder : public LLHTTPClient::Responder
class LLWebProfileResponders::PostImageResponder : public LLHTTPClient::ResponderWithCompleted
{
LOG_CLASS(LLWebProfileResponders::PostImageResponder);
public:
/*virtual*/ bool needsHeaders(void) const { return true; }
/*virtual*/ void completedHeader(U32 status, const std::string& reason, const LLSD& content)
{
// Viewer seems to fail to follow a 303 redirect on POST request
@@ -168,8 +182,10 @@ public:
// Handle it manually.
if (status == 303)
{
LLSD headers = LLViewerMedia::getHeaders();
headers["Cookie"] = LLWebProfile::getAuthCookie();
AIHTTPHeaders headers;
headers.addHeader("Accept", "*/*");
headers.addHeader("Cookie", LLWebProfile::getAuthCookie());
headers.addHeader("User-Agent", LLViewerMedia::getCurrentUserAgent());
const std::string& redir_url = content["location"];
LL_DEBUGS("Snapshots") << "Got redirection URL: " << redir_url << llendl;
LLHTTPClient::get(redir_url, new LLWebProfileResponders::PostImageRedirectResponder, headers);
@@ -185,9 +201,12 @@ public:
// Override just to suppress warnings.
/*virtual*/ void completedRaw(U32 status, const std::string& reason,
const LLChannelDescriptors& channels,
const LLIOPipe::buffer_ptr_t& buffer)
const buffer_ptr_t& buffer)
{
}
protected:
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return webProfileResponders_timeout; }
};
///////////////////////////////////////////////////////////////////////////////
@@ -205,8 +224,10 @@ void LLWebProfile::uploadImage(LLPointer<LLImageFormatted> image, const std::str
config_url += "&add_loc=" + std::string(add_location ? "1" : "0");
LL_DEBUGS("Snapshots") << "Requesting " << config_url << llendl;
LLSD headers = LLViewerMedia::getHeaders();
headers["Cookie"] = getAuthCookie();
AIHTTPHeaders headers;
headers.addHeader("Accept", "*/*");
headers.addHeader("Cookie", LLWebProfile::getAuthCookie());
headers.addHeader("User-Agent", LLViewerMedia::getCurrentUserAgent());
LLHTTPClient::get(config_url, new LLWebProfileResponders::ConfigResponder(image), headers);
}
@@ -229,9 +250,11 @@ void LLWebProfile::post(LLPointer<LLImageFormatted> image, const LLSD& config, c
const std::string boundary = "----------------------------0123abcdefab";
LLSD headers = LLViewerMedia::getHeaders();
headers["Cookie"] = getAuthCookie();
headers["Content-Type"] = "multipart/form-data; boundary=" + boundary;
AIHTTPHeaders headers;
headers.addHeader("Accept", "*/*");
headers.addHeader("Cookie", LLWebProfile::getAuthCookie());
headers.addHeader("User-Agent", LLViewerMedia::getCurrentUserAgent());
headers.addHeader("Content-Type", "multipart/form-data; boundary=" + boundary);
std::ostringstream body;
@@ -280,7 +303,7 @@ void LLWebProfile::post(LLPointer<LLImageFormatted> image, const LLSD& config, c
// postRaw() takes ownership of the buffer and releases it later.
size_t size = body.str().size();
U8 *data = new U8[size];
char* data = new char [size];
memcpy(data, body.str().data(), size);
// Send request, successful upload will trigger posting metadata.