From a154ec72f759e20add6aacfab7f04e65b49051b9 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Tue, 8 May 2007 22:20:26 +0000 Subject: svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release --- indra/newview/app_settings/keywords.ini | 4 ++-- indra/newview/llagent.cpp | 4 ++-- indra/newview/llassetuploadresponders.cpp | 4 ++-- indra/newview/llfirstuse.h | 4 ++-- indra/newview/llfloaterlandholdings.cpp | 2 +- indra/newview/llfloaterregioninfo.cpp | 2 +- indra/newview/llpanelgrouplandmoney.cpp | 18 +++++++++--------- indra/newview/llpanelgrouplandmoney.h | 2 +- indra/newview/llpreview.cpp | 16 +++++++++++----- indra/newview/llstartup.cpp | 4 ++-- indra/newview/llviewermessage.cpp | 2 +- 11 files changed, 34 insertions(+), 28 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index f53a384608..c2a2ce2755 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -37,7 +37,7 @@ at_target at_target(integer tnum, vector targetpos, vector ourpos):Result of ll not_at_target not_at_target():Result of llTarget library function call at_rot_target at_rot_target(integer tnum, rotation targetrot, rotation ourrot):Result of LLRotTarget library function call not_at_rot_target not_at_rot_target():Result of LLRotTarget library function call -money money(key id, integer amount):Triggered when money is given to task +money money(key id, integer amount):Triggered when L$ is given to task email email(string time, string address, string subj, string message, integer num_left):Triggered when task receives email run_time_permissions run_time_permissions(integer perm):Triggered when an agent grants run time permissions to task attach attach(key id):Triggered when an agent attaches or detaches from agent @@ -79,7 +79,7 @@ CONTROL_UP Passed to llTakeControls library function and used control event CONTROL_DOWN Passed to llTakeControls library function and used control event handler to test for agent down control CONTROL_LBUTTON Passed to llTakeControls library function and used control event handler to test for agent left button control CONTROL_ML_LBUTTON Passed to llTakeControls library function and used control event handler to test for agent left button control with the agent in mouse look -PERMISSION_DEBIT Passed to llRequestPermissions library function to request permission to take money from agent's account +PERMISSION_DEBIT Passed to llRequestPermissions library function to request permission to take L$ from agent's account PERMISSION_TAKE_CONTROLS Passed to llRequestPermissions library function to request permission to take agent's controls # PERMISSION_REMAP_CONTROLS Passed to llRequestPermissions library function to request permission to remap agent's controls (not implemented yet) PERMISSION_TRIGGER_ANIMATION Passed to llRequestPermissions library function to request permission to trigger animation on agent diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 13fa29e242..9fa5244c39 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -6753,7 +6753,7 @@ void LLAgent::removeWearable( EWearableType type ) if( old_wearable->isDirty() ) { // Bring up view-modal dialog: Save changes? Yes, No, Cancel - gViewerWindow->alertXml("RemoveWearableSave", LLAgent::onRemoveWearableDialog, (void*)(S32)type ); + gViewerWindow->alertXml("WearableSave", LLAgent::onRemoveWearableDialog, (void*)(S32)type ); return; } else @@ -6983,7 +6983,7 @@ void LLAgent::setWearable( LLInventoryItem* new_item, LLWearable* new_wearable ) if( old_wearable->isDirty() ) { // Bring up modal dialog: Save changes? Yes, No, Cancel - gViewerWindow->alertXml( "SetWearableSave", LLAgent::onSetWearableDialog, + gViewerWindow->alertXml( "WearableSave", LLAgent::onSetWearableDialog, new LLSetWearableData( new_item->getUUID(), new_wearable )); return; } diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index 26c606fc31..789beaae39 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -128,7 +128,7 @@ void LLAssetUploadResponder::uploadUpload(const LLSD& content) void LLAssetUploadResponder::uploadFailure(const LLSD& content) { std::string reason = content["state"]; - // deal with money errors + // deal with L$ errors if (reason == "insufficient funds") { LLFloaterBuyCurrency::buyCurrency("Uploading costs", gGlobalEconomy->getPriceUpload()); @@ -166,7 +166,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content) LLAssetType::EType asset_type = LLAssetType::lookup(mPostData["asset_type"].asString().c_str()); LLInventoryType::EType inventory_type = LLInventoryType::lookup(mPostData["inventory_type"].asString().c_str()); - // Update money and ownership credit information + // Update L$ and ownership credit information // since it probably changed on the server if (asset_type == LLAssetType::AT_TEXTURE || asset_type == LLAssetType::AT_SOUND || diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index af545a05a9..b367619196 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -29,8 +29,8 @@ reduced range, how to leave conversation, arrow keys to orbit. 6. First lft-click that does nothing (land,object): Explain that rgt-click gives menu, lft-click interacts or moves if physical -7. On first receipt of money (not rez/derez) explain that objects or people may -give you money, and how to give someone or something money ('Pay...'). +7. On first receipt of L$ (not rez/derez) explain that objects or people may +give you L$, and how to give someone or something money ('Pay...'). 8. After first teleporting and being sent to nearest hub, a dialog explaining how to find and move toward the beacon. diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp index 919e218a68..ec001c582a 100644 --- a/indra/newview/llfloaterlandholdings.cpp +++ b/indra/newview/llfloaterlandholdings.cpp @@ -52,7 +52,7 @@ void LLFloaterLandHoldings::show(void*) LLParcel::C_ANY, ""); - // TODO: request updated money balance? + // TODO: request updated L$ balance? floater->open(); /* Flawfinder: ignore */ } diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 32923e2f11..dc34291f24 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -2771,7 +2771,7 @@ bool LLDispatchEstateUpdateInfo::operator()( // UI, as anyone can teleport there. // However, gods need to be able to edit the access list for // linden estates, regardless of visibility, to allow object - // and money transfers. + // and L$ transfers. bool enable_agent = (!visible_from_mainland || (god && linden_estate)); bool enable_group = enable_agent; bool enable_ban = !linden_estate; diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp index 5a6716d965..b11b6bd253 100644 --- a/indra/newview/llpanelgrouplandmoney.cpp +++ b/indra/newview/llpanelgrouplandmoney.cpp @@ -1,6 +1,6 @@ /** * @file llpanelgrouplandmoney.cpp - * @brief Panel for group land and money. + * @brief Panel for group land and L$. * * Copyright (c) 2006-$CurrentYear$, Linden Research, Inc. * $License$ @@ -461,7 +461,7 @@ void LLPanelGroupLandMoney::update(LLGroupChange gc) panelp = tabp->getCurrentPanel(); - //now pull the event handler associated with that money tab + //now pull the event handler associated with that L$ tab if ( panelp ) { eh = get_if_there(LLGroupMoneyTabEventHandler::sTabsToHandlers, @@ -614,7 +614,7 @@ BOOL LLPanelGroupLandMoney::postBuild() } - //pull out the widgets for the money details tab + //pull out the widgets for the L$ details tab earlierp = (LLButton*) getChildByName("earlier_details_button", true); laterp = (LLButton*) getChildByName("later_details_button", true); textp = (LLTextEditor*) getChildByName("group_money_details_text", true); @@ -651,7 +651,7 @@ BOOL LLPanelGroupLandMoney::postBuild() mGroupID); } - //pull out the widgets for the money sales tab + //pull out the widgets for the L$ sales tab earlierp = (LLButton*) getChildByName("earlier_sales_button", true); laterp = (LLButton*) getChildByName("later_sales_button", true); textp = (LLTextEditor*) getChildByName("group_money_sales_text", true); @@ -688,7 +688,7 @@ void LLPanelGroupLandMoney::processPlacesReply(LLMessageSystem* msg, void**) LLPanelGroupLandMoney* selfp = sGroupIDs.getIfThere(group_id); if(!selfp) { - llinfos << "Group Panel Land Money " << group_id << " no longer in existence." + llinfos << "Group Panel Land L$ " << group_id << " no longer in existence." << llendl; return; } @@ -1022,7 +1022,7 @@ void LLGroupMoneyDetailsTabEventHandler::processGroupAccountDetailsReply(LLMessa msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); if (gAgent.getID() != agent_id) { - llwarns << "Got group money history reply for another agent!" + llwarns << "Got group L$ history reply for another agent!" << " Probably a userserver bug!" << llendl; return; } @@ -1197,7 +1197,7 @@ void LLGroupMoneySalesTabEventHandler::processGroupAccountTransactionsReply(LLMe msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); if (gAgent.getID() != agent_id) { - llwarns << "Got group money history reply for another agent!" + llwarns << "Got group L$ history reply for another agent!" << " Probably a userserver bug!" << llendl; return; } @@ -1366,7 +1366,7 @@ void LLGroupMoneyPlanningTabEventHandler::processGroupAccountSummaryReply(LLMess msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); if (gAgent.getID() != agent_id) { - llwarns << "Got group money history reply for another agent!" + llwarns << "Got group L$ history reply for another agent!" << " Probably a userserver bug!" << llendl; return; } @@ -1379,7 +1379,7 @@ void LLGroupMoneyPlanningTabEventHandler::processGroupAccountSummaryReply(LLMess self = LLGroupMoneyTabEventHandler::sInstanceIDs.getIfThere(request_id); if (!self) { - llwarns << "GroupAccountSummary recieved for non-existent group money planning tab." << llendl; + llwarns << "GroupAccountSummary recieved for non-existent group L$ planning tab." << llendl; return; } diff --git a/indra/newview/llpanelgrouplandmoney.h b/indra/newview/llpanelgrouplandmoney.h index b1cf44fe46..3123855bfa 100644 --- a/indra/newview/llpanelgrouplandmoney.h +++ b/indra/newview/llpanelgrouplandmoney.h @@ -1,6 +1,6 @@ /** * @file llpanelgrouplandmoney.h - * @brief Panel for group land and money. + * @brief Panel for group land and L$. * * Copyright (c) 2006-$CurrentYear$, Linden Research, Inc. * $License$ diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 39cc290b0f..7c00742122 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -464,8 +464,11 @@ LLPreview* LLPreview::getFirstPreviewForSource(const LLUUID& source_id) void LLPreview::userSetShape(const LLRect& new_rect) { - userResized(); - LLView::userSetShape(new_rect); + if(new_rect.getWidth() != mRect.getWidth() || new_rect.getHeight() != mRect.getHeight()) + { + userResized(); + } + LLFloater::userSetShape(new_rect); } // @@ -490,9 +493,12 @@ void LLMultiPreview::open() /*Flawfinder: ignore*/ void LLMultiPreview::userSetShape(const LLRect& new_rect) { - LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel(); - if (frontmost_preview) frontmost_preview->userResized(); - LLView::userSetShape(new_rect); + if(new_rect.getWidth() != mRect.getWidth() || new_rect.getHeight() != mRect.getHeight()) + { + LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel(); + if (frontmost_preview) frontmost_preview->userResized(); + } + LLFloater::userSetShape(new_rect); } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 44b4d77c1e..757bb4bae4 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2104,7 +2104,7 @@ BOOL idle_startup() // request mute list gMuteListp->requestFromServer(gAgent.getID()); - // Get money and ownership credit information + // Get L$ and ownership credit information msg->newMessageFast(_PREHASH_MoneyBalanceRequest); msg->nextBlockFast(_PREHASH_AgentData); msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID()); @@ -2300,7 +2300,7 @@ BOOL idle_startup() gViewerWindow->sendShapeToSim(); // Ignore stipend information for now. Money history is on the web site. - // if needed, show the money history window + // if needed, show the L$ history window //if (stipend_since_login && !gNoRender) //{ //} diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 23e1ab6664..a43bb4bb5b 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3980,7 +3980,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** ) msg->getS32("MoneyData", "SquareMetersCredit", credit); msg->getS32("MoneyData", "SquareMetersCommitted", committed); msg->getStringFast(_PREHASH_MoneyData, _PREHASH_Description, STD_STRING_BUF_SIZE, desc); - llinfos << "money, credit, committed: " << balance << " " << credit << " " + llinfos << "L$, credit, committed: " << balance << " " << credit << " " << committed << llendl; if (gStatusBar) -- cgit v1.2.3