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

Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

Browse Source 
Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp
This commit is contained in:
Shyotl
2012-02-24 13:21:59 -06:00
parent 5c66c70546 0bdf54e6d9
commit a6a69caa4f
177 changed files with 9551 additions and 2012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterland.cpp
View File

@@ -525,7 +525,7 @@ void LLPanelLandGeneral::refresh()
if (regionp)
{
mContentRating->setText(regionp->getSimAccessString());
mLandType->setText(regionp->getSimProductName());
mLandType->setText(regionp->getLocalizedSimProductName());
}
// 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");
if (region_landtype)
{
region_landtype->setText(region->getSimProductName());
region_landtype->setText(region->getLocalizedSimProductName());
}
LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text");