Merge branch 'DRTVWR-559' into DRTVWR-592

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index 45d0252e4f..0535036cb0 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -87,8 +87,10 @@ public:
         return true;
     }
 
-    bool handle(const LLSD& params, const LLSD& query_map,
-        LLMediaCtrl* web)
+    bool handle(const LLSD& params,
+                const LLSD& query_map,
+                const std::string& grid,
+                LLMediaCtrl* web)
     {
         if (LLStartUp::getStartupState() < STATE_STARTED)
         {
@@ -529,6 +531,7 @@ void LLPanelProfilePick::setAvatarId(const LLUUID& avatar_id)
             pick_name = parcel->getName();
             pick_desc = parcel->getDesc();
             snapshot_id = parcel->getSnapshotID();
+            mPickDescription->setParseHTML(false);
         }
 
         LLViewerRegion* region = gAgent.getRegion();