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

LLViewerRegion: WIP - header changes and anticipated compile fixes

Browse Source 
Does not compile now.
llviewerregion.cpp wasn't touched.
Other changes elsewhere in the code (like in llstartup.cpp) might still be needed.
This commit is contained in:
Aleric Inglewood
2012-02-16 02:32:31 +01:00
parent f05343dec1
commit 3680e022fc
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaterbuyland.cpp
View File

@@ -540,7 +540,7 @@ void LLFloaterBuyLandUI::updateCovenantInfo()
LLTextBox* region_type = getChild<LLTextBox>("region_type_text"); LLTextBox* region_type = getChild<LLTextBox>("region_type_text");
if (region_type) if (region_type)
{ {
region_type->setText(region->getSimProductName()); region_type->setText(region->getLocalizedSimProductName());
} }
LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause"); LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause");

4
indra/newview/llfloaterland.cpp
View File

@@ -525,7 +525,7 @@ void LLPanelLandGeneral::refresh()
if (regionp) if (regionp)
{ {
mContentRating->setText(regionp->getSimAccessString()); mContentRating->setText(regionp->getSimAccessString());
mLandType->setText(regionp->getSimProductName()); mLandType->setText(regionp->getLocalizedSimProductName());
} }
// estate owner/manager cannot edit other parts of the parcel // estate owner/manager cannot edit other parts of the parcel
@@ -2907,7 +2907,7 @@ void LLPanelLandCovenant::refresh()
LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text"); LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text");
if (region_landtype) if (region_landtype)
{ {
region_landtype->setText(region->getSimProductName()); region_landtype->setText(region->getLocalizedSimProductName());
} }
LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text"); LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text");

2
indra/newview/llfloaterregioninfo.cpp
View File

@@ -2720,7 +2720,7 @@ bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region)
LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text"); LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text");
if (region_landtype) if (region_landtype)
{ {
region_landtype->setText(region->getSimProductName()); region_landtype->setText(region->getLocalizedSimProductName());
} }

20
indra/newview/llviewerregion.h
View File

@@ -67,7 +67,6 @@ class LLVOCache;
class LLVOCacheEntry; class LLVOCacheEntry;
class LLSpatialPartition; class LLSpatialPartition;
class LLEventPump; class LLEventPump;
//class LLCapabilityListener;
class LLDataPacker; class LLDataPacker;
class LLDataPackerBinaryBuffer; class LLDataPackerBinaryBuffer;
class LLHost; class LLHost;
@@ -199,7 +198,7 @@ public:
S32 getSimCPURatio() const { return mCPURatio; } S32 getSimCPURatio() const { return mCPURatio; }
const std::string& getSimColoName() const { return mColoName; } const std::string& getSimColoName() const { return mColoName; }
const std::string& getSimProductSKU() const { return mProductSKU; } const std::string& getSimProductSKU() const { return mProductSKU; }
const std::string& getSimProductName() const { return mProductName; } std::string getLocalizedSimProductName() const;
// Returns "Sandbox", "Expensive", etc. // Returns "Sandbox", "Expensive", etc.
static std::string regionFlagsToString(U32 flags); static std::string regionFlagsToString(U32 flags);
@@ -209,7 +208,10 @@ public:
// Returns "M", "PG", "A" etc. // Returns "M", "PG", "A" etc.
static std::string accessToShortString(U8 sim_access); static std::string accessToShortString(U8 sim_access);
// Return access icon name
static std::string getAccessIcon(U8 sim_access);
// helper function which just makes sure all interested parties // helper function which just makes sure all interested parties
// can process the message. // can process the message.
static void processRegionInfo(LLMessageSystem* msg, void**); static void processRegionInfo(LLMessageSystem* msg, void**);
@@ -230,11 +232,12 @@ public:
U32 getPacketsLost() const; U32 getPacketsLost() const;
void setHttpResponderPtrNULL(); S32 getHttpResponderID() const;
const LLHTTPClient::ResponderPtr getHttpResponderPtr() const;
// Get/set named capability URLs for this region. // Get/set named capability URLs for this region.
void setSeedCapability(const std::string& url); void setSeedCapability(const std::string& url);
void failedSeedCapability();
S32 getNumSeedCapRetries();
void setCapability(const std::string& name, const std::string& url); void setCapability(const std::string& name, const std::string& url);
// implements LLCapabilityProvider // implements LLCapabilityProvider
virtual std::string getCapability(const std::string& name) const; virtual std::string getCapability(const std::string& name) const;
@@ -249,7 +252,7 @@ public:
/// Get LLEventPump on which we listen for capability requests /// Get LLEventPump on which we listen for capability requests
/// (https://wiki.lindenlab.com/wiki/Viewer:Messaging/Messaging_Notes#Capabilities) /// (https://wiki.lindenlab.com/wiki/Viewer:Messaging/Messaging_Notes#Capabilities)
// LLEventPump& getCapAPI() const; LLEventPump& getCapAPI() const;
/// implements LLCapabilityProvider /// implements LLCapabilityProvider
/*virtual*/ const LLHost& getHost() const; /*virtual*/ const LLHost& getHost() const;
@@ -328,6 +331,11 @@ public:
LLSpatialPartition* getSpatialPartition(U32 type); LLSpatialPartition* getSpatialPartition(U32 type);
bool objectIsReturnable(const LLVector3& pos, const std::vector<LLBBox>& boxes) const; bool objectIsReturnable(const LLVector3& pos, const std::vector<LLBBox>& boxes) const;
bool childrenObjectReturnable( const std::vector<LLBBox>& boxes ) const;
bool objectsCrossParcel(const std::vector<LLBBox>& boxes) const;
void getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegions );
public: public:
struct CompareDistance struct CompareDistance
{ {