6f256e2d57
Merge with dessie/viewer-release
2010-08-04 15:44:45 -07:00
6a1fefac22
Redo the same merge as in changeset "2026f824953f", but this time with feeeeling.
2010-08-02 16:59:20 -07:00
19c0d6d4ea
Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1
2010-07-30 10:11:55 -04:00
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
0e06dc8964
Merge from dessie/viewer-release
2010-07-27 14:13:07 -07:00
99176071bf
Merge from q/viewer-release just picking up 13634 (39cb633321ed) for the creator icon fix
2010-07-20 11:30:21 -07:00
d603085c03
Merge with dessie/viewer-release
2010-07-19 17:22:12 -07:00
5d85dad85f
Reverted changeset 2bb10eae42bf
2010-07-15 12:31:08 -07:00
1d1377079b
EXT-8300 FIX Creator's icon overlaps description text on object's mini-inspector
...
reviewed by Leyla
2010-07-14 11:48:33 -07:00
1f79bee86e
EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from 60fps to 18fps for a really long time
...
EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active
EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit
reviewed by Vir
2010-07-09 14:26:56 -07:00
5546f78fff
fixing windows line endings
2010-07-06 17:55:12 -07:00
33d1aa30ab
Merge from dessie/viewer-release
2010-07-06 17:51:07 -07:00
04838e411b
merge
...
--HG--
branch : product-engine
2010-07-02 15:27:08 +03:00
0cf9168895
EXT-5692 FIX Add callback to create widget segment with LLAvatarIconCtrl (or LLGroupIconCtrl) based on url match id.
...
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/610/
--HG--
branch : product-engine
2010-07-02 15:23:05 +03:00
187a4b638d
EXT-7654 - About Land Floater> Icons missing
...
fixed layout of embedded icons in text labels
2010-07-01 19:48:39 -07:00
86ba458ebc
merge fix
2010-06-21 15:04:12 -07:00
c897061856
Merge with q/viewer-release
2010-06-21 10:21:52 -07:00
f26eb91c44
EXT-7766 FIX change the order of processing url matching and linebreaks
...
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/596/
--HG--
branch : product-engine
2010-06-18 10:49:09 +03:00
884e08b509
EXT-6527 FIX Introduce new plain_text flag in LLTextBase and prevent image segment from being created if this flag is set.
...
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/587/
--HG--
branch : product-engine
2010-06-18 10:47:49 +03:00
380f472308
EXT-7833 FIX [crashhunters] Crash in LLTextBase::reflow()
2010-06-14 15:37:39 -07:00
0904b13cbb
EXT-7726 FIX didn't increase width if image segment didn't fit current line
...
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/557/
--HG--
branch : product-engine
2010-06-14 11:05:15 +03:00
75d3856811
EXT-7654 FIX "AddText" didn't create image segment now, use appendImageSegment
...
reviewed by Richard Nelson, Vadim Savchuk at https://codereview.productengine.com/secondlife/r/616/
--HG--
branch : product-engine
2010-06-22 15:50:34 +03:00
3e80a0e025
Merge from default branch
...
--HG--
branch : product-engine
2010-06-07 14:07:45 +03:00
6bbe55558f
EXT-7623 FIX One more place where text was processed into segments without LLLineBreakSegment.
...
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/516/
--HG--
branch : product-engine
2010-06-07 12:56:29 +03:00
46e1253ee1
DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the viewer
...
reviewed by Mani
2010-06-04 14:25:51 -07:00
fbf7279016
merge fixes
2010-06-03 14:37:02 -07:00
f79ac664dd
merge
2010-06-03 14:15:11 -07:00
3fe3e119d8
merge from PE's viewer-trunk
2010-06-03 11:18:17 +01:00
5c263cdc64
EXT-6333 FIX introduce new segments - LLLineBreakSegment and LLImageSegment
...
reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/241/
--HG--
branch : product-engine
2010-06-03 10:38:03 +03:00
6df66c35b3
fixed compile error
2010-06-02 14:43:45 -07:00
9e7cf5c1bc
eliminated several warnings on startup
2010-06-02 13:33:15 -07:00
2646eb8166
EXT-7557 - About Second Life > Credits does not open with scrollbar all the way at the top
...
also made floaters not update title label every time they are resized
2010-05-29 13:31:37 -07:00
efdfc298d4
Merge
2010-05-28 16:55:58 -07:00
2703125698
Backed out changeset: 13b29333f1db
2010-05-28 16:55:12 -07:00
7435ff08b5
DEV-50271 FIX SLURL support for non-clickable display names
...
separate mIsLink from mLink to support non-clickable urls (e.g. secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/completename)
2010-05-26 13:14:47 -07:00
0ebdba45f6
Merge with dessie/viewer-public to get Callum's webkit changes
2010-05-26 10:53:59 -07:00
a01de4d25f
EXT-7058 FIX Viewer freezes if IM chat floater with teleport offer is resized a few times
2010-05-26 10:10:20 -07:00
f682c996d2
DEV-50271 FIX SLURL support for non-clickable display names
2010-05-24 18:29:29 -07:00
4ea7d2de9f
DEV-50271 FIX SLURL support for non-clickable display names
...
reviewed by James
2010-05-24 17:25:35 -07:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
647327d0ec
Fixed normal bug EXT-6907 ('Show residents profile' menu opens inspector instead of profile) - added 'Url.ShowProfile' action.
...
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/282/
--HG--
branch : product-engine
2010-04-21 20:23:55 +03:00
6cc65f9e5f
merge
2010-04-01 12:52:04 -07:00
7b4046df83
EXT-3531 - Ctrl-P does not work reliably on login
2010-04-01 11:47:21 -07:00
ecc2c72650
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
2010-03-29 16:55:22 -07:00
e3e50bf7ed
added some comments for fix to EXT-5549
2010-03-23 12:47:11 -07:00
07bc1f0ba5
fixed line ending style where I copied from araxis merge window
2010-03-23 11:22:46 -07:00
91b90b0a17
EXT-5549 Can't select last character in chat window
2010-03-23 11:18:01 -07:00
d3a606f832
Manual merge from default branch.
...
Resolved conflicts in llpanellandmarks.cpp.
--HG--
branch : product-engine
2010-03-24 18:04:26 +02:00
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
f0d3ea53cd
Merge latest from viewer-hotfix, including fix for TOS screen
2010-03-10 20:32:56 -08:00
Leyla Farazha