summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
AgeCommit message (Collapse)Author
2010-04-07automated mergeLoren Shih
2010-04-07PE merge from pe-viewer-trunkTofu Linden
2010-04-07mergeTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
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-06Merge from default branchVadim Savchuk
--HG-- branch : product-engine
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-02Manual merge from default branch.Vadim Savchuk
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357. --HG-- branch : product-engine
2010-04-02Fixed major bug EXT-6595 (World->Place Profile flyout menu doesn't include ↵Vadim Savchuk
link to side panel place info). Added a new main menu item: World -> Place Profile -> Place Profile. I'm not sure about its label though (double "Place Profile"). Reviewed by Sam: https://codereview.productengine.com/secondlife/r/161/ --HG-- branch : product-engine
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-01mergeRichard Nelson
2010-04-01EXT-3531 - Ctrl-P does not work reliably on loginRichard Nelson
2010-03-31EXT-6666 : Enable debug avatar textures in God, versus non-Release, modeLoren Shih
2010-03-30EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate classLoren Shih
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-29MergeLoren Shih
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-29For EXT-4666: changed LLAppearanceManager to LLAppearanceMgr throughoutBrad Payne (Vir Linden)
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-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-25EXT-2959 : Pull out camera functions from llagent to llagentcameraLoren Shih
#3 checkin. Took out llagent "friend llagentcamera" and added accessors instead. Did some superficial formatting cleanup.
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-18Merge of PE merge with extra headKent Quirk
2010-03-18merge from hotfix to viewer-2-0 and resolve conflictsKent Quirk
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-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-10EXT-6295 - Cannot log in with new account, TOS dialog does not loadRichard Nelson
reviewed by Mani
2010-03-01Implemented major sub-task EXT-5722 (hard-coded: Right click on Object > Sit ↵Eugene Mutavchi
Here and Take are hard-coded) --HG-- branch : product-engine
2010-02-23Implemented major sub-task EXT-5556 (hard-coded: menu Build > Object > Take. ↵Eugene Mutavchi
The word "Take" is hard-coded) --HG-- branch : product-engine
2010-02-22Fixed normal bug EXT-4682 (Edit Linked Parts (from menu) appears to have no ↵Eugene Mutavchi
effect) --HG-- branch : product-engine
2010-02-16Fixed low priority bug EXT-5425 (Undocked 'Movement Controls' floater became ↵Vadim Savchuk
docked after opening from 'World' top menu). --HG-- branch : product-engine
2010-02-15CID-37Tofu Linden
Checker: DEADCODE Function: LLToolsSelectedScriptAction::handleEvent(const LLSD &) File: /indra/newview/llviewermenu.cpp
2010-02-15some const'ness for previous fixes.Tofu Linden
2010-02-15CID-133Tofu Linden
Checker: NULL_RETURNS Function: is_agent_mappable(const LLUUID &) File: /indra/newview/llviewermenu.cpp
2010-02-13CID-134Tofu Linden
Checker: NULL_RETURNS Function: LLToolsEnableUnlink::handleEvent(const LLSD &) File: /indra/newview/llviewermenu.cpp
2010-02-11EXT-5105 Incorrect keyboard shortcut for Inventory in main menuLoren Shih
EXT-5334 CTRL+SHIFT+I now brings up InventorySP instead of InventoryFloater Fixed a regression due to EXT-5105 where CTRL+SHIFT+I was bringing up the InventorySP instead of InventoryFloater. Note that this reverts some code checked in for EXT-5105 (i.e. it re-adds in some functions that were deleted). As a side bonus, now the Gestures CTRL+G menu option shows as being checked when the gestures floater is active.
2010-02-11EXT-5164 Me->My Inventory opens Inventory floater, not side panelangela
2010-02-09EXT-3071 : CTRL+I should bring up either inventorySP or inventory floaterLoren Shih
EXT-5239 : Consider removing CTRL+I to spawn multiple inventory windows BTEST-42 : Can't hide inventory by pressing CTRL+I CTRL+I will now either open the inventory sidepanel, or close the sidepanel.
2010-02-09EXT-4449 [BSI] Zoom In does not function properly on large or linked prim setsLeyla Farazha
reviewed by Richard CC#99
2010-02-04Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Lynx Linden
2010-02-03EXT-1560 VWR-11118 DEV-27362 Ctrl+Alt+Shift+H doesn't say hippos! anymoreSoft Linden
2010-02-03EXT-4898: Changed English language code to "en" on Mac.Lynx Linden
Now LLUI::getLanguage() returns a result that is consistent on Mac, Windows, and Linux. Also, cleaned up some legacy language code.
2010-01-29completely got rid of Communicate floater and stuffIgor Borovkov
--HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 14:15:47 +0000