summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llagent.cpp4
-rw-r--r--indra/newview/llassetuploadresponders.h1
-rw-r--r--indra/newview/llclassifiedstatsresponder.h1
-rw-r--r--indra/newview/llfloateranimpreview.cpp5
-rw-r--r--indra/newview/llfloaterhardwaresettings.cpp6
-rw-r--r--indra/newview/llfloaterworldmap.cpp4
-rw-r--r--indra/newview/llhomelocationresponder.cpp4
-rw-r--r--indra/newview/llhomelocationresponder.h2
-rw-r--r--indra/newview/llinventorymodel.h1
-rw-r--r--indra/newview/llnamelistctrl.h8
-rw-r--r--indra/newview/llpanelpick.cpp46
-rw-r--r--indra/newview/llpanelpick.h12
-rw-r--r--indra/newview/llspatialpartition.cpp6
-rw-r--r--indra/newview/llviewerassetstorage.h1
-rw-r--r--indra/newview/llviewerjointmesh.h2
-rw-r--r--indra/newview/llwatchdog.h3
16 files changed, 62 insertions, 44 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 15fc59e318..cdf9a6b059 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -5557,7 +5557,7 @@ class LLAgentDropGroupViewerNode : public LLHTTPNode
!input.has("body") )
{
//what to do with badly formed message?
- response->status(400);
+ response->statusUnknownError(400);
response->result(LLSD("Invalid message parameters"));
}
@@ -5630,7 +5630,7 @@ class LLAgentDropGroupViewerNode : public LLHTTPNode
else
{
//what to do with badly formed message?
- response->status(400);
+ response->statusUnknownError(400);
response->result(LLSD("Invalid message parameters"));
}
}
diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h
index 9ab571ae99..a08d70213c 100644
--- a/indra/newview/llassetuploadresponders.h
+++ b/indra/newview/llassetuploadresponders.h
@@ -47,6 +47,7 @@ public:
const std::string& file_name,
LLAssetType::EType asset_type);
~LLAssetUploadResponder();
+
virtual void error(U32 statusNum, const std::string& reason);
virtual void result(const LLSD& content);
virtual void uploadUpload(const LLSD& content);
diff --git a/indra/newview/llclassifiedstatsresponder.h b/indra/newview/llclassifiedstatsresponder.h
index c4591df8de..9c52ed5ae1 100644
--- a/indra/newview/llclassifiedstatsresponder.h
+++ b/indra/newview/llclassifiedstatsresponder.h
@@ -44,6 +44,7 @@ public:
//If we get back a normal response, handle it here
virtual void result(const LLSD& content);
//If we get back an error (not found, etc...), handle it here
+
virtual void error(U32 status, const std::string& reason);
protected:
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp
index a1d9fed567..979c5543e7 100644
--- a/indra/newview/llfloateranimpreview.cpp
+++ b/indra/newview/llfloateranimpreview.cpp
@@ -307,8 +307,9 @@ BOOL LLFloaterAnimPreview::postBuild()
motionp->setName(childGetValue("name_form").asString());
mAnimPreview->getDummyAvatar()->startMotion(mMotionID);
- childSetMinValue("playback_slider", 0.0);
- childSetMaxValue("playback_slider", 1.0);
+
+ getChild<LLSlider>("playback_slider")->setMinValue(0.0);
+ getChild<LLSlider>("playback_slider")->setMaxValue(1.0);
childSetValue("loop_check", LLSD(motionp->getLoop()));
childSetValue("loop_in_point", LLSD(motionp->getLoopIn() / motionp->getDuration() * 100.f));
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
index ef1d43f2f6..8121a1cc10 100644
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ b/indra/newview/llfloaterhardwaresettings.cpp
@@ -47,6 +47,7 @@
#include "llradiogroup.h"
#include "lluictrlfactory.h"
#include "llwindow.h"
+#include "llslider.h"
LLFloaterHardwareSettings* LLFloaterHardwareSettings::sHardwareSettings = NULL;
@@ -92,8 +93,8 @@ void LLFloaterHardwareSettings::refreshEnabledState()
{
S32 min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
S32 max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting();
- childSetMinValue("GrapicsCardTextureMemory", min_tex_mem);
- childSetMaxValue("GrapicsCardTextureMemory", max_tex_mem);
+ getChild<LLSlider>("GrapicsCardTextureMemory")->setMinValue(min_tex_mem);
+ getChild<LLSlider>("GrapicsCardTextureMemory")->setMinValue(max_tex_mem);
if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
!gGLManager.mHasVertexBufferObject)
@@ -216,3 +217,4 @@ void LLFloaterHardwareSettings::onBtnOK( void* userdata )
fp->closeFloater(false);
}
+
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 8fe30ea485..cdc4cbc411 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -67,6 +67,7 @@
#include "llappviewer.h"
#include "llmapimagetype.h"
#include "llweb.h"
+#include "llslider.h"
#include "llglheaders.h"
#include "llwindow.h" // copyTextToClipboard()
@@ -972,7 +973,8 @@ void LLFloaterWorldMap::adjustZoomSliderBounds()
pixels_per_region = llclamp(pixels_per_region, 1.f, ZOOM_MAX);
F32 min_power = log(pixels_per_region/256.f)/log(2.f);
- childSetMinValue("zoom slider", min_power);
+
+ getChild<LLSlider>("zoom slider")->setMinValue(min_power);
}
diff --git a/indra/newview/llhomelocationresponder.cpp b/indra/newview/llhomelocationresponder.cpp
index 3ef58e7561..df478a0a04 100644
--- a/indra/newview/llhomelocationresponder.cpp
+++ b/indra/newview/llhomelocationresponder.cpp
@@ -103,7 +103,7 @@ void LLHomeLocationResponder::result( const LLSD& content )
}
}
-void LLHomeLocationResponder::error( const LLSD& content )
+void LLHomeLocationResponder::error( U32 status, const std::string& reason )
{
- llinfos << "received error(" << ll_pretty_print_sd( content ) << ")" << llendl;
+ llinfos << "received error(" << reason << ")" << llendl;
}
diff --git a/indra/newview/llhomelocationresponder.h b/indra/newview/llhomelocationresponder.h
index 1e222cd5b2..3a1d8ebfed 100644
--- a/indra/newview/llhomelocationresponder.h
+++ b/indra/newview/llhomelocationresponder.h
@@ -42,7 +42,7 @@
class LLHomeLocationResponder : public LLHTTPClient::Responder
{
virtual void result( const LLSD& content );
- virtual void error( const LLSD& content );
+ virtual void error( U32 status, const std::string& reason );
};
#endif
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 950e8866bb..c402fea886 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -118,6 +118,7 @@ public:
public:
fetchInventoryResponder(const LLSD& request_sd) : mRequestSD(request_sd) {};
void result(const LLSD& content);
+
void error(U32 status, const std::string& reason);
public:
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 6f64aa68ad..6692d4cff9 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -94,6 +94,14 @@ public:
void addNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM);
/*virtual*/ LLScrollListItem* addElement(const LLSD& element, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
+ LLScrollListItem* addRow(const LLScrollListItem::Params& value, EAddPosition pos = ADD_BOTTOM)
+ {
+ // *NOTE:Mani - This implementation overrides the LLScrollListItem::addRow()
+ // method to call this class's special version of addRow().
+ // The dynamic_cast of a reference type should throw
+ // a std::bad_cast exception on failure.
+ return addRow(dynamic_cast<const NameItem&>(value), pos);
+ }
LLScrollListItem* addRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM);
// Add a user to the list by name. It will be added, the name
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 2bcead425a..b1efb71abb 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -97,9 +97,9 @@ void LLPanelPick::reset()
mCreatorId.setNull();
mParcelId.setNull();
- setName("");
- setDesc("");
- setLocation("");
+ setPickName("");
+ setPickDesc("");
+ setPickLocation("");
mSnapshotCtrl->setImageAssetID(LLUUID::null);
//*HACK just setting asset id to NULL not enough to clear
@@ -164,9 +164,9 @@ void LLPanelPick::init(LLPickData *pick_data)
mPickId = pick_data->pick_id;
mCreatorId = pick_data->creator_id;
- setName(pick_data->name);
- setDesc(pick_data->desc);
- setLocation(pick_data->location_text);
+ setPickName(pick_data->name);
+ setPickDesc(pick_data->desc);
+ setPickLocation(pick_data->location_text);
mSnapshotCtrl->setImageAssetID(pick_data->snapshot_id);
//*HACK see reset() where the texture control was set to FALSE
@@ -188,8 +188,8 @@ void LLPanelPick::createNewPick()
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
if (parcel)
{
- setName(parcel->getName());
- setDesc(parcel->getDesc());
+ setPickName(parcel->getName());
+ setPickDesc(parcel->getDesc());
mSnapshotCtrl->setImageAssetID(parcel->getSnapshotID());
}
@@ -219,9 +219,9 @@ void LLPanelPick::setEditMode( BOOL edit_mode )
mEditMode = edit_mode;
// preserve data before killing controls
- std::string name = getName();
- std::string desc = getDesc();
- std::string location = getLocation();
+ std::string name = getPickName();
+ std::string desc = getPickDesc();
+ std::string location = getPickLocation();
LLUUID snapshot_id = mSnapshotCtrl->getImageAssetID();
LLRect old_rect = getRect();
@@ -242,15 +242,15 @@ void LLPanelPick::setEditMode( BOOL edit_mode )
setRect(old_rect);
// time to restore data
- setName(name);
- setDesc(desc);
- setLocation(location);
+ setPickName(name);
+ setPickDesc(desc);
+ setPickLocation(location);
mSnapshotCtrl->setImageAssetID(snapshot_id);
updateButtons();
}
-void LLPanelPick::setName(std::string name)
+void LLPanelPick::setPickName(std::string name)
{
if (mEditMode)
{
@@ -262,7 +262,7 @@ void LLPanelPick::setName(std::string name)
}
}
-void LLPanelPick::setDesc(std::string desc)
+void LLPanelPick::setPickDesc(std::string desc)
{
if (mEditMode)
{
@@ -274,22 +274,22 @@ void LLPanelPick::setDesc(std::string desc)
}
}
-void LLPanelPick::setLocation(std::string location)
+void LLPanelPick::setPickLocation(std::string location)
{
childSetWrappedText(XML_LOCATION, location);
}
-std::string LLPanelPick::getName()
+std::string LLPanelPick::getPickName()
{
return childGetValue(XML_NAME).asString();
}
-std::string LLPanelPick::getDesc()
+std::string LLPanelPick::getPickDesc()
{
return childGetValue(XML_DESC).asString();
}
-std::string LLPanelPick::getLocation()
+std::string LLPanelPick::getPickLocation()
{
return childGetValue(XML_LOCATION).asString();
}
@@ -310,8 +310,8 @@ void LLPanelPick::sendUpdate()
//legacy var need to be deleted
pick_data.top_pick = FALSE;
pick_data.parcel_id = mParcelId;
- pick_data.name = getName();
- pick_data.desc = getDesc();
+ pick_data.name = getPickName();
+ pick_data.desc = getPickDesc();
pick_data.snapshot_id = mSnapshotCtrl->getImageAssetID();
pick_data.pos_global = mPosGlobal;
pick_data.sort_order = 0;
@@ -381,7 +381,7 @@ void LLPanelPick::onClickSet()
location_text.append(mSimName);
location_text.append(llformat(" (%d, %d, %d)", region_x, region_y, region_z));
- setLocation(location_text);
+ setPickLocation(location_text);
}
// static
diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h
index fd07d9ef91..db943f4eaf 100644
--- a/indra/newview/llpanelpick.h
+++ b/indra/newview/llpanelpick.h
@@ -82,13 +82,13 @@ public:
protected:
- void setName(std::string name);
- void setDesc(std::string desc);
- void setLocation(std::string location);
+ void setPickName(std::string name);
+ void setPickDesc(std::string desc);
+ void setPickLocation(std::string location);
- std::string getName();
- std::string getDesc();
- std::string getLocation();
+ std::string getPickName();
+ std::string getPickDesc();
+ std::string getPickLocation();
void sendUpdate();
void requestData();
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index e45e1feffd..c4364ed6ca 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -826,7 +826,7 @@ class LLSpatialSetStateDiff : public LLSpatialSetState
public:
LLSpatialSetStateDiff(U32 state) : LLSpatialSetState(state) { }
- virtual void traverse(const LLSpatialGroup::TreeNode* n)
+ virtual void traverse(const LLSpatialGroup::OctreeNode* n)
{
LLSpatialGroup* group = (LLSpatialGroup*) n->getListener(0);
@@ -885,7 +885,7 @@ class LLSpatialClearStateDiff : public LLSpatialClearState
public:
LLSpatialClearStateDiff(U32 state) : LLSpatialClearState(state) { }
- virtual void traverse(const LLSpatialGroup::TreeNode* n)
+ virtual void traverse(const LLSpatialGroup::OctreeNode* n)
{
LLSpatialGroup* group = (LLSpatialGroup*) n->getListener(0);
@@ -1498,7 +1498,7 @@ public:
return false;
}
- virtual void traverse(const LLSpatialGroup::TreeNode* n)
+ virtual void traverse(const LLSpatialGroup::OctreeNode* n)
{
LLSpatialGroup* group = (LLSpatialGroup*) n->getListener(0);
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h
index 15c11c7025..512b590a1b 100644
--- a/indra/newview/llviewerassetstorage.h
+++ b/indra/newview/llviewerassetstorage.h
@@ -47,6 +47,7 @@ public:
LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
LLVFS *vfs);
+ using LLAssetStorage::storeAssetData;
virtual void storeAssetData(
const LLTransactionID& tid,
LLAssetType::EType atype,
diff --git a/indra/newview/llviewerjointmesh.h b/indra/newview/llviewerjointmesh.h
index 0248502789..543679c44b 100644
--- a/indra/newview/llviewerjointmesh.h
+++ b/indra/newview/llviewerjointmesh.h
@@ -148,7 +148,7 @@ public:
void setIsTransparent(BOOL is_transparent) { mIsTransparent = is_transparent; }
- /*virtual*/ BOOL isAnimatable() { return FALSE; }
+ /*virtual*/ BOOL isAnimatable() const { return FALSE; }
static void updateVectorize(); // Update globals when settings variables change
diff --git a/indra/newview/llwatchdog.h b/indra/newview/llwatchdog.h
index ed7d5bdcfb..79398c434a 100644
--- a/indra/newview/llwatchdog.h
+++ b/indra/newview/llwatchdog.h
@@ -64,9 +64,10 @@ public:
/* virtual */ bool isAlive() const;
/* virtual */ void reset();
- /* virtual */ void start(const std::string& state);
+ /* virtual */ void start() { start(""); }
/* virtual */ void stop();
+ void start(const std::string& state);
void setTimeout(F32 d);
void ping(const std::string& state);
const std::string& getState() {return mPingState; }
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 05:34:23 +0000