summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Collapse)Author
2010-03-31recent crash regression fix from Seraph.Tofu Linden
2010-03-31Fix for crash in process_avatar_movement.Loren Shih
gAgentAvatarp pointer was being checked for null instead of the local avatarp.
2010-03-31merge from viewer-trunkTofu Linden
2010-03-31Merge from default branchMike Antipov
--HG-- branch : product-engine
2010-03-30EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate classLoren Shih
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-26EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Lots of superficial cleanup, particularly around "if (" formatting. Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
2010-03-26Manual merge from default branchVadim Savchuk
Resolved conflict in indra/newview/llviewerwindow.cpp. --HG-- branch : product-engine
2010-03-26fixed EXT-6373 “Consecutive offer messages are unreadable in the IM log”,Alexei Arabadji
replaced [NAME] with [NAME_SLURL] in teleport offer notification, this will unify offers appearance and gap between offers in IM chat log with disabled plaintext mode; --HG-- branch : product-engine
2010-03-25automated mergeLoren Shih
2010-03-25EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-03-25fixed EXT-6489 “"User not online - inventory has been saved" should be ↵Alexei Arabadji
logged to IM log”, reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/90/ --HG-- branch : product-engine
2010-03-24EXT-2959 : Pull out camera functions from llagent to llagentcameraLoren Shih
#2 checkin. Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-03-23Merge from viewer-2-0Tofu Linden
2010-03-24Manual merge from default branch.Vadim Savchuk
Resolved conflicts in llpanellandmarks.cpp. --HG-- branch : product-engine
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-22fixed EXT-6474 crash in Search Floater, people tab, on offering teleport ↵Igor Borovkov
(when viewer is disconnected, timed out) added defensive check for non null region --HG-- branch : product-engine
2010-03-20mergeDave Parks
2010-03-19Updated normal task EXT-5905 - Resolving offers.Dmitry Zaporozhan
Reusable notifications are deleted when user closes IM floater(old - when user closes Viewer). --HG-- branch : product-engine
2010-03-19fixed EXT-6451 Name of people sending a IM some times is NoBodyIgor Borovkov
LLSD::maps keys accross the code are used in mix of cases, lower and upper. Using "from_id" and "FROM_ID" causes avatar id to be null and thus "no body" was displayed. BUT this fix is of no use since several minutes ago viewer-offers feature was merged into release, which overrides avatar name with "Second Life" to display message about teleport offering as system message Reviewed by Q at https://codereview.productengine.com/secondlife/r/72/ --HG-- branch : product-engine
2010-03-19Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/Dmitry Zaporozhan
--HG-- branch : product-engine
2010-03-19Related to EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message needs ↵Andrew Dyukov
translation) - Slightly modified regexp to avoid adding of extra space after names and also made demands to the end of the message string more strict by escaping "." Reviewed by Kent at https://codereview.productengine.com/secondlife/r/55/ --HG-- branch : product-engine
2010-03-19Merged with viewer-offersDmitry Zaporozhan
--HG-- branch : product-engine
2010-03-18Implemented normal task EXT-5986 ([HARD CODED]. "You paid ...... L$... " - ↵Andrew Dyukov
message needs translation). String is server side hardcoded! - Moved strings to strings.xml - Parsed incoming "You paid" messages in code via regex --HG-- branch : product-engine
2010-03-18(EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$)Sergei Litovchuk
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/56/ --HG-- branch : product-engine
2010-03-17fixed EXT-6350 [HARD CODED] - System message when loosing connectivity needs ↵Igor Borovkov
to be localized extracted strings used in LLAppViewer::forceDisconnect(...) calls Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/41/ --HG-- branch : product-engine
2010-03-16Fixes EXT-1659; disable cancel button once server reports teleport finished.Andrew A. de Laix
2010-03-16Automated merge from viewer/viewer-2-0Roxie Linden
2010-03-16Implemented normal task EXT-5982([HARD CODED] on L$ kaufen window (Buy L$)).Andrew Dyukov
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/33/ --HG-- branch : product-engine
2010-03-16Fixed normal task EXT-6282 - [TRANSLATED BUT IN EN]? - System message when ↵Dmitry Zaporozhan
receiving inventory offers: The item term needs to be localized Localized asset type names will be taken from strings.xml. Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/15/ --HG-- branch : product-engine
2010-03-16Updated normal task EXT-5905 - Resolving offers.Dmitry Zaporozhan
Update for TeleportOffered and OfferFriendship offers. --HG-- branch : product-engine
2010-03-16EXT-5989 [HARD CODED]. ".... paid you...... L$... " - message needs translationYuri Chebotarev
Reviwed https://codereview.productengine.com/secondlife/r/13/ --HG-- branch : product-engine
2010-03-16Merge from viewer-2-0Alexei Arabadji
--HG-- branch : product-engine
2010-03-15Implemented normal task EXT-5905 - Resolving offers.Dmitry Zaporozhan
Added functionality to make Toasts accept multiple user inputs(clicks on option buttons). --HG-- branch : product-engine
2010-03-15fix for EXT-5989 [HARD CODED]. ".... paid you...... L$... " - message needs ↵Yuri Chebotarev
translation --HG-- branch : product-engine
2010-03-08automated mergeRoxie Linden
2010-03-05merge from viewer-2-0Tofu Linden
2010-03-02Merge with viewer-2-0Dave Parks
2010-03-02Work on normal sub-task EXT-5886 ([HARD CODED] - System message "Teleport ↵Mike Antipov
completed from" needs translation) - moved hard coded string into teleport_strings.xml (name="completed_from") --HG-- branch : product-engine
2010-03-02CID-435Tofu Linden
Checker: MISSING_BREAK Function: friendship_offer_callback(const LLSD &, const LLSD &) File: /indra/newview/llviewermessage.cpp not-a-bug
2010-02-28Remove some dead code.Dave Parks
Add LH transform to LLVector3 Add DebugShowUploadCost Make LOD generation on model preview less finnicky. Remove error level based LOD generation. Better framing of model before upload. Better error handling for model uploader. Remove [COST] argument from model upload menu item. Remove L$ check from model upload menu item being enabled.
2010-02-19merge from viewer2, conflicts resolved...Tofu Linden
2010-02-19EXT-5101 “No feedback provided when accepting a friend request”,Alexei Arabadji
suppresed toasting when logging accept/decline --HG-- branch : product-engine
2010-02-19fixed EXT-5101 “No feedback provided when accepting a friend request”,Alexei Arabadji
added logging of friendship offer accept/decline; --HG-- branch : product-engine