Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 320 insertions, 320 deletions

diff --git a/indra/newview/llpanelplaceinfo.cpp b/indra/newview/llpanelplaceinfo.cpp
index e272856f77..ab1b64e7ea 100644
--- a/indra/newview/llpanelplaceinfo.cpp
+++ b/indra/newview/llpanelplaceinfo.cpp
@@ -1,320 +1,320 @@
-/**
- * @file llpanelplaceinfo.cpp
- * @brief Base class for place information in Side Tray.
- *
- * $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 "llpanelplaceinfo.h"
-#include "llfloaterprofile.h"
-#include "llfloaterreg.h"
-
-#include "llavatarname.h"
-#include "llsdutil.h"
-
-#include "llsdutil_math.h"
-
-#include "llregionhandle.h"
-
-#include "lliconctrl.h"
-#include "lltextbox.h"
-
-#include "lltrans.h"
-
-#include "llagent.h"
-#include "llexpandabletextbox.h"
-#include "llslurl.h"
-#include "lltexturectrl.h"
-#include "llviewerregion.h"
-#include "llhttpconstants.h"
-
-LLPanelPlaceInfo::LLPanelPlaceInfo()
-:	LLPanel(),
-	mParcelID(),
-	mRequestedID(),
-	mPosRegion(),
-	mScrollingPanelMinHeight(0),
-	mScrollingPanelWidth(0),
-	mInfoType(UNKNOWN),
-	mScrollingPanel(NULL),
-	mScrollContainer(NULL),
-	mDescEditor(NULL)
-{}
-
-//virtual
-LLPanelPlaceInfo::~LLPanelPlaceInfo()
-{
-	if (mParcelID.notNull())
-	{
-		LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelID, this);
-	}
-}
-
-//virtual
-bool LLPanelPlaceInfo::postBuild()
-{
-	mTitle = getChild<LLTextBox>("title");
-	mCurrentTitle = mTitle->getText();
-
-	mSnapshotCtrl = getChild<LLTextureCtrl>("logo");
-	mRegionName = getChild<LLTextBox>("region_title");
-	mParcelName = getChild<LLTextBox>("parcel_title");
-	mParcelOwner = getChild<LLTextBox>("parcel_owner");
-	mDescEditor = getChild<LLExpandableTextBox>("description");
-
-	mMaturityRatingIcon = getChild<LLIconCtrl>("maturity_icon");
-	mMaturityRatingText = getChild<LLTextBox>("maturity_value");
-
-	mScrollingPanel = getChild<LLPanel>("scrolling_panel");
-	mScrollContainer = getChild<LLScrollContainer>("place_scroll");
-
-	mScrollingPanelMinHeight = mScrollContainer->getScrolledViewRect().getHeight();
-	mScrollingPanelWidth = mScrollingPanel->getRect().getWidth();
-
-	return true;
-}
-
-//virtual
-void LLPanelPlaceInfo::resetLocation()
-{
-	mParcelID.setNull();
-	mRequestedID.setNull();
-	mPosRegion.clearVec();
-	mRegionTitle.clear();
-
-	std::string loading = LLTrans::getString("LoadingData");
-	mMaturityRatingText->setValue(loading);
-	mRegionName->setTextArg("[REGIONAMEPOS]", loading);
-	mParcelName->setText(loading);
-	mParcelOwner->setText(loading);
-	mDescEditor->setText(loading);
-	mMaturityRatingIcon->setValue(LLUUID::null);
-
-	mSnapshotCtrl->setImageAssetID(LLUUID::null);
-}
-
-//virtual
-void LLPanelPlaceInfo::setParcelID(const LLUUID& parcel_id)
-{
-	mParcelID = parcel_id;
-	sendParcelInfoRequest();
-}
-
-//virtual
-void LLPanelPlaceInfo::setInfoType(EInfoType type)
-{
-	mTitle->setText(mCurrentTitle);
-	mTitle->setToolTip(mCurrentTitle);
-
-	mInfoType = type;
-}
-
-void LLPanelPlaceInfo::sendParcelInfoRequest()
-{
-	if (mParcelID != mRequestedID)
-	{
-		LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelID, this);
-		LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelID);
-
-		mRequestedID = mParcelID;
-	}
-}
-
-void LLPanelPlaceInfo::displayParcelInfo(const LLUUID& region_id,
-										 const LLVector3d& pos_global)
-{
-	LLViewerRegion* region = gAgent.getRegion();
-	if (!region)
-		return;
-
-	mPosRegion.setVec((F32)fmod(pos_global.mdV[VX], (F64)REGION_WIDTH_METERS),
-					  (F32)fmod(pos_global.mdV[VY], (F64)REGION_WIDTH_METERS),
-					  (F32)pos_global.mdV[VZ]);
-
-	LLSD body;
-	std::string url = region->getCapability("RemoteParcelRequest");
-	if (!url.empty())
-	{
-        LLRemoteParcelInfoProcessor::getInstance()->requestRegionParcelInfo(url,
-            region_id, mPosRegion, pos_global, getObserverHandle());
-	}
-	else
-	{
-		mDescEditor->setText(getString("server_update_text"));
-	}
-}
-
-// virtual
-void LLPanelPlaceInfo::setErrorStatus(S32 status, const std::string& reason)
-{
-	// We only really handle 404 and 499 errors
-	std::string error_text;
-	if(status == HTTP_NOT_FOUND)
-	{
-		error_text = getString("server_error_text");
-	}
-	else if(status == HTTP_INTERNAL_ERROR)
-	{
-		error_text = getString("server_forbidden_text");
-	}
-	else
-	{
-		error_text = getString("server_error_text");
-	}
-
-	mDescEditor->setText(error_text);
-
-	std::string not_available = getString("not_available");
-	mMaturityRatingText->setValue(not_available);
-	mRegionName->setTextArg("[REGIONAMEPOS]", not_available);
-	mParcelName->setText(not_available);
-	mParcelOwner->setText(not_available);
-	mMaturityRatingIcon->setValue(LLUUID::null);
-	mRegionTitle.clear();
-
-	// Enable "Back" button that was disabled when parcel request was sent.
-	getChild<LLButton>("back_btn")->setEnabled(true);
-}
-
-// virtual
-void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data)
-{
-	if(mSnapshotCtrl)
-	{
-		mSnapshotCtrl->setImageAssetID(parcel_data.snapshot_id);
-	}
-
-    S32 region_x;
-    S32 region_y;
-    S32 region_z;
-
-    // If the region position is zero, grab position from the global
-    if (mPosRegion.isExactlyZero())
-    {
-        region_x = ll_round(parcel_data.global_x) % REGION_WIDTH_UNITS;
-        region_y = ll_round(parcel_data.global_y) % REGION_WIDTH_UNITS;
-        region_z = ll_round(parcel_data.global_z);
-    }
-    else
-    {
-        region_x = ll_round(mPosRegion.mV[VX]);
-        region_y = ll_round(mPosRegion.mV[VY]);
-        region_z = ll_round(mPosRegion.mV[VZ]);
-    }
-
-    if (!parcel_data.sim_name.empty())
-    {
-        mRegionTitle = parcel_data.sim_name;
-        std::string name_and_pos = llformat("%s (%d, %d, %d)",
-                                   mRegionTitle.c_str(), region_x, region_y, region_z);
-        mRegionName->setTextArg("[REGIONAMEPOS]", name_and_pos);
-	}
-	else
-	{
-		mRegionTitle.clear();
-		mRegionName->setText(LLStringUtil::null);
-	}
-
-	if(!parcel_data.desc.empty())
-	{
-		mDescEditor->setText(parcel_data.desc);
-	}
-	else
-	{
-		mDescEditor->setText(getString("not_available"));
-	}
-
-	if (!parcel_data.name.empty())
-	{
-		mParcelTitle = parcel_data.name;
-
-		mParcelName->setText(mParcelTitle);
-	}
-	else
-	{
-		mParcelName->setText(getString("not_available"));
-	}
-}
-
-// virtual
-void LLPanelPlaceInfo::reshape(S32 width, S32 height, bool called_from_parent)
-{
-
-	// This if was added to force collapsing description textbox on Windows at the beginning of reshape
-	// (the only case when reshape is skipped here is when it's caused by this textbox, so called_from_parent is false)
-	// This way it is consistent with Linux where topLost collapses textbox at the beginning of reshape.
-	// On windows it collapsed only after reshape which caused EXT-8342.
-	if(called_from_parent)
-	{
-		if(mDescEditor) mDescEditor->onTopLost();
-	}
-
-	LLPanel::reshape(width, height, called_from_parent);
-
-	if (!mScrollContainer || !mScrollingPanel)
-		return;
-
-	static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
-
-	S32 scroll_height = mScrollContainer->getRect().getHeight();
-	if (mScrollingPanelMinHeight > scroll_height)
-	{
-		mScrollingPanel->reshape(mScrollingPanelWidth, mScrollingPanelMinHeight);
-	}
-	else
-	{
-		mScrollingPanel->reshape(mScrollingPanelWidth + scrollbar_size, scroll_height);
-	}
-}
-
-void LLPanelPlaceInfo::createPick(const LLVector3d& pos_global)
-{
-	LLPickData data;
-	data.pos_global = pos_global;
-	data.name = mParcelTitle.empty() ? mRegionTitle : mParcelTitle;
-	data.sim_name = mRegionTitle;
-	data.desc = mDescEditor->getText();
-	data.snapshot_id = mSnapshotCtrl->getImageAssetID();
-	data.parcel_id = mParcelID;
-
-    LLFloaterProfile* profile_floater = dynamic_cast<LLFloaterProfile*>(LLFloaterReg::showInstance("profile", LLSD().with("id", gAgentID)));
-    if (profile_floater)
-    {
-        profile_floater->createPick(data);
-    }
-}
-
-// static
-void LLPanelPlaceInfo::onNameCache(LLTextBox* text, const std::string& full_name)
-{
-	text->setText(full_name);
-}
-
-// static
-void LLPanelPlaceInfo::onAvatarNameCache(const LLUUID& agent_id,
-										 const LLAvatarName& av_name,
-										 LLTextBox* text)
-{
-	text->setText( av_name.getCompleteName() );
-}
+/**

+ * @file llpanelplaceinfo.cpp

+ * @brief Base class for place information in Side Tray.

+ *

+ * $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 "llpanelplaceinfo.h"

+#include "llfloaterprofile.h"

+#include "llfloaterreg.h"

+

+#include "llavatarname.h"

+#include "llsdutil.h"

+

+#include "llsdutil_math.h"

+

+#include "llregionhandle.h"

+

+#include "lliconctrl.h"

+#include "lltextbox.h"

+

+#include "lltrans.h"

+

+#include "llagent.h"

+#include "llexpandabletextbox.h"

+#include "llslurl.h"

+#include "lltexturectrl.h"

+#include "llviewerregion.h"

+#include "llhttpconstants.h"

+

+LLPanelPlaceInfo::LLPanelPlaceInfo()

+:   LLPanel(),

+    mParcelID(),

+    mRequestedID(),

+    mPosRegion(),

+    mScrollingPanelMinHeight(0),

+    mScrollingPanelWidth(0),

+    mInfoType(UNKNOWN),

+    mScrollingPanel(NULL),

+    mScrollContainer(NULL),

+    mDescEditor(NULL)

+{}

+

+//virtual

+LLPanelPlaceInfo::~LLPanelPlaceInfo()

+{

+    if (mParcelID.notNull())

+    {

+        LLRemoteParcelInfoProcessor::getInstance()->removeObserver(mParcelID, this);

+    }

+}

+

+//virtual

+bool LLPanelPlaceInfo::postBuild()

+{

+    mTitle = getChild<LLTextBox>("title");

+    mCurrentTitle = mTitle->getText();

+

+    mSnapshotCtrl = getChild<LLTextureCtrl>("logo");

+    mRegionName = getChild<LLTextBox>("region_title");

+    mParcelName = getChild<LLTextBox>("parcel_title");

+    mParcelOwner = getChild<LLTextBox>("parcel_owner");

+    mDescEditor = getChild<LLExpandableTextBox>("description");

+

+    mMaturityRatingIcon = getChild<LLIconCtrl>("maturity_icon");

+    mMaturityRatingText = getChild<LLTextBox>("maturity_value");

+

+    mScrollingPanel = getChild<LLPanel>("scrolling_panel");

+    mScrollContainer = getChild<LLScrollContainer>("place_scroll");

+

+    mScrollingPanelMinHeight = mScrollContainer->getScrolledViewRect().getHeight();

+    mScrollingPanelWidth = mScrollingPanel->getRect().getWidth();

+

+    return true;

+}

+

+//virtual

+void LLPanelPlaceInfo::resetLocation()

+{

+    mParcelID.setNull();

+    mRequestedID.setNull();

+    mPosRegion.clearVec();

+    mRegionTitle.clear();

+

+    std::string loading = LLTrans::getString("LoadingData");

+    mMaturityRatingText->setValue(loading);

+    mRegionName->setTextArg("[REGIONAMEPOS]", loading);

+    mParcelName->setText(loading);

+    mParcelOwner->setText(loading);

+    mDescEditor->setText(loading);

+    mMaturityRatingIcon->setValue(LLUUID::null);

+

+    mSnapshotCtrl->setImageAssetID(LLUUID::null);

+}

+

+//virtual

+void LLPanelPlaceInfo::setParcelID(const LLUUID& parcel_id)

+{

+    mParcelID = parcel_id;

+    sendParcelInfoRequest();

+}

+

+//virtual

+void LLPanelPlaceInfo::setInfoType(EInfoType type)

+{

+    mTitle->setText(mCurrentTitle);

+    mTitle->setToolTip(mCurrentTitle);

+

+    mInfoType = type;

+}

+

+void LLPanelPlaceInfo::sendParcelInfoRequest()

+{

+    if (mParcelID != mRequestedID)

+    {

+        LLRemoteParcelInfoProcessor::getInstance()->addObserver(mParcelID, this);

+        LLRemoteParcelInfoProcessor::getInstance()->sendParcelInfoRequest(mParcelID);

+

+        mRequestedID = mParcelID;

+    }

+}

+

+void LLPanelPlaceInfo::displayParcelInfo(const LLUUID& region_id,

+                                         const LLVector3d& pos_global)

+{

+    LLViewerRegion* region = gAgent.getRegion();

+    if (!region)

+        return;

+

+    mPosRegion.setVec((F32)fmod(pos_global.mdV[VX], (F64)REGION_WIDTH_METERS),

+                      (F32)fmod(pos_global.mdV[VY], (F64)REGION_WIDTH_METERS),

+                      (F32)pos_global.mdV[VZ]);

+

+    LLSD body;

+    std::string url = region->getCapability("RemoteParcelRequest");

+    if (!url.empty())

+    {

+        LLRemoteParcelInfoProcessor::getInstance()->requestRegionParcelInfo(url,

+            region_id, mPosRegion, pos_global, getObserverHandle());

+    }

+    else

+    {

+        mDescEditor->setText(getString("server_update_text"));

+    }

+}

+

+// virtual

+void LLPanelPlaceInfo::setErrorStatus(S32 status, const std::string& reason)

+{

+    // We only really handle 404 and 499 errors

+    std::string error_text;

+    if(status == HTTP_NOT_FOUND)

+    {

+        error_text = getString("server_error_text");

+    }

+    else if(status == HTTP_INTERNAL_ERROR)

+    {

+        error_text = getString("server_forbidden_text");

+    }

+    else

+    {

+        error_text = getString("server_error_text");

+    }

+

+    mDescEditor->setText(error_text);

+

+    std::string not_available = getString("not_available");

+    mMaturityRatingText->setValue(not_available);

+    mRegionName->setTextArg("[REGIONAMEPOS]", not_available);

+    mParcelName->setText(not_available);

+    mParcelOwner->setText(not_available);

+    mMaturityRatingIcon->setValue(LLUUID::null);

+    mRegionTitle.clear();

+

+    // Enable "Back" button that was disabled when parcel request was sent.

+    getChild<LLButton>("back_btn")->setEnabled(true);

+}

+

+// virtual

+void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data)

+{

+    if(mSnapshotCtrl)

+    {

+        mSnapshotCtrl->setImageAssetID(parcel_data.snapshot_id);

+    }

+

+    S32 region_x;

+    S32 region_y;

+    S32 region_z;

+

+    // If the region position is zero, grab position from the global

+    if (mPosRegion.isExactlyZero())

+    {

+        region_x = ll_round(parcel_data.global_x) % REGION_WIDTH_UNITS;

+        region_y = ll_round(parcel_data.global_y) % REGION_WIDTH_UNITS;

+        region_z = ll_round(parcel_data.global_z);

+    }

+    else

+    {

+        region_x = ll_round(mPosRegion.mV[VX]);

+        region_y = ll_round(mPosRegion.mV[VY]);

+        region_z = ll_round(mPosRegion.mV[VZ]);

+    }

+

+    if (!parcel_data.sim_name.empty())

+    {

+        mRegionTitle = parcel_data.sim_name;

+        std::string name_and_pos = llformat("%s (%d, %d, %d)",

+                                   mRegionTitle.c_str(), region_x, region_y, region_z);

+        mRegionName->setTextArg("[REGIONAMEPOS]", name_and_pos);

+    }

+    else

+    {

+        mRegionTitle.clear();

+        mRegionName->setText(LLStringUtil::null);

+    }

+

+    if(!parcel_data.desc.empty())

+    {

+        mDescEditor->setText(parcel_data.desc);

+    }

+    else

+    {

+        mDescEditor->setText(getString("not_available"));

+    }

+

+    if (!parcel_data.name.empty())

+    {

+        mParcelTitle = parcel_data.name;

+

+        mParcelName->setText(mParcelTitle);

+    }

+    else

+    {

+        mParcelName->setText(getString("not_available"));

+    }

+}

+

+// virtual

+void LLPanelPlaceInfo::reshape(S32 width, S32 height, bool called_from_parent)

+{

+

+    // This if was added to force collapsing description textbox on Windows at the beginning of reshape

+    // (the only case when reshape is skipped here is when it's caused by this textbox, so called_from_parent is false)

+    // This way it is consistent with Linux where topLost collapses textbox at the beginning of reshape.

+    // On windows it collapsed only after reshape which caused EXT-8342.

+    if(called_from_parent)

+    {

+        if(mDescEditor) mDescEditor->onTopLost();

+    }

+

+    LLPanel::reshape(width, height, called_from_parent);

+

+    if (!mScrollContainer || !mScrollingPanel)

+        return;

+

+    static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);

+

+    S32 scroll_height = mScrollContainer->getRect().getHeight();

+    if (mScrollingPanelMinHeight > scroll_height)

+    {

+        mScrollingPanel->reshape(mScrollingPanelWidth, mScrollingPanelMinHeight);

+    }

+    else

+    {

+        mScrollingPanel->reshape(mScrollingPanelWidth + scrollbar_size, scroll_height);

+    }

+}

+

+void LLPanelPlaceInfo::createPick(const LLVector3d& pos_global)

+{

+    LLPickData data;

+    data.pos_global = pos_global;

+    data.name = mParcelTitle.empty() ? mRegionTitle : mParcelTitle;

+    data.sim_name = mRegionTitle;

+    data.desc = mDescEditor->getText();

+    data.snapshot_id = mSnapshotCtrl->getImageAssetID();

+    data.parcel_id = mParcelID;

+

+    LLFloaterProfile* profile_floater = dynamic_cast<LLFloaterProfile*>(LLFloaterReg::showInstance("profile", LLSD().with("id", gAgentID)));

+    if (profile_floater)

+    {

+        profile_floater->createPick(data);

+    }

+}

+

+// static

+void LLPanelPlaceInfo::onNameCache(LLTextBox* text, const std::string& full_name)

+{

+    text->setText(full_name);

+}

+

+// static

+void LLPanelPlaceInfo::onAvatarNameCache(const LLUUID& agent_id,

+                                         const LLAvatarName& av_name,

+                                         LLTextBox* text)

+{

+    text->setText( av_name.getCompleteName() );

+}