Roxie Linden
8ba5517a08
Automated merge
2010-04-07 13:20:33 -07:00
Roxie Linden
658ccc3e85
Re-insert backed out SLE checkin so we can fix it
2010-04-07 11:08:04 -07:00
Vadim Savchuk
bb2a0adeca
Merge from default branch
...
--HG--
branch : product-engine
2010-04-07 18:39:29 +03:00
Yuri Chebotarev
d623030d2b
fix for EXT-6619 "i" icon appears on top of accordion title in the Group Info panel
...
https://codereview.productengine.com/secondlife/r/190/
reviewed mantipov
--HG--
branch : product-engine
2010-04-07 17:35:21 +03:00
Tofu Linden
adce2ecdf8
PE merge from pe-viewer-trunk
2010-04-07 13:03:35 +01:00
Tofu Linden
8da371b0f0
merge
2010-04-07 12:16:36 +01:00
Tofu Linden
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
Vadim Savchuk
4a997e9627
Merge from default branch
...
--HG--
branch : product-engine
2010-04-06 17:17:33 +03:00
Eugene Mutavchi
cf94709c60
Fixed normal bug EXT-6348 (SLapp world map location does not display the correct region) - fixed displaying the world map location for escaped SLapp urls.
...
Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/173/ .
--HG--
branch : product-engine
2010-04-02 19:53:19 +03:00
Eugene Mutavchi
d7579203c0
Partial fix for reopened EXT-6357 (SLapp for object chat does display an inspector) - changed the order of registering SLURLs so the LLUrlEntryObjectIM will be handled before LLUrlEntryPlace.
...
Reviewed by Vadim Savchuk.
--HG--
branch : product-engine
2010-04-02 19:27:27 +03:00
Vadim Savchuk
7d38dd51c2
Manual merge from default branch.
...
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357.
--HG--
branch : product-engine
2010-04-02 17:18:36 +03:00
Tofu Linden
e46f128d20
PE merge
2010-04-02 12:35:24 +01:00
Eugene Mutavchi
32283a93e0
Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) - added new LLUrlEntry to support 'secondlife:///app/objectim/{UUID}/' SLapps. Fixed passing the SLURL to inspect_remote_object floater.
...
Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/158/
--HG--
branch : product-engine
2010-04-02 13:36:58 +03:00
Roxie Linden
9523c70f9d
DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
...
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-02 02:03:21 -07:00
Roxie Linden
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
Richard Linden
18d9efff12
another fix for bad merge
2010-04-01 16:43:58 -07:00
Richard Linden
a9b806071a
fix for bad merge
2010-04-01 16:41:45 -07:00
Richard Linden
be16153af8
added newline at eof
2010-04-01 16:19:03 -07:00
Richard Linden
f252d0d1a0
merge
2010-04-01 15:51:24 -07:00
Richard Linden
dcc5e0a4fa
EXT-3531 - Ctrl-p doesn't work reliably on login
...
moved gEditMenuHandler handling to LLEditMenuHandler destructor
2010-04-01 15:48:56 -07:00
Richard Linden
39ef9e9dd6
EXT-6492 - button halign=center doesn't take into account left and right pad
2010-04-01 14:56:53 -07:00
Richard Linden
2be2fdca5c
EXT-3606 - Script editor window: next line not indenting if current line wraps
2010-04-01 14:08:49 -07:00
Richard Nelson
6cc65f9e5f
merge
2010-04-01 12:52:04 -07:00
Richard Linden
406b595e8c
fixed build
2010-04-01 11:51:06 -07:00
Richard Nelson
7b4046df83
EXT-3531 - Ctrl-P does not work reliably on login
2010-04-01 11:47:21 -07:00
Dmitry Zaporozhan
08a2242ceb
Fixed windows build
...
--HG--
branch : product-engine
2010-04-01 18:20:34 +03:00
Dmitry Zaporozhan
3c036ef49b
(work in progress) EXT-6564(major) - Fix wearable editing panels
...
Fixed Edit Shape panel layout:
- fixed widget positioning according to spec
- added gear button bar
- fixed accordion positioning
- fixed parameter list positioning
TODO:
- fix parameter panel positioning
- apply changes to the rest of wearable panels
Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/149/
--HG--
branch : product-engine
2010-04-01 17:41:47 +03:00
Dmitry Zaporozhan
7b0dab5083
(work in progress) Update for LLAccordionCtrl arrange single expansion.
...
Found this issue while working on EXT-6564(Fix wearable editing panels) - Every single_expansion accordion is treated like "fit_parent" is set to "true" after changes made in 9805 : e6c5f3b23be1 (fix for EXT-5128 Groups accordions should all appear on-screen w/out scrolling (open accordion should fill space)).
Updated accordion to take into account "fit_parent" property.
Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/147/
--HG--
branch : product-engine
2010-04-01 17:28:36 +03:00
Alexei Arabadji
4992eaf27d
fixed EXT-2801 Record "object return" notification into IM history, not chat 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-01 15:24:36 +03:00
Eugene Mutavchi
7f38ea1474
Fixed normal bug EXT-6659("Ctrl+A" combination allows selecting of several picks) - added check that multiple selection is allowed
...
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/146/
--HG--
branch : product-engine
2010-04-01 11:32:51 +03:00
Mike Antipov
bba457e889
Merge from default branch
...
--HG--
branch : product-engine
2010-03-31 10:08:50 +03:00
Loren Shih
909091cc0c
EXT-3415 : INFRASTRUCTURE : Move LLInventoryCollectFunctors to separate class
...
Moved all the LLInventoryModelCOllectFunctors from LLInventoryModel to LLInventoryFunctions
2010-03-30 15:56:15 -04:00
Vadim Savchuk
3e23c04c9b
Merge from default branch
...
--HG--
branch : product-engine
2010-03-30 18:19:56 +03:00
Roxie Linden
86dc5bce1a
Automated merge
2010-03-29 16:24:58 -07:00
Loren Shih
114e5ca083
EXT-5940 : Typedef all vector<LLUUID>'s
...
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
Loren Shih
b1b5a11bb0
EXT-3075 : Remove swear words from comments across viewer
...
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2010-03-29 15:33:48 -04:00
Richard Linden
b69a454aab
merge
2010-04-08 16:43:48 -07:00
Richard Linden
70bbcf7c2d
EXT-5849 - crash in LLView::drawChildren()
...
added logging to help track down cause
2010-04-08 16:41:56 -07:00
Tofu Linden
7857f59f9e
merge from viewer-2-0
2010-03-24 10:32:38 +00:00
Richard Linden
e3e50bf7ed
added some comments for fix to EXT-5549
2010-03-23 12:47:11 -07:00
Richard Nelson
07bc1f0ba5
fixed line ending style where I copied from araxis merge window
2010-03-23 11:22:46 -07:00
Richard Nelson
91b90b0a17
EXT-5549 Can't select last character in chat window
2010-03-23 11:18:01 -07:00
Tofu Linden
e7d9999359
Merge from viewer-2-0
2010-03-23 14:08:11 +00:00
Dmitry Zaporozhan
9ff6b6ecd1
Fixed low bug EXT-6444 - Long notecard titles continue under Locked and Help icons on title bar.
...
Changed the way floater title is reshaped. Calculations takes title buttons into account instead of using hardcoded values.
--HG--
branch : product-engine
2010-03-25 15:48:08 +02:00
Vadim Savchuk
d3a606f832
Manual merge from default branch.
...
Resolved conflicts in llpanellandmarks.cpp.
--HG--
branch : product-engine
2010-03-24 18:04:26 +02:00
Sergei Litovchuk
ae9e68f251
Fixed normal bug (EXT-6340) Crash when attempting to getChild<LLAccordionCtrlTab>("accordion_tab_name") and "accordion_tab_name" is not found.
...
- Added NULL pointer checks.
--HG--
branch : product-engine
2010-03-23 21:33:09 +02:00
Igor Borovkov
60d680f2eb
fixed EXT-4753 Just arrived avatars aren't sorted by name in VCP
...
added requesting a list to resort when avatar list item gets updated with avatar name from the name cache
--HG--
branch : product-engine
2010-03-23 16:13:59 +02:00
Paul Guslisty
eb119c2268
Fixed low bug EXT-4081 (Lag Meter: Ctrl+W does not close floater)
...
- Set 'Close' text of tooltip instead of 'Close (Ctrl+W)' for close button of chrome floaters
Reviewed by Mike Antipov
--HG--
branch : product-engine
2010-03-23 14:09:38 +02:00
Roxie Linden
18b7ab0018
Weekly automated merge from viewer 2.0
2010-03-22 16:12:41 -07:00
Yuri Chebotarev
6efbbfa080
fix for EXT-4288 Shrinking chat history window from top doesn't keep scroll thumb at bottom
...
--HG--
branch : product-engine
2010-03-22 15:35:34 +02:00
Vadim Savchuk
0f620c1001
Fixed bug EXT-5695 (Tabbed IM window loses focus if close any tab by Ctrl+W)
...
Submitting on behalf of Paul Guslisty.
Reviewed by Mike: https://codereview.productengine.com/secondlife/r/66/
--HG--
branch : product-engine
2010-03-19 20:53:38 +02:00
Dmitry Zaporozhan
a2150863f9
Updated normal task EXT-5905 - Resolving offers.
...
Reusable notifications are deleted when user closes IM floater(old - when user closes Viewer).
--HG--
branch : product-engine
2010-03-19 17:18:53 +02:00
Dmitry Zaporozhan
97a35b4875
Merged with viewer-offers
...
--HG--
branch : product-engine
2010-03-19 15:30:02 +02:00
Kent Quirk
a072b63f41
Merge of PE merge with extra head
2010-03-18 23:44:30 -04:00
Kent Quirk
7b76906595
Restore function lost in bad merge.
2010-03-18 19:47:09 -04:00
Kent Quirk
63a0e89fb5
merge from hotfix to viewer-2-0 and resolve conflicts
2010-03-18 16:53:41 -04:00
Igor Borovkov
095cd1b639
fixed EXT-6092 [crashhunters] Crash in LLFlatListView::selectItemPair
...
turned off commit on focus lost for the filter editor (Panel Places) in the code
Reviewed by Mike at https://codereview.productengine.com/secondlife/r/63/
--HG--
branch : product-engine
2010-03-18 17:45:35 +02:00
Vadim Savchuk
3a1400015a
Merge from default branch
...
--HG--
branch : product-engine
2010-03-18 15:17:49 +02:00
Richard Nelson
19034f5cd7
merge
2010-03-17 17:48:11 -07:00
Richard Nelson
121114f934
EXT-6402 - Add support for enable/disable of Plugins (Flash) within WebKit to Viewer Prefs
...
had to fix how radio groups bind to saved settings to support changing radio item order
tested all existing radio groups bound to a saved setting
reviewed by Callum
2010-03-17 17:46:15 -07:00
Sergei Litovchuk
729f880f78
[SHOWSTOPPER] Fix for (EXT-4704) Add maturity icons to Prefs -> General and (EXT-4705) Show maturity icon on Region/Estate tab.
...
- Made changes to combobox onItemSelected() to fix (EXT-6269) typing a location into the nav bar always sends you to the first location you typed in.
- Replaced LLIconsComboBox pointers with base class pointers LLComboBox.
Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/29/
--HG--
branch : product-engine
2010-03-18 00:53:32 +02:00
Lynx Linden
509457b8ef
EXT-6335: Add custom labels for specific agent SLapp commands.
...
We now display custom labels and tooltips for the various
secondlife:///app/agent SLapp suffixes that we support. These include:
/mute, /unmute, /pay, /im, /offerteleport, and /requestfriend. For
example, entering:
secondlife:///app/agent/3e2d81e8-6269-8100-860e-c64e5cee3c2c/mute
Now displays the SLapp in text chat as "Mute <Name>", rather than
simply "<Name>".
2010-03-17 15:13:08 +00:00
Richard Linden
b37a1a54fa
turning view deletion spam into a lldebugs
2010-03-16 17:48:29 -07:00
Roxie Linden
60c4621500
Automated merge from viewer/viewer-2-0
2010-03-16 12:33:25 -07:00
Dmitry Zaporozhan
97dea26dfc
Updated normal task EXT-5905 - Resolving offers.
...
Implemented requested feature - "Resolving offer in the notification toast shouldn't remove offer panel form IM log until IM session is restarted"
--HG--
branch : product-engine
2010-03-16 15:30:01 +02:00
Alexei Arabadji
3874823bd8
Merge from viewer-2-0
...
--HG--
branch : product-engine
2010-03-16 15:02:58 +02:00
Dmitry Zaporozhan
fee3752311
Implemented normal task EXT-5905 - Resolving offers.
...
Added functionality to make Toasts accept multiple user inputs(clicks on option buttons).
--HG--
branch : product-engine
2010-03-15 18:06:04 +02:00
angela
3298ab474e
fix line ending in file llfloater.cpp
2010-03-11 17:35:46 +08:00
angela
fe8304ff49
merge
2010-03-11 14:10:37 +08:00
Monroe Linden
070cb57ae1
merge for backout.
2010-03-12 12:14:52 -08:00
Monroe Linden
7ac2427b57
Backed out changeset 6fdd352b80d6
...
We thought this was a fix for EXT-6276, but it turned out it was just moving the problem.
2010-03-12 12:14:35 -08:00
Dave Parks
4c8ae214b3
Didn't mean to check in with these lines commented out.
2010-03-12 14:11:08 -06:00
Dave Parks
d2996b6859
EXT-6276 Fix for UI going all wonky.
2010-03-12 13:17:30 -06:00
Dave Parks
58afe469f9
Bizarrely hacky fix for EXT-6276 (#if LL_DARWIN out copyFromPrimarySubstring)
...
General gl state cleanup in llui.
Make llrender more gGL.begin/end friendly.
2010-03-12 13:01:50 -06:00
Richard Nelson
dcbf0ab31b
merge
2010-03-10 18:22:26 -08:00
Richard Nelson
1e5fe95b1d
EXT-6295 - Cannot log in with new account, TOS dialog does not load
...
reviewed by Mani
2010-03-10 18:20:18 -08:00
Monroe Linden
347585cf97
Fix for EXT-6276.
...
Added a check in LLTextBase::drawSelectionBackground() to keep it from sending degenerate rectangles to gl_rect_2d(). This seems to be what was causing the GL state to go bad.
Reviewed by Richard at http://codereview.lindenlab.com/534001
2010-03-10 14:32:40 -08:00
Vadim Savchuk
cbbddc8eaa
Merge from default branch
...
--HG--
branch : product-engine
2010-03-09 19:43:11 +02:00
Igor Borovkov
a4ebe8b9d5
possible defensive fix for EXT-6092 [crashhunters] Crash in LLFlatListView::selectItemPair, bug reason is unknown
...
--HG--
branch : product-engine
2010-03-09 15:34:09 +02:00
angela
0fe35e068f
EXT-4684 Beacons are not shown when beacons floater is minimized
2010-03-09 15:59:27 +08:00
Roxie Linden
20379fecd9
automated merge
2010-03-08 21:39:38 -08:00
Tofu Linden
0775e91901
PE merge.
2010-03-07 15:27:17 +00:00
Richard Linden
4ada9e7f15
fix
2010-03-05 18:19:29 -08:00
Richard Linden
7cea645ba2
added some logging to help track down crash in EXT-5849
2010-03-05 17:38:21 -08:00
Sergei Litovchuk
f499260782
Implemented (EXT-4715) Add maturity icons to Classifieds - create and details.
...
--HG--
branch : product-engine
2010-03-06 01:17:34 +02:00
Richard Linden
76f6dba9e4
fixed bad merge
2010-03-09 12:27:41 -08:00
Richard Linden
b51515100c
rolled back changeset 5fbab7aa32ef to fix EXT-6269
2010-03-09 12:16:44 -08:00
Richard Linden
931ff555bd
merge
2010-03-05 14:46:00 -08:00
Sergei Litovchuk
a8e1c2ed13
Implemented (EXT-4705) Show maturity icon on Region/Estate tab.
...
- Added LLIconsComboBox class - a combobox with icons for maturity ratings.
- Fixed scroll list maximum width calculation. The width was calculated based on text value width for non-text columns.
- Added image overlay alignment getter method to LLButton.
--HG--
branch : product-engine
2010-03-05 15:41:25 +02:00
Richard Nelson
485711e179
removed extraneous updateBoundingRect() calls
...
remove the login progress panel as a popup only after it has finished fading out
popupview manages it's own registering and unregistering of popup callbacks
2010-03-04 16:35:52 -08:00
Mike Antipov
da50434ada
Merge backed out revision
...
--HG--
branch : product-engine
2010-03-04 16:22:55 +02:00
Mike Antipov
ce27036017
Backed out changeset: 0160afd678a5
...
Implemented solution fixed bug caused by changes made for EXT-3852 (07f21c92896f & 07f21c92896f).
For now previous changes for EXT-3852 are reverted.
So, changes for EXT-4572 (Click and hold the left mouse button doesn't let you browse tabbed IM floater) are unnecessary.
--HG--
branch : product-engine
2010-03-04 16:22:31 +02:00
Richard Linden
69f9c0bcf9
WIP - replace top ctrl with LLPopupView
2010-03-03 19:37:41 -08:00
Vadim Savchuk
dbdf02cc0d
Additional commit for EXT-4574 ([BSI] Unhelpful tooltip for Partner and Group links in Profile).
...
Fixed tooltip for agent SLURLs.
--HG--
branch : product-engine
2010-03-03 16:42:05 +02:00
Vadim Savchuk
f75f19be93
Fixed bug EXT-4574 ([BSI] Unhelpful tooltip for Partner and Group links in Profile).
...
For wiki-style links ([<URL> <label>]) we now show the tooltip corresponding to the URL type.
--HG--
branch : product-engine
2010-03-03 16:40:38 +02:00
Ychebotarev ProductEngine
1eb84f5e13
fix EXT-5652 Make accordion in the Group Info panel a little bit wider in order to avoid horizontal scroll
...
--HG--
branch : product-engine
2010-03-03 11:51:15 +02:00
Ychebotarev ProductEngine
c624848d25
fix for low EXT-5327 Add an ability to open accordions by "Enter" button, like folders' behavior
...
--HG--
branch : product-engine
2010-03-03 11:49:27 +02:00
Ychebotarev ProductEngine
0f04222acc
fix for normal EXT-1391 Group Info: Avatar name should end with ellipsis if it doesn't fit free space
...
--HG--
branch : product-engine
2010-03-03 11:43:48 +02:00
Ychebotarev ProductEngine
cdb0911a78
fix for EXT-4469 Fast Timers: Minimize and Close icons do not work
...
--HG--
branch : product-engine
2010-03-03 11:39:45 +02:00
Paul Guslisty
9272037c9d
Fixed normal bug EXT - 4572 (Click and hold the left mouse button doesn't let you browse tabbed IM floater)
...
- Set mouse capture to the tab container in case of some control \"grab\" it during mouse hovering over tab container.
--HG--
branch : product-engine
2010-03-03 09:47:58 +02:00
Richard Nelson
41a30a59fb
initial work changing topctrl to popup layer
2010-03-02 14:21:58 -08:00
Tofu Linden
d1d195ba90
CID-433
...
Checker: FORWARD_NULL
Function: LLTabContainer::reshapeTuple(LLTabTuple *)
File: /indra/llui/lltabcontainer.cpp
2010-03-02 09:58:34 +00:00
Vadim Savchuk
a325df0898
Fixed bug EXT-5580 (Characters in Inventory Filter appear behind X).
...
Added configurable text right padding support to search_filter:
* When the Clear button is enabled
(i.e. search_editor.clear_button_visible set to "true")
the search_editor.clear_button.pad_left parameter determines the padding.
* Otherwise search_editor.text_pad_right is used.
--HG--
branch : product-engine
2010-02-25 19:39:16 +02:00
Mike Antipov
08ede585ce
Work on major bug EXT-5589 (Notifications button falls under side panel)
...
-- updated LLLayoutStack to process "max_width" & "max_height" attributes for layout_panel.
--HG--
branch : product-engine
2010-02-24 17:13:56 +02:00
Vadim Savchuk
1ef3fed827
Merge from default branch
...
--HG--
branch : product-engine
2010-02-24 14:02:51 +02:00
Alexei Arabadji
d7945e5d31
implemented EXT-4641 “[BSI] Undocked camera and movement floaters position should persist across the sessions”,
...
made move and camera floaters save dock state;
--HG--
branch : product-engine
2010-02-24 12:43:27 +02:00
Tofu Linden
a7bca7055a
PE merge. Conflict resolved.
2010-02-24 08:57:27 +00:00
Paul Guslisty
1d45b1edcd
Fixed normal but EXT - 5108 (Preferences vertical tabs don't align to tab container)
...
- Added offset in TabContainer between Tab and TabPanel in case of VERTICAL Tabs orientation.
--HG--
branch : product-engine
2010-02-24 10:16:35 +02:00
Ychebotarev ProductEngine
1bd720eefb
cleanup and fix build
...
--HG--
branch : product-engine
2010-02-23 18:45:51 +02:00
Ychebotarev ProductEngine
a8165dfe59
fix for normal EXT-5598 Group member status list is sorted by name instead of date
...
--HG--
branch : product-engine
2010-02-23 18:05:00 +02:00
Vadim Savchuk
44333983a6
Merge from default branch
...
--HG--
branch : product-engine
2010-02-23 12:59:49 +02:00
Paul Guslisty
b9ed402558
Fxed normal bug EXT - 5465 (Invalid ellipsis usage for resident names in the IM tabs)
...
- Added reshaping procedure for tabs with LLIconCtrl
--HG--
branch : product-engine
2010-02-23 09:45:16 +02:00
Andrew Dyukov
16b284971e
Fixed normal bug EXT-4964 (Invalid SLURL detection does not detect invalid slurls).
...
- Added new static method LLSLURL::isValidSLURL() whic uses LLUrlRegistry::isUrl() to validate SLURLs and not just chek prefixes as LLSLURL::isSLURL() does.
- Used it in slurl DnD check in LLViewerWindow.
- LLUrlEntrySLURL regexp was changed not to pass non-valid SLURLS (such as one from the bug description).
--HG--
branch : product-engine
2010-02-22 19:22:43 +02:00
Tofu Linden
315c0021f0
remove dos line endings...
2010-02-22 15:06:06 +00:00
Vadim Savchuk
3759c382d4
merge
...
--HG--
branch : product-engine
2010-02-22 15:16:06 +02:00
Ychebotarev ProductEngine
6f98e0b972
fix for EXT-5128 Groups accordions should all appear on-screen w/out scrolling (open accordion should fill space)
...
fix is not complete since we got horizontal scrolbar which I think is not intended...need to fix croll_container.
--HG--
branch : product-engine
2010-02-22 13:58:00 +02:00
Kent Quirk
64530c24c8
merge latest tweaks to viewer-hotfix; resolved conflict in llsearcheditor in favor of the one that does less processing
2010-02-20 15:04:21 -05:00
Kent Quirk
36f708de17
EXT-5560 - filter clear button was calling doDelete which had many more gyrations than onCommit, and only onCommit was needed
2010-02-20 14:41:18 -05:00
Kent Quirk
1d89f02243
EXT-4878 - fixing the fix - incorrect name used for attribute.
2010-02-20 13:07:03 -05:00
Mike Antipov
3fb3b9cf21
Merge from default branch
...
--HG--
branch : product-engine
2010-02-19 11:12:38 +02:00
Monroe Linden
e0efa1dfa2
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
2010-02-18 15:48:56 -08:00
Monroe Linden
ef9b7c5b36
Fix for EXT-5120 "Mouse-up in the scrollbar to the right of a link in nearby chat window opens the link".
...
Added an optional bool parameter "hit_past_end_of_line" to LLTextBase:: getDocIndexFromLocalCoord() and getSegmentAtLocalPos(). Default is true, which gives the old behavior. If false, clicks past the end-of-line won't map to the last segment on the line.
Made LLNormalTextSegment::handleHover(), handleRightMouseDown(), handleMouseDown(), and handleMouseUp() call getSegmentAtLocalPos() in this new mode before processing URL actions, and only do the processing if it returns the same segment.
Reviewed by Richard.
2010-02-18 15:45:31 -08:00
Monroe Linden
890ec637d4
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
2010-02-18 15:22:10 -08:00
richard
1d1e4c7abe
merge
2010-02-18 14:09:55 -08:00
richard
7ed47f7225
fixed line endings
2010-02-18 13:58:57 -08:00
richard
9c2559924c
merge
2010-02-18 13:32:15 -08:00
richard
876a764c4f
EXT-5535 - Resize handles will move floater when reaching minimum size
2010-02-18 12:49:31 -08:00
Leyla Farazha
4ab945c9f0
Merge - updating from hotfix
2010-02-18 10:59:09 -08:00
Leyla Farazha
2231da11dd
EXT-4677 Crash when closing pinned menu which has no parent Inventory floater
...
Reviewed by Richard CC#118
2010-02-18 10:52:34 -08:00
richard
4175268172
Merge
2010-02-18 10:32:52 -08:00
richard
4514b57126
Backed out changeset: 744bd7c535fa
2010-02-18 10:29:56 -08:00
Dmitry Zaporozhan
2cf2fa6ad2
Fixed low bug EXT-5225 - Local chat doesn't go translucent when loses focus.
...
Added customizable background image overlay color to control background transparency. Default overlay color is White, as before.
--HG--
branch : product-engine
2010-02-18 18:28:13 +02:00
Alexei Arabadji
eec9f20d74
fixed EXT-5006 “One inventory offer cause blinking of both Conversations and
...
Notifications wells”,
embedded inventory offer panel into IM window;
--HG--
branch : product-engine
2010-02-18 16:05:11 +02:00
Vadim Savchuk
f33a1d7ad9
merge
...
--HG--
branch : product-engine
2010-02-18 15:45:48 +02:00
Dmitry Zaporozhan
25800b4b37
Fixed normal bug EXT-5468 - Lists from people panel are not refreshed after filter field has been reseted by (x).
...
--HG--
branch : product-engine
2010-02-18 14:43:46 +02:00
Tofu Linden
d1f4840705
PE merge.
2010-02-18 10:02:41 +00:00
Paul Guslisty
f4703f55eb
Fixed critical bug EXT - 4878 (Tab labels are no longer obeying halign attribute)
2010-02-18 11:36:19 +02:00
Paul Guslisty
bf668d4a18
Fixed critical bug EXT - 4878 (Tab labels are no longer obeying halign attribute)
...
--HG--
branch : product-engine
2010-02-18 11:36:19 +02:00
Richard Linden
b1dd2f3099
EXT-5515 - Allow resizing on left and lower left of nearby media popup
2010-02-17 22:22:14 -08:00
Monroe Linden
3e8320201f
Partial fix for EXT-5071.
...
Changed the index on the keyword map in LLKeywords so that LLKeywords::findSegments() doesn't have to create LLWString objects to search the map.
Reviewed by Richard.
2010-02-17 18:18:18 -08:00
Palmer
e938d055f4
EXT-5309 : prevent infinite loop in LLConsole. Reviewed by Richard
2010-02-17 17:06:36 -08:00
Dmitry Zaporozhan
619415a99a
Moved shadow drawing code from draw to separate function(drawShadow) to make this code reusable.
...
--HG--
branch : product-engine
2010-02-17 15:32:00 +02:00
Kent Quirk
e3a71c74e2
automated merge from viewer-2-0
2010-02-16 23:36:54 -05:00
richard
69032d8d9d
EXT-5071 - Script Editor slows down FPS when editing scripts with 500+ lines
...
reviewed by Monroe
2010-02-16 19:14:55 -08:00
Rick Pasetto
204ff1edd9
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
2010-02-16 15:54:32 -08:00
richard
1513643e62
EXT-5471 - Tons of spam in log about Invalid param "name"
...
reviewed by Rick
2010-02-16 15:45:17 -08:00
Rick Pasetto
4dfed6e353
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
2010-02-16 15:43:11 -08:00
Vadim Savchuk
a301ad63c2
Fixed bug EXT-5290 (TP failed if try to teleport from 'Teleport completed from...' toast).
...
Reason: LLUrlEntrySLURL::getLocation() failed to parse maps.secondlife.com SLURLs (though worked fine for slurl.com ones).
--HG--
branch : product-engine
2010-02-16 17:58:41 +02:00
Tofu Linden
398af7dd40
CID-34
...
Checker: DEADCODE
Function: LLDockableFloater::toggleInstance(const LLSD &)
File: /indra/llui/lldockablefloater.cpp
bool logic precendence assumptions were wrong.
2010-02-15 18:06:49 +00:00
Tofu Linden
eb1d043daf
CID-203
...
Checker: REVERSE_INULL
Function: LLTabContainer::addTabPanel(const LLTabContainer::TabPanelParams &)
File: /indra/llui/lltabcontainer.cpp
2010-02-13 14:13:06 +00:00