Monroe Linden
68ea862c96
Fix for EXT-4943 (Text editor is broken).
...
Reviewed by Richard.
2010-02-05 15:51:49 -08:00
richard
7735ef557d
line ending conversion
2010-02-05 13:24:05 -08:00
richard
124d8e63f7
newlines fixed
2010-02-05 13:22:46 -08:00
richard
df3da77fa9
merge
2010-02-05 11:34:49 -08:00
richard
ddfc6efbee
EXT-5025 - Tooltips block mouse clicks
...
EXT-4547 [BSI] it is possible to highlight multiple layers of chat
EXT-3844 Mouse wheel camera zoom is not reflected on View popup slider
EXT-3103 Add an option to restrict entering non-ascii symbols in text editor.
reviewed by Leyla
2010-02-05 11:32:33 -08:00
Sergei Litovchuk
95147c4529
Implemented critical task (EXT-4703) Add maturity icons to the Viewer 2 toolbar.
...
- Added maturity icons to location bar.
- Added getting font used in LLLineEditor.
--HG--
branch : product-engine
2010-02-05 19:15:12 +02:00
Paul Guslisty
77b5a39cc1
Fixed normal bug EXT - 3232 (Make button image overlay placement adjustable via xml)
...
--HG--
branch : product-engine
2010-02-05 17:34:50 +02:00
Eugene Mutavchi
782cb6ee87
Fixed normal bug EXT-4702 (Elements of type context_menu cannot have font set in XUI xml)
...
--HG--
branch : product-engine
2010-02-05 17:09:22 +02:00
Vadim Savchuk
312f5553ae
Merge from default branch
...
--HG--
branch : product-engine
2010-02-05 15:12:54 +02:00
Ychebotarev ProductEngine
cc0895b900
a bit more on EXT-2753.
...
--HG--
branch : product-engine
2010-02-05 13:20:12 +02:00
Ychebotarev ProductEngine
a69a85544f
merge
...
--HG--
branch : product-engine
2010-02-05 13:04:29 +02:00
Ychebotarev ProductEngine
b79b8f87a3
finished with EXT-2753 - Implement Avatar icons on IM multifloater tabs
...
add floater flashing, fix group icon sizes, fix click,some code cleanup, ect.
also I remove mIconCtrlWidth/Height since its kinda useless - mIconCtrlPad do the same thing...
IconSize will be btn_height-2*mIconCtrlPad - simple and good enough.
--HG--
branch : product-engine
2010-02-05 13:03:26 +02:00
Dmitry Zaporozhan
553cf40d13
Updated low bug EXT-4951 - Redundant edit box context menu in list items in Panel Picks/Classifieds.
...
Reverted changeset 8956:930bef051fee.
Added new parameter to control context menu visibility.
--HG--
branch : product-engine
2010-02-05 12:25:18 +02:00
Ychebotarev ProductEngine
bc5ad04d61
applying patch for EXT-2357
...
--HG--
branch : product-engine
2010-02-05 09:41:54 +02:00
Tofu Linden
367fda833c
PE merge.
2010-02-05 06:21:09 +00:00
James Cook
92ac993287
Fix placement of icon next to linked agent/group names.
...
Suppresses rendering of text in LLNormalTextSegment that represent an icon,
properly computes vertical spacing based on font height, and adds padding
to the right of the icon.
(transplanted from 33be702e47c359ccaeb47f251e10753fd173cc09)
2010-02-04 22:19:15 -08:00
Tofu Linden
bb977a194f
PE merge.
2010-02-08 13:59:20 +00:00
Tofu Linden
8eba0c4029
Add some asserts to catch some null derefs that, at least, the render-pipeline code seems to be hitting.
2010-02-08 13:20:03 +00:00
Dave Parks
ff0271d632
merge
2010-02-04 23:43:13 -06:00
Dave Parks
979ddb2ec9
No more matrix ops in UI code.
2010-02-04 23:41:54 -06:00
Eugene Mutavchi
3f0762f65a
Fixed normal bug EXT-4307 (There are no text context menues for Search text field and for IM text field)
...
--HG--
branch : product-engine
2010-02-04 20:40:30 +02:00
richard
fed6c9eb0f
merge
2010-02-04 10:26:07 -08:00
richard
1bc67a9d72
EXT-4625 - Chat bar doesn't display trailing character on some strings
...
reviewed by Leyla
2010-02-04 10:25:31 -08:00
Dmitry Zaporozhan
79bcb8dc72
Fixed low bug EXT-4951 - Redundant edit box context menu in list items in Panel Picks/Classifieds
...
--HG--
branch : product-engine
2010-02-04 15:44:45 +02:00
Mike Antipov
667ae0b9a3
Fixed critical bug EXT-4845 (Create padding around text messages in the side tray panels)
...
- moved "No Items" textbox params to widget (flat_list_view.xml)
- set default vertical/horizontal padding to 10 px
- they can be overridden in panel's xml if necessary.
--HG--
branch : product-engine
2010-02-04 15:54:56 +02:00
Tofu Linden
bf18e798c5
CID-405
...
Checker: UNUSED_VALUE
Function: LLNormalTextSegment::drawClippedSegment(int, int, int, int, LLRectBase<int>)
File: /indra/llui/lltextbase.cpp
2010-02-03 21:13:37 +00:00
Tofu Linden
69a36cb5ce
PE merge.
2010-02-03 19:27:15 +00:00
Tofu Linden
75aec28534
merge.
...
--HG--
branch : product-engine
2010-02-03 18:27:38 +00:00
Tofu Linden
011673de5a
CID-419
...
Checker: RESOURCE_LEAK
File: /indra/llui/llstyle.h
--HG--
branch : product-engine
2010-02-03 18:22:25 +00:00
Tofu Linden
18af41157d
CID-342 UNINIT_CTOR
...
--HG--
branch : product-engine
2010-02-03 17:54:59 +00:00
Eugene Mutavchi
8c1618ca5a
Fixed major bug EXT-4876 (Switch from slurl.com to maps.secondlife.com)
...
--HG--
branch : product-engine
2010-02-03 19:38:12 +02:00
Monroe Linden
5491dd6e98
Further fixes for EXT-4689 (Long-word chat spam cripples fps and/or disconnects client).
...
This should fix the inefficiencies in the append path that made viewer FPS drop severely when addinglarge amounts of text to the nearby chat floater.
Resizing the floater with a huge amount of text in it is still pretty bad, but fixing that will require some bigger architectural changes.
Changed LLTextBase::needsReflow() to take an offset at which to start reflow processing.
Changed most needsReflow() calls in LLTextBase to supply a proper index.
Changed LLTextBase::reflow() to use the reflow index maintained by needsReflow().
Removed all needsReflow() calls from LLTextEditor (the only way for it to manipulate the text is through functions in LLTextBase that already manage reflowing internally).
Removed LLTextEditor::replaceUrlLabel(), since it was identical to the inherited version LLTextBase::replaceUrlLabel().
Reviewed by Richard.
2010-02-02 18:24:11 -08:00
Tofu Linden
7ba025b625
merge.
2010-02-02 18:19:36 +00:00
Denis Serdjuk
1da3feec8b
merge
...
--HG--
branch : product-engine
2010-02-02 20:11:57 +02:00
Lynx Linden
f937153a01
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-02 17:20:01 +00:00
Lynx Linden
e563a07659
DEV-32540: Lots of object IM and SLurl improvements
...
- Don't let object names that are URLs override links to display the
remote object inspector
- Don't hyperlink the object name in the remote object inspector
- Made the <nolink>...</nolink> regex more robust and made it support
non-URLs between the tags, so that we don't get random <nolink> tags
when trying to disable URLs in user-typed text.
- Improved the llurlentry unit test and added some more test cases.
- Hooked up another LLViewerMessage code path to objectim SLapps to
pass down the owner and slurl information.
- Made a few LLUrlEntryBase methods be const methods, because they are
- Fixed a bug in the remote object inspector where it would never show
the teleport URL.
2010-02-02 17:19:14 +00:00
Denis Serdjuk
47162acede
no ticket. Removing the hack from llfloater.This code is dangerous. It involved losing of topctrl in focusmgr and can cause strange bugs and problems.
...
--HG--
branch : product-engine
2010-02-02 14:49:58 +02:00
Ychebotarev ProductEngine
371885c373
fix for normal EXT-4810 Block hot-keys in mouse-look mode
...
--HG--
branch : product-engine
2010-02-02 14:35:37 +02:00
Dmitry Zaporozhan
38315a063d
Fixed normal bug EXT-4740 - Object inspector hides however context menu present
...
--HG--
branch : product-engine
2010-02-02 14:25:31 +02:00
Monroe Linden
4ad357ec70
Fixes for EXT-4689 (Long-word chat spam cripples fps and/or disconnects client)
...
Removed some unnecessary string copies in LLTextBase and LLNormalTextSegment by changing getWText() to return const LLWString& (instead of LLWString), and storing the result in a const LLWString& instead of an LLWString in places where the string doesn't need to be modified.
Made LLTextViewModel::getDisplay() also return const LLWString& instead of LLWString.
Removed a couple of unused local string variables in LLTextBase (the compiler flagged these after converting the local copies to const LLWString&).
2010-02-01 17:51:30 -08:00
richard
08adb4cfed
merge
2010-02-01 13:50:35 -08:00
richard
8dbb2c6fd1
removed redundant code
2010-02-01 13:50:15 -08:00
Eric M. Tulla (BigPapi)
ec5ad98abe
EXT-4848 - Crash when trying to view chicklet(?). Bug in word wrap logic.
...
Added a clamp to >= 0 for num pixels so we don't hit the assert.
-Reviewed by Nyx
2010-02-01 15:47:16 -05:00
richard
45e700cb3e
merge
2010-02-01 12:39:59 -08:00
Eugene Mutavchi
7bcba326b3
Fixed major bug EXT-4798 (Voice notifications steal keyboard focus by default)
...
--HG--
branch : product-engine
2010-02-01 18:25:58 +02:00
Igor Borovkov
20cef65539
changed password's circles to bullets - EXT-4499 Replace "*" glyph in password fields with a proper circle [PATCH INCLUDED]
...
--HG--
branch : product-engine
2010-02-02 15:27:19 +02:00
Tofu Linden
ccbf6088b7
CID-299
...
Checker: UNINIT_CTOR
Function: LLUIColor::LLUIColor()
File: /indra/llui/tests/llurlentry_test.cpp
2010-01-29 15:54:24 -08:00
Tofu Linden
4cdb84d6c4
CID-299
...
Checker: UNINIT_CTOR
Function: LLUIColor::LLUIColor()
File: /indra/llui/tests/llurlmatch_test.cpp
2010-01-29 15:53:14 -08:00
Tofu Linden
68401771cd
CID-325
...
Checker: UNINIT_CTOR
Function: LLNotificationForm::LLNotificationForm(const LLSD &)
File: /indra/llui/llnotifications.cpp
2010-01-29 14:53:16 -08:00
Tofu Linden
97e59b20f0
CID-340
...
Checker: UNINIT_CTOR
Function: LLNotificationTemplate::LLNotificationTemplate()
File: /indra/llui/llnotifications.cpp
2010-01-29 14:10:29 -08:00
Tofu Linden
93b35ad444
CID-342 alternative fix
...
Checker: UNINIT_CTOR
Function: LLNotification::LLNotification(LLUUID)
File: /indra/llui/llnotifications.h
2010-01-29 14:02:59 -08:00
Tofu Linden
458920d9d6
merge
2010-01-29 14:00:02 -08:00
Tofu Linden
5bf17543c2
Backed out changeset 298497c8090c
...
Gosh, I don't know why this unused ctor actually matters, but it does. o.O
2010-01-29 13:59:54 -08:00
Tofu Linden
a07e40e70d
CID-341
...
Checker: UNINIT_CTOR
Function: LLNotificationComparators::orderBy<const LLUUID &>::orderBy(boost::function<const LLUUID &(boost::shared_ptr<LLNotification>)>, LLNotificationComparators::e_direction)
File: /indra/llui/llnotifications.h
2010-01-29 13:53:20 -08:00
Tofu Linden
32d66e60fd
CID-342
...
Checker: UNINIT_CTOR
Function: LLNotification::LLNotification(LLUUID)
File: /indra/llui/llnotifications.h
'don't use this for anything real' code shouldn't exist. :)
2010-01-29 13:36:58 -08:00
Tofu Linden
df657d7488
CID-344
...
Checker: UNINIT_CTOR
Function: LLDockControl::LLDockControl(LLView *, LLFloater *, const LLPointer<LLUIImage> &, LLDockControl::DocAt, boost::function<void (LLRectBase<int> &)>)
File: /indra/llui/lldockcontrol.cpp
2010-01-29 13:21:08 -08:00
Tofu Linden
5c01eca7dd
CID-345
...
Checker: UNINIT_CTOR
Function: LLConsole::LLConsole(const LLConsole::Params &)
File: /indra/llui/llconsole.cpp
2010-01-29 13:18:29 -08:00
Tofu Linden
9459fd9137
PE merge.
2010-01-29 10:24:45 -08:00
Eugene Mutavchi
3b34147cea
Fixed low bug EXT-4721(Green border around multi-selected people)
...
--HG--
branch : product-engine
2010-01-29 19:55:41 +02:00
Alexei Arabadji
86609394ca
fixed major EXT-3643 “Embed friendship offer into IM window”;
...
--HG--
branch : product-engine
2010-01-29 17:48:10 +02:00
Lynx Linden
2ec69d6d71
EXT-4678: Revert URL black list support from LLTextBase.
...
The new <nolink>URL</nolink> provides a more flexible solution that
can be specified in XUI (as we now do to disabled hyperlinking for the
sim hostname in the About floater).
2010-01-29 14:56:39 +00:00
Lynx Linden
4d6c9e3e17
EXT-4678: Support <nolink>...</nolink> to turn off URL hyperlinking.
...
We are running into a bunch of places where we don't want to allow
hyperlinking of URLs like secondlife.com in text boxes. I've therefore
added a new type of URL regex that disables URL hyperlinking. Simply
enclose the URL in a <nolink> tag, e.g.:
<nolink>secondlife.com</nolink>
2010-01-29 14:30:26 +00:00
Tofu Linden
fc8e185faf
PE merge.
2010-01-28 12:31:25 -08:00
Tofu Linden
50bf40a631
CID-343
...
Checker: UNINIT_CTOR
Function: LLFloaterView::LLFloaterView(const LLUICtrl::Params &)
File: /indra/llui/llfloater.cpp
2010-01-28 10:30:57 -08:00
Tofu Linden
139e8be4e1
CID-339
...
Checker: UNINIT_CTOR
Function: LLMenuGL::LLMenuGL(const LLMenuGL::Params &)
File: /indra/llui/llmenugl.cpp
2010-01-28 10:28:41 -08:00
Tofu Linden
6bce7146e6
CID-338
...
Checker: UNINIT_CTOR
Function: LLToolTipMgr::LLToolTipMgr()
File: /indra/llui/lltooltip.cpp
2010-01-28 10:26:38 -08:00
Tofu Linden
7ba57dfe10
CID-324
...
Checker: UNINIT_CTOR
Function: LLStyle::LLStyle(const LLStyle::Params &)
File: /indra/llui/llstyle.cpp
2010-01-28 10:23:09 -08:00
Tofu Linden
9cfc1f33b2
CID-323
...
Checker: UNINIT_CTOR
Function: LLUIString::LLUIString()
File: /indra/llui/lluistring.h
2010-01-28 10:20:27 -08:00
Dmitry Zaporozhan
12c61ac4d5
Fixed normal bug EXT-4616 - Combobox labels no longer appear.
...
--HG--
branch : product-engine
2010-01-28 19:32:18 +02:00
Vadim Savchuk
14caf5475b
Merge from default branch
...
--HG--
branch : product-engine
2010-01-28 13:58:00 +02:00
Ychebotarev ProductEngine
33a417dd2d
merge
...
--HG--
branch : product-engine
2010-01-28 11:42:46 +02:00
Denis Serdjuk
b1fa6bb342
fix for EXT-4186 List items are displayed as links in the FlatList if match URL regexp
...
allow_html attribute was updated for titles of group list items, group info panel, landmark info panel and for a title of floaters.
--HG--
branch : product-engine
2010-01-28 11:42:20 +02:00
Ychebotarev ProductEngine
03861037af
fix for normal EXT-3807 ABOUT LAND/OBJECTS: (i) icon is badly positioned
...
now I wonder how was this working before...
--HG--
branch : product-engine
2010-01-28 11:32:02 +02:00
Tofu Linden
599e96f328
CID-102
...
Checker: INVALIDATE_ITERATOR
Function: LLNotifications::getChannel(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/llui/llnotifications.cpp
not a bug.
2010-01-27 13:11:02 -08:00
Tofu Linden
05260ba76d
follow-up fix
2010-01-27 13:09:25 -08:00
Tofu Linden
668e72e290
CID-103
...
Checker: INVALIDATE_ITERATOR
Function: LLMenuGL::scrollItemsDown()
File: /indra/llui/llmenugl.cpp
2010-01-27 13:08:15 -08:00
Tofu Linden
706fd4d073
CID-103
...
Checker: INVALIDATE_ITERATOR
Function: LLMenuGL::scrollItemsDown()
File: /indra/llui/llmenugl.cpp
2010-01-27 13:06:26 -08:00
Tofu Linden
3acf25d5fc
CID-416
...
Checker: NULL_RETURNS
Function: LLTabContainer::onTabBtn(const LLSD &, LLPanel *)
File: /indra/llui/lltabcontainer.cpp
2010-01-27 11:55:34 -08:00
Vadim Savchuk
d3d2a8d537
Merge from default branch
...
--HG--
branch : product-engine
2010-01-27 15:06:53 +02:00
Paul Guslisty
8ea2c7a373
Implemeted normal Sub-Task EXT - 2753 (Implement Avatar icons on IM multifloater tabs)
...
--HG--
branch : product-engine
2010-01-27 14:16:37 +02:00
Tofu Linden
3d771ed88b
PE merge.
2010-01-26 10:36:27 -08:00
Vadim Savchuk
dfad0f4e67
Fixed critical bug EXT-4663 ([BSI] Inviting Residents to groups produces error 100% of time).
...
Overriden LLScrollListItem::getUUID() in LLNameListCtrl so that you can get correct ID of a name list item.
--HG--
branch : product-engine
2010-01-26 20:17:45 +02:00
Dmitry Zaporozhan
e8b4a14b1d
Fixed major bug EXT-4719 - Crash in LLTextBase after showing popup menu for link.
...
--HG--
branch : product-engine
2010-01-26 17:07:12 +02:00
Eugene Mutavchi
05b91f636b
Fixed low bug EXT-4354(Dragging landmarks into landmark folders doesn't scroll window)
...
--HG--
branch : product-engine
2010-01-26 16:30:51 +02:00
Lynx Linden
0a38adfd8a
EXT-4678: Don't hyperlink sim URLs in About window.
...
Added support for specifying a black list of URLs on a per-widget
basis. URLs on this black list will not be hyperlinked in the text
widget. The About dialog adds the sim hostname to this black list.
2010-01-26 13:09:26 +00:00
angela
a358dc65c4
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
2010-01-26 08:00:29 +08:00
angela
66e7c2ce77
fix mac build failure -- richard
2010-01-26 06:48:42 +08:00
Tofu Linden
9f44c4df79
Fix some Linux build breakage - can't treat the return of a constructor call as a ref with gcc, have to use intermediate variable.
2010-01-25 10:30:57 -08:00
Denis Serdjuk
410e105f52
fixed bug EXT-4433 [BSI] friend privacy settings greyed out
...
EXT-4353, EXT-4587, EXT-4442 have same cause. it should fix they.
--HG--
branch : product-engine
2010-01-25 15:15:06 +02:00
Dmitry Zaporozhan
a5bb9a722d
Fixed low bug EXT-4659 - Unnecessary scroll bar appears in location history list if 10 items are presented.
...
--HG--
branch : product-engine
2010-01-25 13:09:50 +02:00
Ychebotarev ProductEngine
d4ef65cea6
merge
...
--HG--
branch : product-engine
2010-01-26 14:34:43 +02:00
Ychebotarev ProductEngine
fd33910c39
add comment for EXT-4443 about EXT-4443...
...
--HG--
branch : product-engine
2010-01-26 14:34:02 +02:00
Igor Borovkov
a1b8198722
done (fixing patch) EXT-4499 Replace "*" glyph in password fields with a proper circle [PATCH INCLUDED]
...
--HG--
branch : product-engine
2010-01-26 14:09:15 +02:00
Ychebotarev ProductEngine
12961b5701
fix for normal EXT-4443 Copying text from notifications fails
...
--HG--
branch : product-engine
2010-01-26 09:12:34 +02:00
richard
947398563e
merge
2010-01-22 17:40:28 -08:00
richard
337716d946
LLPointer cleanup and fix for EXT-4413
...
reviewed by Rick
2010-01-22 16:51:13 -08:00
Paul Guslisty
0fd17c8d2d
Implemeted normal Sub-task EXT - 2753 (Implement Avatar icons on IM multifloater tabs). Some code needs improvements(refactoring, optimization)
...
--HG--
branch : product-engine
2010-01-21 21:11:59 +02:00
Ychebotarev ProductEngine
89449c3f38
fix for normal EXT-4035 Old sidepanel tab's text remains highlighted when switching to inventory sidepanel tab
...
--HG--
branch : product-engine
2010-01-21 15:17:44 +02:00
Dmitry Zaporozhan
da00631c63
Update for low bug EXT-4371 - Text from search history drop-down list merge with landmarks on 'Favorites Bar'.
...
Made border customisable in combo box.
--HG--
branch : product-engine
2010-01-20 18:21:54 +02:00
Ychebotarev ProductEngine
e761c0ece7
fix for major EXT-4414 Floaters can be expanded over bottom bar
...
left<->top...:)
--HG--
branch : product-engine
2010-01-20 19:06:05 +02:00
Ychebotarev ProductEngine
ac8f5e6f91
fix for low EXT-4464 There is no visual indication of current selection while traversing Group Profile accordion using keyboard
...
actually that was done for some reason...
but I really really really don't understand them
--HG--
branch : product-engine
2010-01-19 18:23:42 +02:00
Ychebotarev ProductEngine
82de841c52
merge
...
--HG--
branch : product-engine
2010-01-19 17:13:21 +02:00
Ychebotarev ProductEngine
4610e911c9
working on floaters rezise-position bugs: EXT-4414, EXT-2625
...
--HG--
branch : product-engine
2010-01-19 16:39:03 +02:00
Eugene Mutavchi
e8cbd586a9
Fixed normal bug EXT-4379 (Scroller doesn't follow the cursor if cursor is being moved by keyboard arrow buttons)
...
--HG--
branch : product-engine
2010-01-18 17:10:11 +02:00
Vadim Savchuk
97f35b18f0
Merge from default branch.
...
--HG--
branch : product-engine
2010-01-18 14:51:26 +02:00
richard
d0458d8e2d
merge
2010-01-15 13:19:02 -08:00
richard
cf2beaeea6
EXT-4380 - LLTextEditor: line_spacing.multiple option doesn't work well with "widgeted" text
...
partial fix
reviewed by Leyla
2010-01-15 13:16:58 -08:00
Tofu Linden
7efc0fbb4f
EXT-4383 Replace ">" glyph in cascading menus with a proper triangle
...
patch by josh, reviewed by me
2010-01-15 12:41:51 -08:00
Lynx Linden
5c09d482a4
EXT-4148 EXT-4230: Lots of help ID updates.
...
Updated the logic of the help ID detection to search sub-panels before
searching active tabs. For some reason, certain tabs are still visible
and active even though they are not being displayed on screen. I also
removed a bunch of help IDs for button panels that just confuse things.
Also went through all of the side panel tabs and added new help IDs
where appropriate. These are:
profile_classified_info
profile_edit_classified
profile_pick_info
profile_edit_pick
my_inventory_tab
recent_inventory_tab
2010-01-15 18:01:31 +00:00
Eugene Mutavchi
2b5f45c1aa
Fixed normal bug EXT-4309 (Gesture button is too wide in the mouse look mode): added hack that avoid usage of the LLLayoutStack resizing logic on mouse look mode switching.
...
--HG--
branch : product-engine
2010-01-15 20:57:42 +02:00
Lynx Linden
188185803b
EXT-4233: Display "?" button on torn-off floaters.
...
This involved tracking the torn-off state of a floater, which we
apparently weren't doing before. Also, making sure that we update
the title bar buttons when the floater changes torn-off state.
2010-01-15 12:37:56 +00:00
Lynx Linden
c6108f0fad
EXT-4125: Regexes hurt my head!
...
Updated the regex to match a free URL in plain text with no http:
protocol. This now explicitly does not match e-mail addresses, such as
test@lindenlab.com (yay negative lookbehind regexes). It additionally
matches URLs with a port or path after it, e.g., secondlife.com/status.
I've added a bunch more unit tests to asset positive and negative
matches for this regex, because no human can do this in their head.
2010-01-15 11:07:37 +00:00
Lynx Linden
e110524537
EXT-4233: Don't show help button on tear-off floaters.
...
The script error floater may be the only floater left that uses the
old-style tearoff functionality, but at least it should behave a
little better now in terms of help "?" buttons.
2010-01-14 14:30:40 +00:00
richard
01c65e891d
merge
2010-01-13 18:18:03 -08:00
Tofu Linden
eae15689d8
automated merge PE->viewer2.0
2010-01-13 15:15:51 -08:00
Lynx Linden
f3bd6481a5
EXT-4197: Search in sub-panels for help IDs too.
...
In order to support unique help IDs for the Landmark and Place Profile
panels off the Places sidetray, we need to also search within any
embedded (and visible) sub-panels.
2010-01-13 17:57:03 +00:00
Mike Antipov
3c3271761b
Merge with default branch, resolved conflict in llpanelavatar.cpp
...
--HG--
branch : product-engine
2010-01-12 12:53:44 +02:00
richard
0f11042d25
EXT-4095 - [crashhunters] Crash on shutdown in LLTextBase destructor
...
reviewed by James
2010-01-11 17:35:17 -08:00
richard
34f33212de
merge
2010-01-11 14:48:28 -08:00
richard
3e5f5a2050
EXT-3444 Volume control slider appears in an odd location
...
reviewed by Leyla
2010-01-11 14:41:37 -08:00
James Cook
a36087f5c1
Merge, sync from viewer-2-0, fixed conflict in llinspectavatar.cpp
2010-01-11 14:06:09 -08:00
richard
daa4965fe0
renamed LLFastTimerUtil to LLFastTimer
2010-01-11 12:05:13 -08:00
Runitai
78cb4204a4
Merge
2010-01-11 11:24:04 -06:00
Runitai
2a00a16f57
EXT-3784 Fix for first menu item going blank when highlighted on ATI cards.
2010-01-11 11:21:52 -06:00
Lynx Linden
92b569a607
EXT-3928: Escape group names in the profile panel URLs.
2010-01-11 15:05:01 +00:00
Lynx Linden
1d9591afbe
DEV-44732: Added some unit tests for URLs with no protocols.
2010-01-11 12:05:39 +00:00
Vadim Savchuk
9393c28831
Merge from default branch.
...
--HG--
branch : product-engine
2010-01-11 12:57:42 +02:00
Lynx Linden
d24cd96ef8
EXT-3929: Also look in accordion tabs for help topic.
...
When the user clicks on the help "?" button, we try to find the
currently active tab and see if there is a help topic for that tab.
In addition, we now also look for a currently-visible accordion tab.
2010-01-11 10:41:01 +00:00
Lynx Linden
a4baeed12f
EXT-3929: Moved LLAccordionCtrl to llui.
...
Both LLAccordionCtrl and LLAccordionCtrlTab should live in llui, not
newview. I need to make this happen in order to fix EXT-3929. No code
change was necessary (other than to change #include for predefined
headers) as these classes did not rely on any newview code.
2010-01-11 10:05:37 +00:00
James Cook
9ffaacc47e
First pass expose inventory item settings in XML (folder_view_item.xml)
...
Optimized LLFolderViewItem constructor by passing param block as
const ref to avoid copies.
Removed per-item arrow and background images, use defaults.
Removed unneeded static image pointers.
Removed hard-coded rounded_square.tga, replaced with Rounded_Square
Ditto for folder_arrow.tga
Reviewed with Richard.
2010-01-08 17:26:47 -08:00
richard
eb228dcf3a
fast timer performance tuning
2010-01-08 16:41:39 -08:00
Leyla Farazha
35bb14951f
Merge
2010-01-06 16:38:19 -08:00
Leyla Farazha
95f14d7313
changing lineeditor text positioning center logic from using llceil to llround
2010-01-06 16:37:06 -08:00
Leyla Farazha
2369ecc118
EXT-3824 [BSI] Rename Inventory Item Text Cutoff
...
EXT-3757 Text Placement is Too High when Editing Landmark/Outfit/Notecard Names
reviewed by Richard
2010-01-06 16:26:01 -08:00
richard
a1e342b3f7
merge
2010-01-06 12:40:44 -08:00
richard
4966073030
moved clipping logic inside LLFontGL::maxDrawableChars controlled by EWordWrapStyle
...
fixes regression introduced in 3eef5ce9ae1e6fc62b9b52ce859501dd4e70fadf
reviewed by Brad
2010-01-06 12:23:56 -08:00
richard
3b7080a6b1
merge
2010-01-06 11:18:04 -08:00
richard
1bbd259f2d
EXT-3878 - Menus disappear when UI Size is < 1.00
...
EXT-3647 - Auto-scrolling of IMs should resume when user types in chat
EXT-3877 - Pinning two levels of menus prevents movement using arrow keys
EXT-1303 - Hyperlink text wraps in the middle of a word
reviewed by James
2010-01-06 11:17:38 -08:00
Yuri Chebotarev
3a7e3c4328
merge
...
--HG--
branch : product-engine
2010-01-06 17:23:08 +02:00
Yuri Chebotarev
c0d189a3d1
fix for low EXT-2742 Invalid menu appearance after hiding navigation bar and/or favorites bar
...
actually that was designed behavior.
--HG--
branch : product-engine
2010-01-06 15:12:09 +02:00
Vadim Savchuk
aa5aff1d79
Merge from default branch.
...
--HG--
branch : product-engine
2010-01-06 12:58:33 +02:00
James Cook
8a033dba8d
Merge
2010-01-05 16:29:11 -08:00
James Cook
a3adfe54cb
EXT-3332 Disabled checkboxes don't use disabled text color
...
Text label color wasn't being set in constructor.
Added example to floater_test_widgets.xml
Reviewed with Richard
2010-01-05 16:28:22 -08:00
Leyla Farazha
0b0372a303
EXT-3900 [BSI] Inspector floater fades while inspectors context menu is still active
...
reviewed by Richard
2010-01-05 15:49:22 -08:00
Rick Pasetto
5995bcd5a7
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-01-05 14:33:48 -08:00
Rick Pasetto
4a870a0887
EXT-3649 EXT-3662 : Move media controls to above media face
...
Review #69
This changes where and how the media controls are laid out, and ensures that all of the media region (the face) is clickable. Also moved the volume slider to below the controls (this took WAY too long to do :( ), and adjusted the window region in which the media controls are allowed to be displayed.
2010-01-05 14:33:27 -08:00
Vadim Savchuk
21d5410d1a
Fixed potential crash if LLFlatListView is created as a dummy widget.
...
--HG--
branch : product-engine
2010-01-05 19:32:25 +02:00
Vadim Savchuk
ddf2cccdb9
Merge from default branch.
...
--HG--
branch : product-engine
2010-01-05 12:37:26 +02:00
Tofu Linden
f446ae4767
DEV-44732 - a better fix.
2010-01-04 16:25:05 -08:00
Tofu Linden
e8659e0e13
DEV-44732 avoidable false-positives on automatic URL finding in chat
2010-01-04 15:11:23 -08:00
Tofu Linden
43cdebefa6
EXT-3318 LLConsole keeps all logged text in memory when console is not being drawn.
2010-01-04 14:03:02 -08:00
Alexei Arabadji
0508dab523
fixed EXT-3765 “There is no tongue for voice control panel in docked state”,
...
made dockable floaters have tongue by default;
--HG--
branch : product-engine
2010-01-04 16:18:57 +02:00
Leyla Farazha
8e5b453ea0
EXT-3589 Favorites Appear Squished Together on Left Half of Favorites Bar
...
EXT-3602 Inventory > New Clothes sub menu not aligned
EXT-3631 Texture preview after upload > Image covers buttons
reviewed by James
2009-12-29 16:12:12 -08:00
Alexei Arabadji
5383fb70c3
Implemented EXT-1627 “Nearby Chat window behavior needs clarification”,
...
made non-unique docked floaters docks without dock tongue;
--HG--
branch : product-engine
2009-12-26 12:04:55 +02:00
Paul Guslisty
dafd9e269f
Fixed a memory leak in ContextMenu (EXT-3563).
...
--HG--
branch : product-engine
2009-12-25 17:18:51 +02:00
Dmitry Zaporozhan
0312156258
Fixed low bug EXT-3294 - Toasts bunch up in the channel when big docked IM window is opened.
...
--HG--
branch : product-engine
2009-12-25 13:53:11 +02:00
Vadim Savchuk
ed802c19ce
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-24 16:30:10 +02:00
Tofu Linden
183c991402
DEV-44614 ugly/broken font and formatting used for IM toast emotes
...
fix bug, also fix some comments/typos/enumparams in this code area.
2009-12-23 11:29:13 -08:00
Mike Antipov
46948d9fcc
Work on normal task EXT-3636 (Code Improvements: Voice control panels - Make Voice states and fade timeout xml driven)
...
-- made Avatar Item Voice States xml driven. Added fake xml panel file with one textbox per style.
Style of the appropriate textbox is applied to avatar item's name
-- It was necessary to change visibility of the LLTExtBase::getDefaultStyle() to public.
--HG--
branch : product-engine
2009-12-23 20:00:48 +02:00
Eugene Mutavchi
170719096a
Fixed low bug EXT-3007 (Viewer stalls while resetting filter in teleport history)
...
--HG--
branch : product-engine
2009-12-23 17:01:02 +02:00
Alexei Arabadji
7a0e2dc59b
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-23 16:52:21 +02:00
Alexei Arabadji
6c48bb9f2d
fixed EXT-3425 “Undocked floaters focus issue”,
...
made focus be passed to game area in case floater can't hold focus;
--HG--
branch : product-engine
2009-12-23 16:51:21 +02:00
Vadim Savchuk
9d08360f73
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-23 16:30:09 +02:00
Dmitry Zaporozhan
1412e4f667
Fix for normal bug EXT-3041 - Picks accordion doesn't fit to content.
...
--HG--
branch : product-engine
2009-12-23 11:58:04 +02:00
Kent Quirk
53698d5c10
automated merge PE->viewer2.0
2009-12-22 15:37:31 -05:00
Vadim Savchuk
65557cde70
Made the control panel in P2P IM sessions non-resizable (EXT-3470).
...
--HG--
branch : product-engine
2009-12-22 20:03:10 +02:00
Nat Goodspeed
8077f1990d
Intercept notifications as filter rather than as a peer listener.
2009-12-22 12:22:33 -05:00
richard
18e25641fe
merge
2009-12-21 18:12:17 -08:00
richard
093795c10c
EXT-3599 - no chiclets in the im well window
2009-12-21 17:32:05 -08:00
Loren Shih
d215cd5c24
automated merge PE->viewer2.0
2009-12-21 15:20:41 -05:00
Rick Pasetto
2ebd9b54af
Automated merge with ssh://richard@hg.lindenlab.com/james/gooey
2009-12-21 10:44:13 -08:00
Yuri Chebotarev
aa56836ab7
additional fix for (EXT-3601) Accordion Ctrl didn't autoscroll to accordion header while navigating with keyboard
...
there was no autoscroll when scrolled by keyboard to _last_ of _first_ item in LLFlatListView.
--HG--
branch : product-engine
2009-12-21 18:15:44 +02:00
Lynx Linden
bf7494017f
EXT-3486: Support SLapps and URLs in the nav bar.
...
If the user enters a string into the navigation bar that is not
recognized as an SL location, the behavior is now:
- handle any secondlife:// SLapps, or
- open any http: or https: URLs in the media browser, or
- otherwise, send the text to the search floater
2009-12-21 15:49:52 +00:00
Lynx Linden
d1eb2948f8
EXT-3558: Don't escape '#' chars for URLs in text.
...
Added '#' to the list of chars that are not escaped when escaping a
URL in a text editor/box. Now, clicking on a link with '#' in text
chat will open the URL in your browser with the '#' intact.
2009-12-21 14:33:20 +00:00
Lynx Linden
e33ebe2b48
EXT-3460: Update to URL hyperlinking with no protocol.
...
We no longer treat ":" or "/" as valid chars before a .com, .net,
.edu, or .org string when trying to match a URL with no protocol
(i.e., no http:// prefix).
2009-12-21 11:35:37 +00:00
Nat Goodspeed
6ed6bed5ac
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-19 08:43:06 -05:00
Nat Goodspeed
bddf08f9e3
Add event API operations to query channels and notifications within channel;
...
respond to or cancel an individual notification by UUID; or forward
notifications through a specified LLEventPump.
2009-12-19 08:23:05 -05:00
richard
2b22831dd0
ext-3307 - nearby chat stays scrolled at bottom
2009-12-18 15:18:16 -08:00
James Cook
2da83c55ee
Fix for color setup from Richard.
2009-12-18 14:39:54 -08:00
James Cook
298c829bb7
Fix 3D object tooltip backgrounds appearing gray
...
Image "none" wasn't being properly converted to a NULL pointer,
so was drawing the default gray image.
Reviewed with Richard
2009-12-18 14:39:45 -08:00
Nyx (Neal Orman)
1e922c2666
Automated merge with ssh://nyx@hg.lindenlab.com/viewer/viewer-2-0/
2009-12-18 15:56:49 -05:00
James Cook
efdfc74b21
Merge with viewer-2-0 again, to pick up avatar changes
2009-12-18 12:32:01 -08:00
Nyx (Neal Orman)
7836bba2dc
merging latest PE changes into viewer-2-0
2009-12-18 15:23:33 -05:00
Palmer Truelson
5962d8804f
ext-3386 Fix for day cycle crash and xui cleanup
...
Reviewed by Richard
2009-12-18 13:28:23 -06:00
James Cook
eb501f3231
Merge, pulling in viewer-2-0
2009-12-18 10:50:29 -08:00
richard
ebb69c3188
made adding sliders to a multislider possible from xui
2009-12-18 10:48:33 -08:00
Paul Guslisty
7cf60a0d57
Fixed normal bug EXT - 2863 ([BSI] Group Chat List Names right click do not contain view profile or send private message)
...
--HG--
branch : product-engine
2009-12-18 16:44:16 +02:00
Yuri Chebotarev
3bf89afebe
fix Task EXT-1190 Accordion should support keyboard accessability
...
--HG--
branch : product-engine
2009-12-18 14:36:22 +02:00
Leyla Farazha
43ed40f976
merge
2009-12-17 16:23:29 -08:00
Leyla Farazha
ab93c0ffb5
EXT-3534 Default Location Obscures the Top of an Open Notecard When Nav and/or Favorites Bar are Hidden
...
EXT-3334 [BSI] Chat/IM log preferences not retained
EXT-3402 Replace "X" for checked menu items with a check mark glyph [Patch Included]
reviewed by richard
2009-12-17 16:15:46 -08:00
Tofu Linden
25861bb374
add newline to unbreak linux build. probably.
2009-12-17 14:15:50 -08:00
richard
c84b6a28a0
made setupParams do coordinate flipping and negative coordinate magic only for XUI-based params
2009-12-17 11:49:41 -08:00
richard
7a3034f738
replaced llsd_equals with string based llsd comparison for more consistent support
2009-12-17 11:48:57 -08:00
richard
c89bb9848f
fix for bad xui warnings when loading font from legacy "resource" name
2009-12-17 11:48:33 -08:00
richard
49a037048c
oops, forgot to remove assert
2009-12-17 11:44:37 -08:00
richard
9abe9bf5df
clamp instead of assert when running out of room during reflow
2009-12-17 11:44:01 -08:00
richard
724f5fbb7f
merge
2009-12-17 10:03:56 -08:00
richard
9ff869a6b2
Backed out changeset: 4d482c1ed041
2009-12-17 10:01:55 -08:00
richard
cf63ce4dc1
merge
2009-12-17 09:57:43 -08:00
richard
f452c01915
EXT-3087 - Crash when avatar icon truncated in interactive notifications
...
reviewed by Mani
2009-12-17 09:54:44 -08:00
James Cook
3c06dc4df2
Merge
2009-12-16 16:40:06 -08:00
James Cook
4c0d5200bc
Merge
2009-12-16 16:04:26 -08:00
James Cook
e8fe81c4fc
Backed out changeset: cfa60aef8061, added setBlockFromValue so setting a LLRect param in code will set the individua
2009-12-16 16:04:09 -08:00
James Cook
0be35a9fdb
Backed out changeset: f7fa81994ec8, 6611 (f7fa81994ec8) EXT-3522 Radio group layout not top-left based (was Sell Land floater missing sa
2009-12-16 16:03:37 -08:00
James Cook
d2ba398614
EXT-3522 Radio group layout not top-left based (was Sell Land floater missing sale of object)
...
Most radio button layouts were broken because the radio item generation
code wasn't fixing up the rectangles. This may not be the right fix,
I need to talk to Richard.
2009-12-16 14:40:11 -08:00
Leyla Farazha
46f56f5d52
eof newline
2009-12-16 09:45:15 -08:00
Alexei Arabadji
11adf324c7
implemented EXT-3395 “Docked IM/Chat windows shouldn't hide when voice control
...
panel is opened”,
reverted changes from 6658:6a7714959726;
made LLCallFloater non-unique dockable;
added LLCallFloater to control list of Transient Manager;
--HG--
branch : product-engine
2009-12-17 11:46:02 +02:00
richard
1a4047c590
merge
2009-12-15 19:50:17 -08:00
Rick Pasetto
a183fb9f5e
fix for gcc build
2009-12-15 19:48:02 -08:00
richard
943cae62db
merge
2009-12-15 19:38:22 -08:00
Rick Pasetto
e5c9fe005e
Automated merge with http://demeter:8000
2009-12-15 19:36:03 -08:00
richard
3a02b9ec88
added setBlockFromValue so setting a LLRect param in code will set the individual left, right, top, bottom values, for example
...
don't call setupParams when creating widgets from code
moved Multiple param constraints into BaseBlock to remove extra scoping
2009-12-15 19:33:18 -08:00
richard
699e2e027b
added "value" attribute to radio_items to better support arbitrary data selection
...
moved LLRadioCtrl to internal implementation of LLRadioGroup
reviewed by Leyla
2009-12-15 14:21:04 -08:00
James Cook
87ef5c2472
EXT-3471 Tabs need a pad_bottom override attribute
...
Added label_pad_bottom and label_pad_left for tab containers.
2009-12-15 09:54:50 -08:00
Alexei Arabadji
7ba2f99ae0
mplemented EXT-3395 “Docked IM/Chat windows shouldn't hide when voice control panel is opened”;
...
--HG--
branch : product-engine
2009-12-15 19:10:27 +02:00
Vadim Savchuk
e303864c17
Merge from default branch.
...
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.
--HG--
branch : product-engine
2009-12-15 17:14:31 +02:00
Alexei Arabadji
f8f1252d32
mplemented EXT-3396 “All bottom bar buttons, including chiclets and nearby chat, should work as toggles”,
...
made hide/unhide dockable floaters when undocked;
--HG--
branch : product-engine
2009-12-15 09:55:00 +02:00
richard
19d9cf8d8e
ext-3404 - script editor scrolls to the bottom and sticks
2009-12-11 16:48:05 -08:00
richard
9ad76199e5
fixed a regression that caused bottom 15 pixels of scrollable text editors to appear blank
2009-12-11 16:25:38 -08:00
richard
c6234f352a
variable renames in LLTextBase
2009-12-11 14:34:30 -08:00
richard
d5a58c20a8
merge
2009-12-11 13:51:42 -08:00
richard
401a51cac1
note to get rid of hack
2009-12-11 13:50:54 -08:00
richard
b8fdf82510
fix for ellipses not appearing in single line text widgets
...
fix for ellipses sometimes appearing at end of wrapped line of text
reviewed by James
2009-12-11 13:50:40 -08:00
James Cook
fce0d168ae
EXT-3233 Button label vertical placement cannot be adjusted via xml
...
Added bottom_pad attribute to widgets/button.xml and removed old
LLBUTTON_VPAD global and ButtonVPad saved setting.
Reviewed with Richard.
2009-12-11 13:48:35 -08:00
James Cook
ae9ca1be63
EXT-3313 Media Settings window has no background if viewer is too short
...
Code to set default floater position to top-left was causing incorrect
floater height computation when floater XML specified a bottom coordinate.
Reviewed with Callum.
2009-12-11 10:56:49 -08:00
James Cook
a87b99cd95
Merge, fixed conflict in panel_preferences_sound.xml
2009-12-11 10:22:50 -08:00
Vadim Savchuk
a3ee1dda20
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-11 16:31:36 +02:00
Alexei Arabadji
4fc7b91a79
implemented EXT-2323 “Get rid from obsolete notification widgets”;
...
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
Lynx Linden
b3f8cec38c
DEV-43977: Changed pre-login help browser behavior.
...
The special pre_login_help topic is now only displayed when the user
clicks on the "Need help logging in?" link on the login screen, or
selects the top-level Help > Second Life Help (F1) menu.
2009-12-10 22:38:29 +00:00
Lynx Linden
d575af6a65
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-10 19:05:41 +00:00
Lynx Linden
1ab022df43
EXT-3122: Added support for URLs without an explicit protocol.
...
You can now enter URLs like "www.google.com", "secondlife.com", or
"www.google.com/search?q=second%20life" and these will be hyperlinked.
2009-12-10 15:33:05 +00:00
Vadim Savchuk
6f5b47a4e7
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-10 16:06:01 +02:00
richard
23610472d5
lazy evaluation of lluistring to improve LLUIString::format performance
...
reviewed by Mani
2009-12-09 17:17:07 -08:00
Leyla Farazha
0c1d9da1c1
merge
2010-12-08 11:58:16 -08:00
Leyla Farazha
52dd4daada
adding notes about visible / enable callback registries being merged
2010-12-08 11:56:44 -08:00
Leyla Farazha
3b355848af
merge
2010-12-07 13:41:38 -08:00
Leyla Farazha
27d6f0e49c
EXT-3265 Gear menu on_visible params are broken - not setting visibility of menu items
...
EXT-2923 [BSI] My own inspector lists "Stand Up" as an option in gear menu, while I'm standing
2010-12-07 13:39:56 -08:00
Paul Guslisty
2b4fc69b1f
Fixed low bug EXT - 3244 ('No people' is visible partly in the empty Recent list)
...
--HG--
branch : product-engine
2009-12-09 13:32:18 +02:00
Vadim Savchuk
cc6f28432e
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-09 12:47:36 +02:00
richard
7a05356749
EXT-2572 - Bottom text on bottom line in nearby chat is clipped
2009-12-08 18:43:32 -08:00
richard
08233e283d
added fading back to icons in text widgets
2009-12-08 14:34:44 -08:00
richard
9aa12417cb
ext-3087 - avatar icon is truncated badly
...
reviewed by James
2009-12-08 14:08:58 -08:00
Eugene Mutavchi
25b8258d81
Fixed low bug EXT-3058 ('Save Pick' Button Inoperable When Edit Only Involves Deleting Text from the Description)
...
--HG--
branch : product-engine
2009-12-08 22:27:33 +02:00
richard
fa4d3e1867
Merge
2009-12-08 11:43:38 -08:00
Vadim Savchuk
d87c492d72
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-08 15:27:20 +02:00
Dmitry Zaporozhan
e6210e82d3
Update for normal task EXT-3089 - Notification toasts positioning, layering and stacking.
...
Improved functionality, cleaned code.
--HG--
branch : product-engine
2009-12-08 12:17:10 +02:00
Roxie Linden
1147cb1afb
Automated merge from trunk
2010-03-01 18:09:04 -08:00
Roxie Linden
b11a625e6f
Automated merge with a few fixups for code review comments
2010-03-01 15:31:04 -08:00
Roxie Linden
a2efe4bb41
automated merge
2010-02-26 19:18:15 -08:00
Roxie Linden
5352954eb6
automated merge
2010-02-26 17:34:39 -08:00
Roxie Linden
13d4257868
automated merge
2010-02-26 12:02:34 -08:00
Roxie Linden
2d7697dfad
automated merge
2010-02-26 01:52:28 -08:00
Roxie Linden
5c73a90835
automated merge
2010-02-25 21:20:45 -08:00
Roxie Linden
9b05fecbf6
automated merge from trunk
2010-02-25 18:24:07 -08:00
Roxie Linden
5ed6e0720a
warn-on-failure:unix-eol
...
automated merge from trunk
2010-02-25 16:50:21 -08:00
Roxie Linden
0ac14158bc
automated merge from trunk
2010-02-25 14:12:18 -08:00
Roxie Linden
92cef0426d
automated merge from trunk
2010-02-25 11:33:56 -08:00
Roxie Linden
c6163fafaa
automated merge
2010-02-25 01:34:52 -08:00
Roxie Linden
0bf246ed66
Automated merge
2010-02-25 00:17:42 -08:00
Roxie Linden
a9867b6437
Automated merge
2010-02-24 18:28:19 -08:00
Roxie Linden
6bb43e1369
Automated merge up from viewer 2.0 trunk.
...
Some llvoiceclient changes duplicated changes that had already been
made in the voice modularization refactor, so the refactor versions
were used.
2010-02-24 17:04:48 -08:00
richard
fdf8602d5f
fix for inline widgets never shrinking with resizable text editor
...
also fixed dropping last line in chat history
2009-12-07 19:03:31 -08:00
richard
f96a914310
merge
2009-12-07 16:05:59 -08:00
Steve Bennetts
0b4b03fe3e
Merge from product-engine
2009-12-07 15:57:31 -08:00
James Cook
2e5d22357f
EXT-3062 Inspector affordance should spawn closer to mouse
...
Reduced some size constants. Trivial, not reviewed.
2009-12-07 15:47:10 -08:00
richard
3cf11892e4
fix for horizontal scrolling in text_editors
2009-12-07 15:34:19 -08:00
James Cook
81c18d5442
EXT-3159 Mouse-wheel scrolling down causes unexpected side-scrolling
...
If vertical scroll bar is visible, give it the scroll events and
don't scroll horizontally. Eliminated extraneous folder view item
scroll handler. Reviewed with Richard.
2009-12-07 15:15:52 -08:00
richard
a162a8de97
merge
2009-12-07 13:46:30 -08:00
richard
1d2a8e0f83
ext-3112 - bad font width information with sansserif
2009-12-07 13:00:40 -08:00
Denis Serdjuk
da8de2b674
implemented Task EXT-2304 Offer Notifications should include a link that highlights the landmark or item in the appropriate side panel
...
Changes:
1.highlighting of landmarks was broken by LLInventoryPanel::getActiveInventoryPanel().
2. escaping of urls
--HG--
branch : product-engine
2009-12-07 19:42:11 +02:00
Vadim Savchuk
dc6ce7f782
Manual merge from default branch.
...
--HG--
branch : product-engine
2009-12-07 16:04:24 +02:00
Alexei Arabadji
6eee48e16e
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-07 15:15:57 +02:00
Alexei Arabadji
0a617f15a8
implemented EXT-2797 “Making friendship offer should be recorded into IM history”
...
--HG--
branch : product-engine
2009-12-07 15:15:41 +02:00
Nyx (Neal Orman)
938c51d2a4
merge to pull viewer-2 changes into avp
...
--HG--
branch : avatar-pipeline
2009-12-04 17:03:34 -05:00
Yuri Chebotarev
c6177836ec
no ticket, minor refactoring.
...
add return value to notifyXXX functions, may be usefull
--HG--
branch : product-engine
2009-12-07 12:04:27 +02:00
James Cook
fa8b2135f5
merge
2009-12-04 10:56:19 -08:00
Loren Shih
c9c9943098
automated merge viewer2.0->avp
...
--HG--
branch : avatar-pipeline
2009-12-04 13:50:32 -05:00
Loren Shih
92a1ecd5fd
EXT-3124 : Add lookup for finding all linked items to an item
...
Filter string now highlights when doing this search.
--HG--
branch : avatar-pipeline
2009-12-04 13:44:25 -05:00
Andrew Dyukov
1a7013d5cf
Implemented normal task EXT-2832 (Hide "undock" icon on the floaters).
...
--HG--
branch : product-engine
2009-12-04 19:28:27 +02:00
Leyla Farazha
3d6fa0a5f4
merge
2009-12-30 15:38:30 -08:00
Leyla Farazha
58d65d58a9
EXT-2823 Find window: change default open location to the top-left of screen
...
EXT-2921 [BSI] Default location for Screenshot Floater hides expanded options off screen
reviewed by James
2009-12-30 15:34:30 -08:00
James Cook
2fe5e55f4f
Hack for EXT-2971 Letter R doesn't show when it's the last letter in a text block.
...
Add 1 pixel of padding to clipping rect computation. I think there is a deeper
problem in the font width computation code, but I don't know where. Opened EXT-3112
for the deeper issue. Reviewed with Leyla.
2009-12-03 15:20:21 -08:00
James Cook
6c2101a44e
EXT-2984 Fixed crash in LLNormalTextSegment::getDimensions (no repro)
...
Avoid stepping off end of array when text segment has 0 characters
Reviewed with Ambroff
2009-12-03 09:32:05 -08:00
Denis Serdjuk
83c8f43f8d
implemented Task EXT-2304 Offer Notifications should include a link that highlights the landmark or item in the appropriate side panel
...
Changes:
This task had been already implemented. llurlentyinventory and llurlregistry have been changed to correct parsing of offer url
--HG--
branch : product-engine
2009-12-04 14:15:08 +02:00
James Cook
6684da77ca
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-02 16:22:01 -08:00
James Cook
eb7bba01d4
EXT-2572 partial fix for nearby chat text clipping at the bottom
...
Fixes 1 pixel of clipping caused by LLScrollContainer.
Text is still clipped by 1 pixel, down from 2.
Added more test text boxes to floater_test_textbox.xml
Reviewed with Leyla.
2009-12-02 16:02:43 -08:00
Sergey Borushevsky
69a2843d5b
Implemented normal task EXT-2833 ("Close" button should hide bottom bar windows)
...
When IM floater isn't torn off, "Close" button is disabled.
It's not hidden, since there is a hack in LLFloater::updateButton.
--HG--
branch : product-engine
2009-12-02 19:49:44 +02:00
Vadim Savchuk
f838c5d3ae
Merge from default branch.
...
--HG--
branch : product-engine
2009-12-03 17:10:43 +02:00
Yuri Chebotarev
6061c0fb5d
fix for EXT-1190 Accordion should support keyboard accessability
...
--HG--
branch : product-engine
2009-12-03 13:47:52 +02:00
Kent Quirk
f496c2b164
DEV-43622 : API change (no functionality change) to fix a design error in LLSD
...
I made it about a year and a half ago; Zero found it while reading code. I had added a return value to LLSD::insert(), but a) did it wrong, and b) broke the STL-like semantics of insert(). So I've put insert() back to returning void and created LLSD::with(), which does what my earlier insert() did. The compiler then caught all the cases where insert()'s return value were being used, and I changed those to use with() instead.
2009-12-01 20:59:08 -05:00
Leyla Farazha
6a38dd3bac
merge
2009-12-01 13:27:23 -08:00
James Cook
594f96b92e
Merge - backing out scroll container change
2009-12-01 11:45:11 -08:00
James Cook
0ae508c99b
Revert partial fix for EXT-2572 (chat history text clipping) that causes EXT-1597
...
(script editor scrolls upward while typing)
Backed out changeset: e38642e0c21c
2009-12-01 11:44:49 -08:00
Leyla Farazha
90572936e8
merge
2009-12-01 11:32:23 -08:00
James Cook
d5d1db8833
EXT-3015 Fixed right and center aligned text boxes
...
Document rect left edge was being computed incorrectly.
Made floater_test_textbox.xml have more examples of text.
Reviewed with Kelly
2009-12-01 11:29:33 -08:00
Leyla Farazha
dee4849616
EXT-2635 No message reminding user that a restart is required to reset cache (was Clear Cache)
...
EXT-2652 Favorites bar drop-down button (for when favorites exceed width of viewer) is not configurable via XUI
EXT-2227 [BSI] Preferences -> Setup -> Cache Location blank
EXT-1036 Clicking menu separators selects wrong menu option (allows selection of greyed-out option)
reviewed by James
2009-12-01 11:26:43 -08:00
James Cook
5e11affddb
merge
2009-12-01 08:51:32 -08:00
Rick Pasetto
b9de2b2572
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-30 16:01:34 -08:00
James Cook
6feb42e009
De-inlined some UI param block definitions.
2009-11-30 15:45:15 -08:00
James Cook
7d3b3cc474
Linker optimization - use "extern template" for commonly regenerated templates
...
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
Rick Pasetto
8671bfb930
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-30 09:15:34 -08:00
Tofu Linden
1b055428bb
merge.
2009-11-30 10:28:53 +00:00
James Cook
b50ba67bd8
Revert extern template link optimization until I can build/test on PC
2009-11-29 10:19:17 -08:00
James Cook
5531149ad1
Fix merge error
2009-11-28 21:25:53 -08:00
James Cook
e8b436591a
merge
2009-11-28 21:02:55 -08:00
James Cook
f280c43d61
Use extern template for common singletons to reduce code bloat/link time.
2009-11-28 16:51:02 -08:00
Andrew Dyukov
1cc80c60ca
Fixed major bug EXT-2774(Crash when trying to resize top Menu with
...
Fav bar and Nav bar closed).
--HG--
branch : product-engine
2009-11-27 19:25:33 +02:00
Eugene Mutavchi
b7001c640e
Fixed normal bug EXT-2932(Entering filter passes focus to the group list)
...
--HG--
branch : product-engine
2009-11-27 17:51:27 +02:00
Tofu Linden
cf485a384b
more fiddling and tracing.
2009-11-27 12:58:45 +00:00
Eugene Mutavchi
87ed47c914
Fixed the clipping of bottom pixels by LLScrollContainer, related to major bug EXT-2572 (the bottom of text on the bottom line in nearby chat is clipped)
...
--HG--
branch : product-engine
2009-11-26 22:43:13 +02:00
Vadim Savchuk
0b129e6e3e
merge
...
--HG--
branch : product-engine
2009-11-26 17:47:45 +02:00
Eugene Mutavchi
e6187ecaeb
Fixed low bug EXT-2746 ("All friends" list not scrolled when traversing it with arrow keys)
...
--HG--
branch : product-engine
2009-11-26 15:45:06 +02:00
James Cook
928b7cba3e
Linker optimization, use extern template for LLView::getChild<>
2009-11-25 22:00:15 -08:00
richard
9d52d15db8
fix for ellipses on a single line
2009-11-25 20:11:04 -08:00
richard
4885ddab8d
EXT-1944 - Implement ellipsis in message well
...
EXT-699 - Toasts should display maximum 6 lines of text before ellipses are applied
EXT-2453 - TextBox displays an extra line of text
2009-11-25 19:55:24 -08:00
richard
edcd835feb
fixed line numbering in script editors
2009-11-25 19:14:55 -08:00
richard
617ca79ed0
forgot to apply resize fix for when text is selected
...
EXT-1995 - [BSI] Get rid of the *blop* sound when a textbox contains more text than displayable
2009-11-25 18:55:15 -08:00
richard
cdb2232284
created container for LLFloaterView for future z-swapping with sidetray
...
floaters can now overlap sidetray
fixed text selection background color to be inverse of text fg color
EXT-2713 Script editor automatically scrolls to the top of script text when text is longer than the window.
reviewed by James
2009-11-25 18:24:39 -08:00
Rick Pasetto
3efbd20980
Implement fade-out for llprogressbar, fix problem where setTopCtrl was being called
...
Review #47
2009-11-25 14:39:05 -08:00
James Cook
957055396d
merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp
2009-11-25 12:31:24 -08:00
James Cook
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
James Cook
0e351bedb6
Removed llnotifications.h from all headers by adding llnotificationsptr.h
...
Fixed many more includes
2009-11-24 22:55:56 -08:00
James Cook
458430be91
Removed include llnotifications.h from llfloater.h trying to speed builds
...
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
James Cook
dcb1f0e862
Clean up some unused parameters noted in code review with Richard.
2009-11-24 15:57:32 -08:00
Steve Bennetts
5b5354c933
Merge
2009-11-24 15:36:50 -08:00
Bryan O'Sullivan
de78ec1345
Nuke the last few references to the long-dead LCD code.
2009-11-24 15:31:34 -08:00
James Cook
5e6fb96b0b
Expose floater close, etc. button images in XML.
...
Renamed EFloaterButtons to EFloaterButton
Review with Richard pending
2009-11-24 15:16:27 -08:00
Steve Bennetts
fb26dd7796
Merge
2009-11-24 15:05:13 -08:00
Eric M. Tulla (BigPapi)
07a396e311
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-24 16:12:01 -05:00
Steve Bennetts
9e2d78aca1
Merge from product-engine
2009-11-24 12:42:14 -08:00
Vadim Savchuk
b619f822e6
merge
...
--HG--
branch : product-engine
2009-11-24 21:55:23 +02:00
James Cook
81e6c0f6ef
Fixed double-semicolon. Last commit reviewed with Leyla.
2009-11-24 11:52:12 -08:00
James Cook
58ee415c49
Fixed line editor right padding to work when left padding also assigned
...
Eliminated UILineEditorHPad and added 2 px of padding to all custom line
editors.
EXT-1735 Show parcel property icons
Review with Leyla pending
2009-11-24 11:39:22 -08:00
James Cook
0b3f6b3e9a
Automated merge with ssh://hg.lindenlab.com/james/gooey/
2009-11-24 08:35:47 -08:00
Mike Antipov
0ef5b128aa
Work on critical sub-task EXT-2615 (IM Chat History is severely broken)
...
-- Improved calculating of the LLTextBase::mContentsRect to take into account "left" coordinate.
Previous implementation just ignored it.
--HG--
branch : product-engine
2009-11-24 13:17:19 +02:00
Dmitry Oleshko
06f638abdf
fixed normal bug (EXT-2653) Undocked IM floater blinks each time notification toasts fade away
...
- reduced a number of show-hide cycles for toasts
- only toasts showed for the first time will appear in foreground now (using of mFirstLook from LLFloater)
--HG--
branch : product-engine
2009-11-24 11:44:55 +02:00
angela
f27aff450f
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
2009-11-24 11:55:12 +08:00
angela
cfccf4d514
EXT-2780 allow_scroll = false in LLTextEditor will crash the viewer
2009-11-24 11:54:33 +08:00
James Cook
6634d3c1cc
Add damage % text to nav bar, clip text entry to avoid overlapping icons
...
Fixed includes of llmenugl.h / llnotifications.h
Note: Clipping is incorrect, I think due to line editor bug.
2009-11-23 18:16:03 -08:00
James Cook
620de712c4
merge, manual conflict fix panel_bottomtray.xml, talk_button.xml, llfloaternearbymedia.cpp
2009-11-23 14:46:47 -08:00
richard
dc88effc24
fix for infinite loop when doing /me emotes
...
reviewed by Mark
2009-11-23 11:44:03 -08:00
richard
7fd1488c62
convert signals to allocate on demand in order to speed up widget construction
...
reviewed by James
2009-11-23 11:42:32 -08:00
Eric M. Tulla (BigPapi)
9eb42546dc
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-23 11:55:33 -05:00
angela
e367e2efc2
EXT-2159 Create Vertical Slider to use for zoom in / out controls in view
2009-11-23 13:52:40 +08:00
Steve Bennetts
90b72b1c71
merge
2009-11-20 17:19:27 -08:00
Eric M. Tulla (BigPapi)
8580f840f3
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-20 19:28:48 -05:00
Eric M. Tulla (BigPapi)
a3930c7ff7
Inventory Offer changes and clickable inventory slurls
2009-11-20 19:27:33 -05:00
Vadim Savchuk
70a0dbe8f8
Renamed classes and files for "Me" task panel for better readability.
...
Renamed files:
- indra/newview/llpanelmeprofile.{cpp,h} to llpanelme.{cpp,h}
- panel_me_profile.xml to panel_me.xml
- panel_profile_user.xml to panel_my_profile.xml
Renamed classes:
- LLPanelAvatarMeProfile to LLPanelMyProfile
- LLPanelMeProfile to LLPanelMe
- LLPanelMeProfileEdit to LLPanelMyProfileEdit
--HG--
branch : product-engine
2009-11-20 22:57:59 +02:00
Eugene Mutavchi
c9101f603a
Implemented low task EXT-1153(FlatListView should support keyboard)
...
--HG--
branch : product-engine
2009-11-20 20:27:53 +02:00
James Cook
fc04d5bbb8
merge
2009-11-20 09:46:23 -08:00