From 5c29ca72f4881568cf9bd0f18809626a425e407d Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 28 Apr 2012 15:19:24 +0200
Subject: [PATCH] - internal : post-merge fix
--HG--
branch : RLVa
---
indra/newview/lltoolmgr.cpp | 20 ++++++++++++--------
indra/newview/lltoolmgr.h | 5 ++++-
indra/newview/rlvextensions.cpp | 5 ++---
indra/newview/rlvfloaters.cpp | 3 ++-
4 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index 661a9579c2..fad4fc7469 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -84,10 +84,11 @@ LLToolMgr::LLToolMgr()
// Not a panel, register these callbacks globally.
LLUICtrl::EnableCallbackRegistry::currentRegistrar().add("Build.Active", boost::bind(&LLToolMgr::inEdit, this));
// LLUICtrl::EnableCallbackRegistry::currentRegistrar().add("Build.Enabled", boost::bind(&LLToolMgr::canEdit, this));
+// LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Build.Toggle", boost::bind(&LLToolMgr::toggleBuildMode, this, _2));
// [RLVa:KB] - Checked: 2010-09-11 (RLVa-1.2.1d) | Added: RLVa-1.2.1d
LLUICtrl::EnableCallbackRegistry::currentRegistrar().add("Build.Enabled", boost::bind(&RlvUIEnabler::isBuildEnabled));
+ LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Build.Toggle", boost::bind(&LLToolMgr::toggleBuildMode, this));
// [/RLVa:KB]
- LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Build.Toggle", boost::bind(&LLToolMgr::toggleBuildMode, this, _2));
gToolNull = new LLTool(LLStringUtil::null); // Does nothing
setCurrentTool(gToolNull);
@@ -251,14 +252,17 @@ bool LLToolMgr::canEdit()
return LLViewerParcelMgr::getInstance()->allowAgentBuild();
}
-void LLToolMgr::toggleBuildMode(const LLSD& sdname)
+//void LLToolMgr::toggleBuildMode(const LLSD& sdname)
+// [RLVa:KB] - Checked: 2012-04-26 (RLVa-1.4.6) | Added: RLVa-1.4.6
+void LLToolMgr::toggleBuildMode()
+// [/RLVa:KB]
{
- const std::string& param = sdname.asString();
-
- if (param == "build" && !canEdit())
- {
- return;
- }
+// const std::string& param = sdname.asString();
+//
+// if (param == "build" && !canEdit())
+// {
+// return;
+// }
LLFloaterReg::toggleInstanceOrBringToFront("build");
diff --git a/indra/newview/lltoolmgr.h b/indra/newview/lltoolmgr.h
index 12649cfba2..592754730c 100644
--- a/indra/newview/lltoolmgr.h
+++ b/indra/newview/lltoolmgr.h
@@ -54,7 +54,10 @@ public:
bool inEdit();
bool canEdit();
- void toggleBuildMode(const LLSD& sdname);
+// [RLVa:KB] - Checked: 2012-04-26 (RLVa-1.4.6) | Added: RLVa-1.4.6
+ void toggleBuildMode();
+// [/RLVa:KB]
+// void toggleBuildMode(const LLSD& sdname);
/* Determines if we are in Build mode or not. */
bool inBuildMode();
diff --git a/indra/newview/rlvextensions.cpp b/indra/newview/rlvextensions.cpp
index dc3d188679..6365f19885 100644
--- a/indra/newview/rlvextensions.cpp
+++ b/indra/newview/rlvextensions.cpp
@@ -181,9 +181,8 @@ RlvWindLight::RlvWindLight()
m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("distancemultiplier", RlvWindLightControl(&pWLParamMgr->mDistanceMult)));
m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("maxaltitude", RlvWindLightControl(&pWLParamMgr->mMaxAlt)));
m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("scenegamma", RlvWindLightControl(&pWLParamMgr->mWLGamma)));
- // TYPE_COLOR_R
- m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("hazedensity", RlvWindLightControl(&pWLParamMgr->mHazeDensity, true)));
- m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("hazehorizon", RlvWindLightControl(&pWLParamMgr->mHazeHorizon, true)));
+ m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("hazedensity", RlvWindLightControl(&pWLParamMgr->mHazeDensity)));
+ m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("hazehorizon", RlvWindLightControl(&pWLParamMgr->mHazeHorizon)));
// TYPE_COLOR
m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("ambient", RlvWindLightControl(&pWLParamMgr->mAmbient, false)));
m_ControlLookupMap.insert(std::pair<std::string, RlvWindLightControl>("bluedensity", RlvWindLightControl(&pWLParamMgr->mBlueDensity, false)));
diff --git a/indra/newview/rlvfloaters.cpp b/indra/newview/rlvfloaters.cpp
index 51ccfd4483..51d8319c90 100644
--- a/indra/newview/rlvfloaters.cpp
+++ b/indra/newview/rlvfloaters.cpp
@@ -130,7 +130,8 @@ void RlvFloaterBehaviours::onBtnCopyToClipboard()
}
}
- gClipboard.copyFromString(utf8str_to_wstring(strRestrictions.str()));
+ LLWString wstrRestrictions = utf8str_to_wstring(strRestrictions.str());
+ LLClipboard::instance().copyToClipboard(wstrRestrictions, 0, wstrRestrictions.length());
}
// Checked: 2011-05-23 (RLVa-1.3.1c) | Modified: RLVa-1.3.1c
--
GitLab