summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
AgeCommit message (Collapse)Author
2010-04-14Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-14Fixed normal bug EXT-6302 (TP requests need to display destination region ↵Eugene Mutavchi
maturity) Added: - parsing of region information from "lure" binary bucket - displaying destination region maturity by teleport offer Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/229/ --HG-- branch : product-engine
2010-04-13automated mergeLoren Shih
2010-04-12Fixed major bug EXT-6590 (Preference> Maturity rating changes without direct ↵Vadim Savchuk
user input). Now we're notifying user that his/her maturity preference has been changed. Reviewed by Mike: https://codereview.productengine.com/secondlife/r/216/ --HG-- branch : product-engine
2010-04-09Fixed normal bug EXT-4766 - System notifications in nearby chat has default ↵Dmitry Zaporozhan
avatar icon and behave like sent from object Updated nearby toast to display system icon for system message. Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/208/ --HG-- branch : product-engine
2010-04-08Fixed normal bug EXT-6751 (Wrong "You paid" text in notification when ↵Andrew Dyukov
creating a classified). - Bug was caused by absence of localizable string for "You paid..." notifications without name and reason simultaneously. Added such string("you_paid_ldollars_no_info") to strings.xml and used it in code. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/206/ --HG-- branch : product-engine
2010-04-08Fixed normal bug EXT-4347 (Moving object contents to inventory opens files, ↵Mike Antipov
changes menu) Implementation details: * Added new LLViewerInventoryMoveFromWorldObserver to watch moved items via their Asses UUIDs. It is instantiated only once due to drop events are sent separately for each item while multi-dragging. * Existent LLOpenTaskOffer observer uses it to exclude watched by LLViewerInventoryMoveFromWorldObserver items from own processing. * Removed dependancy on LLPanelPlaces in open_inventory_offer(). Openning of offered LM via group notice moved into an appropriate section (processed by LLOpenTaskGroupOffer) Known Issues: * If Script item is among the dragged items from object to inventory it will be the only selected item in the inventory panel. Reason: it does not have its own Asset UUID and processed via LLOpenTaskOffer when should not. Reviewed by Leyla and Richard at https://codereview.productengine.com/secondlife/r/116/ --HG-- branch : product-engine
2010-04-07automated mergeLoren Shih
2010-04-07EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a ↵Loren Shih
base abstract LLInventoryFetchObserver class Minor cleanup of LLInventoryFetchComboObserver
2010-04-07mergeTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-06EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a ↵Loren Shih
base abstract LLInventoryFetchObserver class Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit. Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
2010-04-06EXT-6727 : Allow LLInventoryObservers to target a single item (instead of a ↵Loren Shih
vector of items) Added new constructors to LLInventoryFetch types to allow passing in a single item.
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically FetchObservers now take in a list of IDs to check against. Made some naming changes.
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically Preliminary work to clean up naming conventions.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
2010-04-02EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'sLoren Shih
Fixed some more typedefs that I missed in first checkin.
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-01Automated MergeRoxie Linden
2010-04-01fixed EXT-2801 Record "object return" notification into IM history, not chat ↵Alexei Arabadji
history, * added class for LLPostponedNotification to rpovide possibility postpone adding notification to notifications system till sender avatar name will be received from cache name; * rolled back changes related to fix of EXT-4779; * avoided passing avatar id when logging 'Object Return' notification to nearby chat; eviewed by Vadim Savchuk at https://jira.secondlife.com/browse/EXT-6373 --HG-- branch : product-engine
2010-04-01fixed EXT-6373 Consecutive offer messages are unreadable in the IM logAlexei Arabadji
replaced [NAME] with [NAME_SLURL] in friendship offer notification; --HG-- branch : product-engine
2010-04-01Merge from default branchMike Antipov
--HG-- branch : product-engine
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 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-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-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