Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
Ansariel
commit
65713bc7c9
|
|
@ -292,9 +292,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>f65774ebabb256f2d217a872b0cf2b5b</string>
|
||||
<string>d670d00aa732b97d105d287b62582762</string>
|
||||
<key>url</key>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4812/15284/apr_suite-1.4.5.504800-darwin64-504800.tar.bz2</string>
|
||||
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/55065/512118/apr_suite-1.4.5.539073-darwin64-539073.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin64</string>
|
||||
|
|
@ -992,11 +992,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>469f3e3a177c089deacad40428d23997</string>
|
||||
<string>fab47cbf13e89dd0359b5f5e995f6794</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.02-windows-201991756.tar.bz2</string>
|
||||
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.03-windows-202191858.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows</string>
|
||||
|
|
@ -1006,11 +1006,11 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>59766e450e7395fe996ae17c8c267c76</string>
|
||||
<string>a757fe92a8a48b247e23802c22153d1c</string>
|
||||
<key>hash_algorithm</key>
|
||||
<string>md5</string>
|
||||
<key>url</key>
|
||||
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.02-windows64-201991757.tar.bz2</string>
|
||||
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.03-windows64-202191859.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>windows64</string>
|
||||
|
|
@ -1902,9 +1902,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>534ea1079513a56a78c99bc08179c87c</string>
|
||||
<string>f697ff80c30d3f387b2f5b42e53e574e</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/kdu-7.A.7-darwin-191472236.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/kdu-8.0.5-darwin-202202246.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin</string>
|
||||
|
|
@ -1914,9 +1914,9 @@
|
|||
<key>archive</key>
|
||||
<map>
|
||||
<key>hash</key>
|
||||
<string>534ea1079513a56a78c99bc08179c87c</string>
|
||||
<string>f697ff80c30d3f387b2f5b42e53e574e</string>
|
||||
<key>url</key>
|
||||
<string>file:///opt/firestorm/kdu-7.A.7-darwin-191472236.tar.bz2</string>
|
||||
<string>file:///opt/firestorm/kdu-8.0.5-darwin-202202246.tar.bz2</string>
|
||||
</map>
|
||||
<key>name</key>
|
||||
<string>darwin64</string>
|
||||
|
|
|
|||
|
|
@ -138,8 +138,8 @@ else (USESYSTEMLIBS)
|
|||
optimized boost_thread-mt${addrsfx}
|
||||
debug boost_thread-mt${addrsfx}-d)
|
||||
set(BOOST_WAVE_LIBRARY
|
||||
optimized libboost_wave-mt${addrsfx}
|
||||
debug libboost_wave-mt${addrsfx}-gd)
|
||||
optimized boost_wave-mt${addrsfx}
|
||||
debug boost_wave-mt${addrsfx}-gd)
|
||||
endif (WINDOWS)
|
||||
endif (USESYSTEMLIBS)
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
6.4.6
|
||||
6.4.7
|
||||
|
|
|
|||
|
|
@ -1015,8 +1015,10 @@ void FSAreaSearch::matchObject(FSObjectProperties& details, LLViewerObject* obje
|
|||
cell_params.column = "price";
|
||||
if (details.sale_info.isForSale())
|
||||
{
|
||||
S32 price = details.sale_info.getSalePrice();
|
||||
cell_params.value = price > 0 ? llformat("%s%d", "L$", details.sale_info.getSalePrice()) : LLTrans::getString("free");
|
||||
LLStringUtil::format_map_t args;
|
||||
args["COST"] = llformat("%d", details.sale_info.getSalePrice());
|
||||
std::string cost_label = LLTrans::getString("FSAreaSearch_Cost_Label", args);
|
||||
cell_params.value = cost_label;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1026,7 +1028,7 @@ void FSAreaSearch::matchObject(FSObjectProperties& details, LLViewerObject* obje
|
|||
|
||||
cell_params.column = "land_impact";
|
||||
F32 cost = objectp->getLinksetCost();
|
||||
if (cost > 0.001)
|
||||
if (cost > F_ALMOST_ZERO)
|
||||
{
|
||||
cell_params.value = cost;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -327,32 +327,9 @@ BOOL LLPanelMainInventory::postBuild()
|
|||
mGearMenuButton = getChild<LLMenuButton>("options_gear_btn");
|
||||
|
||||
initListCommandsHandlers();
|
||||
// <FS:AW opensim currency support>
|
||||
//const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
|
||||
//const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost());
|
||||
//const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost());
|
||||
S32 texture_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
|
||||
S32 sound_upload_cost = LLAgentBenefitsMgr::current().getSoundUploadCost();
|
||||
S32 animation_upload_cost = LLAgentBenefitsMgr::current().getAnimationUploadCost();
|
||||
std::string texture_upload_cost_str;
|
||||
std::string sound_upload_cost_str;
|
||||
std::string animation_upload_cost_str;
|
||||
#ifdef OPENSIM
|
||||
if (LLGridManager::getInstance()->isInOpenSim())
|
||||
{
|
||||
texture_upload_cost_str = texture_upload_cost > 0 ? llformat("%s%d", "L$", texture_upload_cost) : LLTrans::getString("free");
|
||||
sound_upload_cost_str = sound_upload_cost > 0 ? llformat("%s%d", "L$", sound_upload_cost) : LLTrans::getString("free");
|
||||
animation_upload_cost_str = animation_upload_cost > 0 ? llformat("%s%d", "L$", animation_upload_cost) : LLTrans::getString("free");
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
texture_upload_cost_str = "L$" + llformat("%d", texture_upload_cost);
|
||||
sound_upload_cost_str = "L$" + llformat("%d", sound_upload_cost);
|
||||
animation_upload_cost_str = "L$" + llformat("%d", animation_upload_cost);
|
||||
}
|
||||
// </FS:AW opensim currency support>
|
||||
|
||||
const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
|
||||
const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost());
|
||||
const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost());
|
||||
|
||||
LLMenuGL* menu = (LLMenuGL*)mMenuAddHandle.get();
|
||||
if (menu)
|
||||
|
|
@ -2075,31 +2052,9 @@ void LLPanelMainInventory::setUploadCostIfNeeded()
|
|||
LLMenuGL* menu = (LLMenuGL*)mMenuAddHandle.get();
|
||||
if(mNeedUploadCost && menu)
|
||||
{
|
||||
// <FS:AW opensim currency support>
|
||||
//const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
|
||||
//const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost());
|
||||
//const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost());
|
||||
S32 texture_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
|
||||
S32 sound_upload_cost = LLAgentBenefitsMgr::current().getSoundUploadCost();
|
||||
S32 animation_upload_cost = LLAgentBenefitsMgr::current().getAnimationUploadCost();
|
||||
std::string texture_upload_cost_str;
|
||||
std::string sound_upload_cost_str;
|
||||
std::string animation_upload_cost_str;
|
||||
#ifdef OPENSIM
|
||||
if (LLGridManager::getInstance()->isInOpenSim())
|
||||
{
|
||||
texture_upload_cost_str = texture_upload_cost > 0 ? llformat("%s%d", "L$", texture_upload_cost) : LLTrans::getString("free");
|
||||
sound_upload_cost_str = sound_upload_cost > 0 ? llformat("%s%d", "L$", sound_upload_cost) : LLTrans::getString("free");
|
||||
animation_upload_cost_str = animation_upload_cost > 0 ? llformat("%s%d", "L$", animation_upload_cost) : LLTrans::getString("free");
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
texture_upload_cost_str = "L$" + llformat("%d", texture_upload_cost);
|
||||
sound_upload_cost_str = "L$" + llformat("%d", sound_upload_cost);
|
||||
animation_upload_cost_str = "L$" + llformat("%d", animation_upload_cost);
|
||||
}
|
||||
// </FS:AW opensim currency support>
|
||||
const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
|
||||
const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost());
|
||||
const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost());
|
||||
menu->getChild<LLView>("Upload Image")->setLabelArg("[COST]", texture_upload_cost_str);
|
||||
menu->getChild<LLView>("Upload Sound")->setLabelArg("[COST]", sound_upload_cost_str);
|
||||
menu->getChild<LLView>("Upload Animation")->setLabelArg("[COST]", animation_upload_cost_str);
|
||||
|
|
|
|||
|
|
@ -627,32 +627,10 @@ void init_menus()
|
|||
|
||||
gViewerWindow->setMenuBackgroundColor(false,
|
||||
!LLGridManager::getInstance()->isInSLBeta());
|
||||
// <FS:AW opensim currency support>
|
||||
// *TODO:Also fix cost in llfolderview.cpp for Inventory menus
|
||||
//const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
|
||||
//const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost());
|
||||
//const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost());
|
||||
S32 texture_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
|
||||
S32 sound_upload_cost = LLAgentBenefitsMgr::current().getSoundUploadCost();
|
||||
S32 animation_upload_cost = LLAgentBenefitsMgr::current().getAnimationUploadCost();
|
||||
std::string texture_upload_cost_str;
|
||||
std::string sound_upload_cost_str;
|
||||
std::string animation_upload_cost_str;
|
||||
#ifdef OPENSIM
|
||||
if (LLGridManager::getInstance()->isInOpenSim())
|
||||
{
|
||||
texture_upload_cost_str = texture_upload_cost > 0 ? llformat("%s%d", "L$", texture_upload_cost) : LLTrans::getString("free");
|
||||
sound_upload_cost_str = sound_upload_cost > 0 ? llformat("%s%d", "L$", sound_upload_cost) : LLTrans::getString("free");
|
||||
animation_upload_cost_str = animation_upload_cost > 0 ? llformat("%s%d", "L$", animation_upload_cost) : LLTrans::getString("free");
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
texture_upload_cost_str = "L$" + llformat("%d", texture_upload_cost);
|
||||
sound_upload_cost_str = "L$" + llformat("%d", sound_upload_cost);
|
||||
animation_upload_cost_str = "L$" + llformat("%d", animation_upload_cost);
|
||||
}
|
||||
// </FS:AW opensim currency support>
|
||||
const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
|
||||
const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost());
|
||||
const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost());
|
||||
gMenuHolder->childSetLabelArg("Upload Image", "[COST]", texture_upload_cost_str);
|
||||
gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", sound_upload_cost_str);
|
||||
gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", animation_upload_cost_str);
|
||||
|
|
@ -11067,13 +11045,6 @@ void LLUploadCostCalculator::calculateCost(const std::string& asset_type_str)
|
|||
{
|
||||
LL_WARNS() << "Unable to find upload cost for asset_type_str " << asset_type_str << LL_ENDL;
|
||||
}
|
||||
#ifdef OPENSIM // <FS:AW optional opensim support>
|
||||
if (LLGridManager::getInstance()->isInOpenSim())
|
||||
{
|
||||
mCostStr = upload_cost > 0 ? llformat("%s%d", "L$", upload_cost) : LLTrans::getString("free");
|
||||
}
|
||||
else
|
||||
#endif // OPENSIM // <FS:AW optional opensim support>
|
||||
mCostStr = std::to_string(upload_cost);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6907,16 +6907,9 @@ void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
|
|||
{
|
||||
LLGlobalEconomy::processEconomyData(msg, LLGlobalEconomy::getInstance());
|
||||
|
||||
S32 texture_upload_cost = LLAgentBenefitsMgr::current().getTextureUploadCost();
|
||||
S32 sound_upload_cost = LLAgentBenefitsMgr::current().getSoundUploadCost();
|
||||
S32 animation_upload_cost = LLAgentBenefitsMgr::current().getAnimationUploadCost();
|
||||
std::string texture_upload_cost_str;
|
||||
std::string sound_upload_cost_str;
|
||||
std::string animation_upload_cost_str;
|
||||
|
||||
texture_upload_cost_str = texture_upload_cost > 0 ? llformat("%s%d", "L$", texture_upload_cost) : LLTrans::getString("free");
|
||||
sound_upload_cost_str = sound_upload_cost > 0 ? llformat("%s%d", "L$", sound_upload_cost) : LLTrans::getString("free");
|
||||
animation_upload_cost_str = animation_upload_cost > 0 ? llformat("%s%d", "L$", animation_upload_cost) : LLTrans::getString("free");
|
||||
const std::string texture_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost());
|
||||
const std::string sound_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getSoundUploadCost());
|
||||
const std::string animation_upload_cost_str = std::to_string(LLAgentBenefitsMgr::current().getAnimationUploadCost());
|
||||
gMenuHolder->getChild<LLUICtrl>("Upload Image")->setLabelArg("[COST]", texture_upload_cost_str);
|
||||
gMenuHolder->getChild<LLUICtrl>("Upload Sound")->setLabelArg("[COST]", sound_upload_cost_str);
|
||||
gMenuHolder->getChild<LLUICtrl>("Upload Animation")->setLabelArg("[COST]", animation_upload_cost_str);
|
||||
|
|
|
|||
|
|
@ -5356,11 +5356,6 @@ Falls der Fehler weiterhin auftritt, überprüfen Sie bitte Ihre Netzwerk- und F
|
|||
<string name="LocalEstimateUSD">
|
||||
[AMOUNT] US$
|
||||
</string>
|
||||
<!-- FS:AW opensim currency support -->
|
||||
<string name="free">
|
||||
kostenlos
|
||||
</string>
|
||||
<!-- /FS:AW opensim currency support -->
|
||||
<string name="Group Ban">
|
||||
Gruppen-Bann
|
||||
</string>
|
||||
|
|
@ -7129,4 +7124,7 @@ Ihre aktuelle Position: [AVATAR_POS]
|
|||
<string name="unknown_script">
|
||||
(Unbekanntes Skript)
|
||||
</string>
|
||||
<string name="FSAreaSearch_Cost_Label">
|
||||
[COST] L$
|
||||
</string>
|
||||
</strings>
|
||||
|
|
|
|||
|
|
@ -2439,9 +2439,6 @@ If you continue to experience problems, please check your network and firewall s
|
|||
<!-- currency formatting -->
|
||||
<string name="LocalEstimateUSD">US$ [AMOUNT]</string>
|
||||
|
||||
<!-- FS:AW opensim currency support -->
|
||||
<string name="free">free</string>
|
||||
|
||||
<!-- Group Profile roles and powers -->
|
||||
<string name="Group Ban">Group Ban</string>
|
||||
<string name="Membership">Membership</string>
|
||||
|
|
@ -3192,4 +3189,5 @@ Your current position: [AVATAR_POS]
|
|||
<string name="FSUrlEntryWearLabel">Wear inventory folder</string>
|
||||
<string name="TexturePickerOutfitHeader">Picture for Outfit</string>
|
||||
<string name="unknown_script">(Unknown script)</string>
|
||||
<string name="FSAreaSearch_Cost_Label">L$[COST]</string>
|
||||
</strings>
|
||||
|
|
|
|||
|
|
@ -5107,9 +5107,6 @@ Visita https://secondlife-status.statuspage.io para ver si hay alguna incidencia
|
|||
<string name="LocalEstimateUSD">
|
||||
[AMOUNT] US$
|
||||
</string>
|
||||
<string name="free">
|
||||
gratis
|
||||
</string>
|
||||
<string name="Group Ban">
|
||||
Expulsión de grupo
|
||||
</string>
|
||||
|
|
|
|||
|
|
@ -5131,9 +5131,6 @@ Segnala abuso
|
|||
<string name="LocalEstimateUSD">
|
||||
US$ [AMOUNT]
|
||||
</string>
|
||||
<string name="free">
|
||||
gratis
|
||||
</string>
|
||||
<string name="Group Ban">
|
||||
Espulsione da gruppo
|
||||
</string>
|
||||
|
|
|
|||
|
|
@ -5039,9 +5039,6 @@ Jeśli problemy będą występowały nadal, proszę sprawdź sieć i ustawienia
|
|||
<string name="LocalEstimateUSD">
|
||||
[AMOUNT] US$
|
||||
</string>
|
||||
<string name="free">
|
||||
darmowe
|
||||
</string>
|
||||
<string name="Group Ban">
|
||||
Bany grupowe
|
||||
</string>
|
||||
|
|
|
|||
|
|
@ -5320,9 +5320,6 @@ http://www.firestormviewer.org/support за помощь в решении эт
|
|||
<string name="LocalEstimateUSD">
|
||||
US$ [AMOUNT]
|
||||
</string>
|
||||
<string name="free">
|
||||
бесплатно
|
||||
</string>
|
||||
<string name="Group Ban">
|
||||
Бан группы
|
||||
</string>
|
||||
|
|
|
|||
|
|
@ -1320,7 +1320,7 @@ class DarwinManifest(ViewerManifest):
|
|||
|
||||
# copy additional libs in <bundle>/Contents/MacOS/
|
||||
self.path(os.path.join(relpkgdir, "libndofdev.dylib"), dst="Resources/libndofdev.dylib")
|
||||
# self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib")
|
||||
self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib")
|
||||
|
||||
# CEF framework goes inside Contents/Frameworks.
|
||||
# Remember where we parked this car.
|
||||
|
|
|
|||
Loading…
Reference in New Issue