7db4d2b88f
Fix for CHOP-220. Reviewed by mani.
2010-11-22 19:07:17 -08:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
77330d5c31
(hairy) merge from viewer-release
2010-08-10 14:04:35 +01:00
c70b05082f
patching from fixes made in dessie/viewer-release
2010-08-09 12:44:28 +01:00
854e6acb42
Merge with dessie/viewer-release
2010-07-30 18:07:35 -07:00
39c9ec49bf
EXT-8342 FIXED Fixed displacement of decription textbox in Place Profile after reshape.
...
Bug was reproducible on Windows and not on Linux because of different moment when onTopLost() was called for textbox.
On Windows it happened only after reshape, on Linux- before reshape. Made windows behaviour in case of top lost consistent with Linux behaviour.
- An if was added into LLPanelPlaceInfo::reshape to force collapsing description textbox on Windows at the beginning of reshape
(the only case when reshape is skipped there now is when it's caused by expanding/collapsing this textbox, so called_from_parent for panel is FALSE).
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/779
--HG--
branch : product-engine
2010-07-22 22:47:15 +03:00
4cd3844f05
merge from PE's viewer-trunk
2010-07-27 10:44:17 +01:00
9908fc1518
EXT-8391 FIXED Landmark creation and error handling.
...
- Added displaying error messages in Create Landmark panel upon remote parcel request fail.
- Moved landmark creation from LLPanelLandmarkInfo::processParcelInfo() because we use only agent's current coordinates instead of waiting for remote parcel request to complete.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/793/ .
--HG--
branch : product-engine
2010-07-26 16:14:23 +03:00
33d1aa30ab
Merge from dessie/viewer-release
2010-07-06 17:51:07 -07:00
625d90f690
EXT-8001 FIXED [TRUNCATION] [HARD CODE] IT - create new favorite title has truncated text
...
- Set tooltip for titles in PanelPlaces panel
- Also fixed translation of Favorites forlder in inventory. Corrected value of name attribute in strings.xml
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/676/
--HG--
branch : product-engine
2010-06-30 19:40:54 +03:00
d42dd9a1c1
EXT-7046 FIX User profile using wrong placeholder/generic profile pic art
2010-06-24 14:12:35 -07:00
3bbb622731
WIP Fix miscellaneous display names in UI
2010-05-28 08:21:33 -07:00
18ebacefcf
Merge with viewer 2 beta 4
2010-03-08 10:54:23 -08:00
087ea1cef6
Fixed normal bug (EXT-5748) Useless area on Place Profile panel.
...
- Reduced unused size in Place Profile and Landmark Info panels.
--HG--
branch : product-engine
2010-02-25 18:47:28 +02:00
88350edbcb
merge
2010-02-03 14:13:56 -08:00
146e9d5e4d
Support returning full_name (and SLID) for LLCacheName::get() calls
...
Changed callback signature to full_name instead of first_name,last_name
Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
Change Pay dialog names to SLURL links
Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit
Consolidate name first + " " + last concatenation in LLCacheName::buildFullName()
Reviewed with Kelly
2010-02-01 17:06:18 -08:00
1afc7ecc14
CID-388
...
Checker: UNINIT_CTOR
Function: LLPanelPlaceInfo::LLPanelPlaceInfo()
File: /indra/newview/llpanelplaceinfo.cpp
2010-01-27 16:11:32 -08:00
5344f82e28
Fixed normal bug (EXT-4720) N/A is displayed in the Create Landmark panel while data is retrieved.
...
--HG--
branch : product-engine
2010-01-26 20:17:44 +02:00
09e9cdeb2e
No ticket, Includes cleanup. Spaces cleanup.
...
--HG--
branch : product-engine
2010-01-22 20:20:11 +02:00
16b1af72b2
Fixed (EXT-4589) 'About Land' floater loose information after user quit Place Profile
...
- Fixed Places panel not to remove parcel selection when it is used by "About Land" floater.
--HG--
branch : product-engine
2010-01-22 20:02:10 +02:00
0847789222
Fixed normal bug EXT-3409 "Places panel: pick for remote location created with current agent's coordinates".
...
- Fixed storing global position for remote location pick.
- Fixed setting current location to the pick.
- Fixed pick location text. Added resolving remote parcel name from ID.
- Cleaned up unused code in llpanelpick.
--HG--
branch : product-engine
2009-12-15 18:36:53 +02:00
1ea60591a9
Refactoring of llviewerprecompiledheaders.h to hopefully increase stability
...
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in
the long run this will reduce build time. Also cleaned up a lot of header
file usage to conform better to the coding standard.
reviewed by james and steve.
2009-11-13 20:33:59 -05:00
a27706ad2e
Fixed normal bug EXT-2461 "Edit Landmark panel isn't resized":
...
- Added vertical scroll appearing for Place Profile and Landmark info panels.
- Added horizontal reshaping to avoid redundant horizontal scroll.
--HG--
branch : product-engine
2009-11-18 19:49:49 +02:00
9c5d1fd3bd
- Reverted fix for normal bug EXT-2016 "Place Profile panel isn't resized". The reason is that some unnecessary free space is left in Place Profile panel.
...
- Cleaned up obsolete code from Place Profile panel.
--HG--
branch : product-engine
2009-11-09 18:50:55 +02:00
e360a44464
Fixed normal bug EXT-2314 "Restore maturity rating in "Landmark" and "Teleport History" views":
...
- Added rating icons and text to "Landmark" and "Teleport History" views.
- Removed code for "Last Visited" from Teleport History.
--HG--
branch : product-engine
2009-11-07 17:20:52 +02:00
380bb0ce09
No ticket. Removed extra includes. Fixed copyright years.
...
--HG--
branch : product-engine
2009-11-04 15:24:11 +02:00
2715e94a5a
Implemented major task EXT-2054 "Hook up parcel permission icons to parcel profile":
...
- Added icon representation of parcel permissions to Place Profile panel.
--HG--
branch : product-engine
2009-11-04 14:33:00 +02:00
ed40da6795
Implemented sub-task EXT-1452 '"places" title should not be on this
...
panel':
- Made LLPlaceInfo a base class for two derived LLPlaceProfile and LLLandmarkInfo classes each representing a separate panel with its own XUI layout.
- Fixed broken title change for Place Profile and Landmark cases.
--HG--
branch : product-engine
2009-11-03 19:13:36 +02:00
40197ed64f
fixed Bug EXT-2058 Viewer crash after disconecting when Panel Place Profile is opened
...
Cause:
idle callback was called after viewer had been disconnected and agent's region object was NOT available.
--HG--
branch : product-engine
2009-11-02 14:52:06 +02:00
cdefaf5efa
Implemented EXT-1832 'Landmark title - Coordinates should be in second line'.
...
--HG--
branch : product-engine
2009-10-28 22:57:50 +02:00
515ce7fdbb
Fixed normal bug EXT-1834 - Check spacing on landmark detail paragraph.
...
--HG--
branch : product-engine
2009-10-28 16:44:02 +02:00
2bb9751d0a
EXT-1232 Implement \"You are Here\" banner for Place Profile - Parcel Characteristics
...
Note:
\"YouAreHereDistance\" setting has been added to setting.xml
--HG--
branch : product-engine
2009-10-28 13:56:02 +02:00
d0d9d4a9b0
fixed normal bug EXT-1630 Edit Landmark: Current landmark place should be selected by default in the \"Place Landmark In\" picklist
...
--HG--
branch : product-engine
2009-10-23 23:28:04 +03:00
642d368ecc
merge
2009-10-21 18:49:19 -07:00
0041d485b1
Merging revisions 2129-2144 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
...
* Bugs: EXT-1293 EXT-1611 EXT-1613 EXT-1176 EXT-1724 EXT-1186 EXT-1662 EXT-1760 EXT-1720
* Dev: EXT-1575 EXT-1770 EXT-1232 EXT-1234
2009-10-22 00:21:18 +00:00
65bf35cfed
merge
2009-10-19 10:49:48 -07:00
ea1bfae838
Merging revisions 2070-2084 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
...
* Bugs: EXT-792 EXT-1519 EXT-1514 EXT-1245 EXT-1600 EXT-1535 EXT-1174 EXT-1241
* Dev: EXT-1271 EXT-1601 EXT-1154
2009-10-19 02:17:01 +00:00
3e10fa4d51
merge from latest svn/viewer-2-0 to hg/viewer-2-0
2009-10-16 16:42:45 -07:00
276e80ce36
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1967 https://svn.aws.productengine.com/secondlife/pe/stable-2@1971 -> viewer-2.0.0-3
...
* Bugs: EXT-1431 EXT-1237 EXT-1151 EXT-1165 EXT-1410 EXT-1419
* Dev: EXT-1232
2009-10-12 08:20:00 +00:00
81e0fb43ca
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1943 https://svn.aws.productengine.com/secondlife/pe/stable-2@1958 -> viewer-2.0.0-3
...
* Bugs: EXT-1148 EXT-1330 EXT-990 EXT-1259 EXT-1184 EXT-1327 EXT-1389 EXT-1276 EXT-1390 EXT-1396 EXT-1050 EXT-1094 EXT-1166 EXT-1137 EXT-1327 EXT-782 EXT-1137 EXT-1394 EXT-1326 EXT-917 EXT-1262
* New Dev: EXT-1292 EXT-1139
2009-10-09 00:42:36 +00:00
50247533f9
Merged latest viewer/login-api with latest viewer/viewer-20
2009-10-07 17:51:28 -07:00
ae0827d387
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1908 https://svn.aws.productengine.com/secondlife/pe/stable-2@1917 -> viewer-2.0.0-3
...
* Bugs: EXT-1257 EXT-1299 EXT-1149 EXT-1117 EXT-1134
* New Dev: EXT-721
2009-10-07 07:09:34 +00:00
4d53e235c2
merge of latest viewer/viewer-20
2009-10-02 10:35:42 -07:00
606b381c9f
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3
...
JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180
* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator
QA NOTES:
* Message Well Window is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed
2009-09-29 19:37:05 +00:00
bb1d4592bd
Merged latest viewer/viewer-20 into login-api.
2009-09-18 15:22:25 -04:00
brad kittenbrink