Age | Commit message (Collapse) | Author |
|
|
|
|
|
There was a typo between the files saved and those loaded.
saved in sobjects_gridx_gridy.slc bload loaded from objects_gridx_gridy.slc
Q will review later ;-)
|
|
|
|
|
|
|
|
|
|
Reason:
Check menu items (instances of LLMenuItemCheckGL) had used LLUICtrl::getValue() to know whether they should draw the checkmark.
Recently this was broken when getValue() was overriden in LLMenuItemCallGL to return a string.
Fix:
Overriden getValue() in LLMenuItemCheckGL to return a boolean value, not a string.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/821/
--HG--
branch : product-engine
|
|
(plus many dupes).
Enough seesawing, I hope - see WEB-1819 for discussion and the nature of the compromise.
Patch by Kitty Barnett, reviewed by my.
|
|
|
|
|
|
|
|
|
|
Restored a part of my fix that was somewhy reverted by Eli in rev. 0d364d4ddd91.
--HG--
branch : product-engine
|
|
I'm actually restoring a part of the fix that was previosly committed in 75a1d14d6cc5 and then somewhy reverted in 0d364d4ddd91.
Trivial change, not reviewed.
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
"Add More" panel.
Problem was caused by getting item's icon always with FALSE value of item_is_multi argument in LLPanelInventoryListItemBase::postBuild().
- Used II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS flag to determine whether item is multiobject and getting appropriate icon.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/812/
--HG--
branch : product-engine
|
|
|
|
Reason:
When you click on a clothing link in COF, LLAppearanceMgr::wearItemOnAvatar() removes
all COF links of the clicked wearable type -- thus invalidating all previously
obtained LLViewerInventoryItems for those links -- and then passes such an
invalid item (item_to_wear) to addCOFItemLink() which of course crashes.
Fix:
1. Handle this case in wearItemOnAvatar(): don't try wearing COF items.
2. Disable the Wear button in the inventory SP when a COF item is selected.
3. Fixed get_can_item_be_worn() to return FALSE for items which are in COF or have links in COF.
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/811/
--HG--
branch : product-engine
|
|
untranslated in the French viewer)
- Added 'name' attribute for untranslated panel in EN and all other locales
Reviewed by Mike Antipov and Vadim Savchuk at https://codereview.productengine.com/secondlife/r/808/
--HG--
branch : product-engine
|
|
French Group Profile (roles and powers))
Added translation of folders to the strings.xml
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/810/
--HG--
branch : product-engine
|
|
|
|
|
|
|
|
|
|
region coordinates)
Reviewed by PB
|
|
Library items have "Share" disabled.
|
|
for it in right-click menus
Changed logic so that the menu is post-processed and, at that time, nooptions is added if the menu is seen to be empty.
|
|
- 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
|
|
--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
|
|
|
|
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
|
|
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
|
|
|
|
|
|
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
|