Loren Shih
38f4bad925
Automated merge up from viewer-development
2011-01-21 10:36:29 -05:00
Joshua Bell
dee9c80862
merged
2011-01-13 12:16:54 -08:00
Joshua Bell
20b983afe0
VWR-24401 Show TOS and other login dialogs when --login is used
2011-01-13 11:52:58 -08:00
Loren Shih
584c7ecb4e
Automated merge up from viewer-development
2011-01-13 10:28:15 -05:00
Seth ProductEngine
376ee7a3f9
STORM-797 FIXED Added parcel SLURL rendering with human readable parcel names.
...
- Added parcel info observer to LLUrlEntryParcel.
- Added notifying LLUrlEntryParcel by LLRemoteParcelInfoProcessor when parcel data arrives.
- Added notifying LLUrlEntryParcel about user login, changing host and viewer connection state to use this data in remote parcel requests.
2010-12-30 18:18:33 +02:00
Loren Shih
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
Merov Linden
f8325ac588
STORM-805 : add some printout to the log so we can trace the answer map-server-url at startup
2010-12-22 22:09:42 -08:00
Merov Linden
36207fcf1a
STORM-805 : Fix the map URL
2010-12-20 12:59:17 -08:00
Loren Shih
618249155a
Automated merge up from viewer-development
2010-12-13 10:08:55 -05:00
Monroe Linden
1e050c2ed8
merge
2010-12-02 14:33:42 -08:00
Loren Shih
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
Bill Curtis
066d8c39ca
Automated merge with file:///Users/Bill/Projects/viewer-release
2010-11-19 14:11:42 -08:00
Bill Curtis
cb8b30864f
fixed typo
2010-11-19 14:01:30 -08:00
Bill Curtis
c5e5af4219
added logging and default value for max-agent-groups
2010-11-18 10:37:45 -08:00
Richard Linden
50d21a75a7
merge
2010-11-15 15:52:54 -08:00
Brad Payne (Vir Linden)
d9c0e0ba74
SH-275 FIX: non-production grids now default to different source of map tiles
2010-11-12 17:31:27 -05:00
Bill Curtis
31e0c9122e
fixing transposed characters
2010-11-09 10:25:11 -08:00
Bill Curtis
3fa059409a
changes to read max-agent-groups from login.cgi response
2010-11-08 10:54:58 -08:00
callum
34ca69949f
Reworked fix for EXP-167 Add option to quit instead of going back to login screen
2010-10-11 16:36:59 -07:00
callum
f65bd3c1f1
Fix for Reopened EXP-167 Add option to quit instead of going back to login screen.
2010-10-08 16:41:33 -07:00
callum
dd2eff8da2
EXP-167: Quit On Login Page Activated - viewer code /default setting
2010-10-07 12:08:03 -07:00
Roxie Linden
8766f321d8
automated merge
2010-10-15 11:31:39 -07:00
Roxie Linden
2f9da36712
automated merge
2010-10-13 12:37:12 -07:00
Roxie Linden
17a04f8231
EVE-47 - Event formatting should appear in "Profile" window
...
EVE-74 - Change in-viewer support for 'notify me' to be maintainable via app slurl
EVE-72 - Modify viewer to make the event profile window be an html control
This is basically a reworking of the event profile display to remove all in-viewer
specific event display rendering, in preparation for richtext descriptions.
Most was removal of code.
2010-10-12 17:49:36 -07:00
Leyla Farazha
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
Aimee Linden
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
Aimee Linden
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
Monroe Linden
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
Richard Linden
093e83386d
merge
2010-08-26 12:49:00 -07:00
Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
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
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
Tofu Linden
ce1a0c6baf
Final(???) merge from viewer-release to viewer-public.
2010-08-24 14:52:05 +01:00
Sergei Litovchuk
bbf4bc88b8
EXT-7083 FIXED initializing the viewer preferred maturity with the value received from the server on login.
...
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/863/ .
--HG--
branch : product-engine
2010-08-17 17:09:23 +03:00
Richard Nelson
014a4f3dc9
fixed progress view z ordering hacks
...
DEV-52665 FIX Inventory and Chat hints shown during login before viewer fully loads on load up screen
2010-08-13 13:31:17 -07:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Mike Antipov
e51c91a8fc
EXT-7706 FIXED Implemented delayed friends cards synchronization and filling People/Friends tab with data until it is visible to user first time.
...
* Moved location of synchronization of the Friends/All inventory folder with friends list from startup to first requesting of data.
* Also updated "update Friends list" logic to be really trigged only when Friends tab is visible to user.
NOTE:
* Friends List/All is filled with some delay on first opening.
TODO: refactoring is needed to switch code of updating People/nearby list to use the same approach as for Friends.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/805/
--HG--
branch : product-engine
2010-07-29 15:52:36 +03:00
Aimee Linden
e48e1e32d8
Bury the dead code day: Removed LLFloaterParcelInfo, LLFloaterURLDisplay and LLPanelPlace
...
Moved LLParcelHandler from now defunct llfloaterparcel.cpp to llpanelplaces.cpp
2010-07-19 13:23:19 +01:00
Leyla Farazha
33d1aa30ab
Merge from dessie/viewer-release
2010-07-06 17:51:07 -07:00
Aimee Linden
81f5c02414
EXT-7498 WIP Snapshot Sharing
...
Reviewed by Tofu.
2010-06-28 16:30:08 +01:00
Brad Payne (Vir Linden)
4eab82d5e2
merge
2010-06-21 15:54:02 -04:00
Leyla Farazha
c897061856
Merge with q/viewer-release
2010-06-21 10:21:52 -07:00
Brad Payne (Vir Linden)
8aef04f33c
EXT-4919 WIP - fixed problems with inventory fetch failing to time out, added copying/activation of more gesture folders
2010-06-21 11:56:59 -04:00
Dave Parks
cb50a2395b
merge
2010-06-17 20:47:41 -05:00
Brad Payne (Vir Linden)
347e88961c
EXT-4919 WIP - populating new users with more gestures, and activating appropriate ones
2010-06-17 17:37:28 -04:00
Richard Linden
8d84b6e82d
EXT-7811 FIX Crash to desktop during SL login
2010-06-17 13:53:19 -07:00
Dessie Linden
74817f151f
Merged from q/viewer-release
2010-06-17 07:42:08 -07:00
Leyla Farazha
83a7a342ea
removing fullscreen functionality
...
reviewed by richard cc#212
2010-06-15 17:21:27 -07:00
Yuri Chebotarev
0573e7e584
merge
...
--HG--
branch : product-engine
2010-06-14 15:34:39 +03:00
Yuri Chebotarev
664a07dd8d
EXT-7727 FIX reset sidetray tab to home_tab when login is complete.
...
Aslo add parameter to callback to prevent showing appearance panel when creating initial outfit - _sometimes_ this callback was called _after_ login was finished.
rewieved by Mike Antipov at https://codereview.productengine.com/secondlife/r/574/
--HG--
branch : product-engine
2010-06-14 14:59:56 +03:00