| Age | Commit message (Collapse) | Author |
|---|
|
--HG--
branch : product-engine
|
|
Bug was caused by multiobject's icon name index substitution with ordinary object's one. It happened because index was set depending on asset type in switch that followed "if" which set index for multiobject regardless of its result.
- Added returning index icon name inside of "if" block to avoid change of the index by switch for multiobject.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/804/
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
Resolved conflict in indra/newview/lloutfitslist.cpp to use changes from viewer-release.
Rejected changes in that file coming with 10f02c59761c (EXT-7015 FIXED Avoided wearing item moved to trash.) It will be refixed in a separate commit.
--HG--
branch : product-engine
|
|
Details:
Disabled wear button and hidden related context menu entries if base object of inventory link is in trash.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/806/
--HG--
branch : product-engine
|
|
|
|
|
|
|
|
|
|
|
|
|
|
region coordinates)
Reviewed by PB
|
|
Avatar links are now underlined only on hover. Also they have the same color as other links.
- Underlining text and getting it back to normal are done in handleHover() and draw() of new LLOnHoverChangeableTextSegment
class derived from LLNormalTextSegment. This class has two pointers to styles- one for style which will be used for text
on hover, and another otherwise. This special type of text segment is used if link's boolean member mUnderlineOnHoverOnly
is true. So it is URL's flag depending on which textbase adds new text segment(like it currently happens with mDisabledLink).
- Changed avatar link color in colors.xml to emphasis (because it was white before and was inconsistent with other links).
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/749/
--HG--
branch : product-engine
|
|
- Added wrap=\"true\" for text boxes in which truncation occurs and increased their height to contain another one line
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/802/
--HG--
branch : product-engine
|
|
Bug was caused by multiobject's icon name index substitution with ordinary object's one. It happened because index was set depending on asset type in switch that followed "if" which set index for multiobject regardless of its result.
- Added returning index icon name inside of "if" block to avoid change of the index by switch for multiobject.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/804/
--HG--
branch : product-engine
|
|
submenu and made invisible.
(invisible - because it is still located in menu it toggles)
Note: We can not completely remove this menu item to keep hot key workable.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/803/
--HG--
branch : product-engine
|
|
gear menu mutually exclusive.
Root cause:
==========
The same menu is used to be shown as context and gear menus.
But visibility of context Folder View's menu is processed in a separate way. So, once visibility of menu items is changed in context menu - it is unchanged in gear menu.
Also it was possible situation when both "Expand" and "Collapse" menu items were visible in gear menu (If it was opened before any context menu)
FIX:
===
Added "on_visible" callbacks for "Expand" and "Collapse" menu items to set proper visibility in "gear" menu.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/801/
--HG--
branch : product-engine
|
|
- Added displaying error messages in Create Landmark panel upon remote parcel request fail.
- Moved landmark creation from LLPanelLandmarkInfo::processParcelInfo() because we use only agent's current coordinates instead of waiting for remote parcel request to complete.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/793/.
--HG--
branch : product-engine
|
|
|
|
|
|
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
after add/replace)
- Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel
- Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab.
Reviewed by Mike Antipov, Neal Orman and Richard Nelson at https://codereview.productengine.com/secondlife/r/790/
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
|
|
|
|
the MultiByteToWideChar to get length of output string.
Assumprion is: wide char buffer requires not more than input string length plus one for a null terminator.
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/
--HG--
branch : product-engine
|
|
Details:
1 Updated condition is item can be worn considering situation when item is copied in COF but is not worn.
2 Avoided code duplication in method LLOutfitsList::canWearSelected()
reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/785/
--HG--
branch : product-engine
|
|
machine id when not so reported id stays consistent with prior versions most of the time.
|
|
|
|
|
|
|
|
--HG--
branch : product-engine
|
|
status.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/792/
--HG--
branch : product-engine
|
|
selected.
- Fixed condition for enabling the Wear button in My Outfits.
- The button was always enabled when when COF change completes, I fixed that as well.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/800/
--HG--
branch : product-engine
|
|
only General tab is visible.
Also fixed name of accordion in code to be consistent with xml.
Replaced findChild with getChild (when getting accordion and its tabs) to avoid extra checks against NULL of returned pointers
and have warnings in log is xml is not consistent with code.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/798/
--HG--
branch : product-engine
|
|
items/folders.
"New Note" should be translated on other languages in strings.xml
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/795/
--HG--
branch : product-engine
|
|
|
|
'Sit' entries.
Details:
1 Provided using Object.EnableSit and Object.EnableTouch callbacks for both object menu and inspector gear menu. Now default menu item label stores in
hash map and since callback receives triggered control no need to hardcode updating menu item labels from callback.
2 Removed redundant attribute 'parameter' from menu xml's since now handler callbacks receives triggered menu item as function parameter.
3 Replaced LLObjectEnableTouch class with enable_object_touch function, since there no need on triggering callback on menu commit event.
4 Added symmetric method LLMenuItemGL::getValue().
5 Removed unused "Object.EnableGearSit" callback.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/774/
--HG--
branch : product-engine
|
|
|
|
--HG--
branch : product-engine
|
|
(on Windows) before converting it to LLWString.
Problem on Windows:
==================
LLPanelMainInventory::updateItemcountText() formats number using viewer locale.
non-break space is detected as unknown symbols while converting utf8str_to_wstring when formatted text is set to LLTextBox.
FIX:
===
Added converting of string to multi-byte string and then to utf8 string while formatting on Windows.
created opposite to "ll_convert_wide_to_string" function "ll_convert_string_to_wide" and helper function to call both of them.
It is used now to convert result of formatted string while formatting integer number in locale.
Fix affects Windows only.
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/
--HG--
branch : product-engine
|
|
|
|
windows (no dependency on Netbios).
|
|
|
|
Whatever will I do if I can no longer merge in the indra codebase?
What has my life come to?
Without merging, who am I?
Why am I here?
I like cupcakes.
Merging makes me feel complete.
Like doing something without really doing something.
I say merge, and it merges.
I like not having to do three way diffs, but still claim I'm merging.
Three way merging is no fun.
You're still reading this.
You deserve a cupcake.
You read checkins. You're special. You're either dessie, erica, or brad.
I'll miss you guys.
Keep them doggies mergin.
|
|
Reviewed by Bao and Babbage
|
|
Cropping was caused by drawing separator over bottom part of the item (including selection).
- Moved separator under the item- not inside of it. This way item and selection are not cropped. The only requirement for using lists that consist of items with separators is that their item_pad attritubute is >= height of separator.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/780/
--HG--
branch : product-engine
|
|
after reshape.
Bug was reproducible on Windows and not on Linux because of different moment when onTopLost() was called for textbox.
On Windows it happened only after reshape, on Linux- before reshape. Made windows behaviour in case of top lost consistent with Linux behaviour.
- An if was added into LLPanelPlaceInfo::reshape to force collapsing description textbox on Windows at the beginning of reshape
(the only case when reshape is skipped there now is when it's caused by expanding/collapsing this textbox, so called_from_parent for panel is FALSE).
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/779
--HG--
branch : product-engine
|
|
|
