ecafe4d8ab
fix more DOS line endings
2011-05-20 17:19:03 -04:00
f10384d014
merge changes for storm-941
2011-05-19 11:48:48 -04:00
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
93696ac019
merge
2011-05-12 17:39:08 -05:00
e18f200243
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-12 11:38:32 -07:00
09bdefabc6
merge changes for storm-1209
2011-05-11 20:05:22 -04:00
f1c4c9d237
EXP-806 FIX Server-side messages without a corresponding notification should show original, untranslated content
2011-05-10 17:11:05 -07:00
4440526a8e
STORM-1209 FIX Object continued sending messages after user adding this object to block list.
...
Applying Joshua's fix.
2011-05-10 18:58:40 +03:00
6428924827
EXP-776 WIP [crashhunters] crash in LLCloudLayer::decompress
...
EXP-777 WIP [crashhunters] crash in LLWind::decompress
added NULL check
2011-05-09 17:24:56 -07:00
4ad94507dd
EXP-623 (SUPPLEMENTAL FIX) Selecting fly option while on click to walk path
...
flys avatar to end point but avatar spins and shakes when arriving at click point.
2011-05-06 13:39:27 -07:00
a25f898703
merge
2011-05-02 14:52:12 -05:00
a32daa0c10
merge changes for vwr-25126
2011-05-02 07:24:15 -04:00
5a280f320e
merge changes for storm-956
2011-05-02 07:19:07 -04:00
89216a6c21
Merged with viewer-development.
...
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-29 14:23:27 -07:00
04f79f6358
STORM-956 Ability to mute dialogs by muting object (or object owner)
2011-04-15 13:13:15 -04:00
89db32944b
STORM-891 FIXED [HARDCODED] - ALL LANGS - Message showing up after setting your home is in English (French viewer)
...
- Added translation of the hardcoded string to the strings.xml
2011-04-14 19:24:39 +03:00
4993cfba34
STORM-941 FIXED IM history to use the resident's user name for the log file name.
...
Added conversions from legacy names or SLURLs with avatar id to the user names in cases of logging P2P sessions and inventory offers.
Removed asynchronous writes to temporary IM log file depending on name cache responses.
2011-04-13 18:13:02 +03:00
b5c834c6fd
merge changes for STORM-1051
2011-04-05 07:23:43 -04:00
93620a1dc8
merge changes for storm-1078
2011-03-15 12:34:41 -04:00
6336022ada
SOCIAL-661 FIX Receiving Inventory notification in Basic Mode
...
SOCIAL-654 FIX Items purchased on Marketplace.secondlife.com while logged into Minimal skin are declined and not present in inventory
2011-03-14 17:49:11 -07:00
9bac314ba0
Switched to using *_SQUARED constants instead of multiplied constants, and cleaned up a few other minor issues noted during review.
2011-03-12 23:39:10 -08:00
aac70bccad
Merge with tip of http://hg.secondlife.com/viewer-development (rev 14798)
2011-03-09 15:34:43 -08:00
174b537953
STORM-28 ADDITIONAL FIX Pressing "Show" button in the offer notification opens Inventory SP and selects the received calling card.
2011-03-09 23:01:58 +02:00
f9d70c41c9
SOCIAL-652 FIX Decline notification shown to users in minimal skin when they click on free one click objects
2011-03-08 12:42:15 -08:00
a6ff010dc1
ER-350: Viewer / sim camera positioning not working well on login. Viewer now sets the camera before calling send_agent_update(). Reviewed by Kelly.
2011-03-07 15:01:04 -08:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
c8293e29ca
Automated merge up from viewer-development into mesh-development
2011-03-09 11:24:54 -05:00
0929315ab1
Added headless client keyboard
2011-02-23 05:40:08 +00:00
8330a4d0fd
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
2011-02-19 00:17:12 +00:00
774405e92b
Cleanup of headless client (was: DisableRendering mode)
...
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
cb6d59513e
merge changes for storm-829
2011-01-31 12:32:57 -05:00
38f4bad925
Automated merge up from viewer-development
2011-01-21 10:36:29 -05:00
fd95de0e79
STORM-243 FIXED Disabled the "You just entered a region using a different server version..." pop-up notification.
2011-01-18 18:46:35 +02:00
d0b5e6b0b4
STORM-829 Viewer 2 does not parse /me in object Instant Messages
2011-01-06 06:07:11 -05:00
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
e4336b63b6
STORM-242 ADDITIONAL_FIX One more build fix...
2010-12-28 19:01:57 +02:00
d790003055
STORM-242 ADDITIONAL_FIX Fixed release build and error handling.
2010-12-28 14:30:52 +02:00
4d296c19e5
STORM-242 FIXED Fixed incorrect release notes URL in the "You just entered a region using a different server version" notification.
2010-12-27 21:47:06 +02:00
ee0055f5af
Automated merge up from viewer-development
2010-12-16 11:12:15 -05:00
31d401e1c3
STORM-401 FIXED Add recepients of teleport offers to the recent people list.
2010-12-13 18:38:12 +02:00
618249155a
Automated merge up from viewer-development
2010-12-13 10:08:55 -05:00
1e050c2ed8
merge
2010-12-02 14:33:42 -08:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
066d8c39ca
Automated merge with file:///Users/Bill/Projects/viewer-release
2010-11-19 14:11:42 -08:00
f6ba55b8ed
merge fix for STORM-138
2010-11-19 15:58:53 -05:00
3b85391839
Viewer 2.4 (as of 15 Nov 2010) with llTextBox support merged in
2010-11-16 18:10:18 -05:00
d0de833d94
STORM-563 FIXED Updated all localized XUI strings and notifications templates to use display names.
...
Previously name substitutions were broken, so "[FIRST] [LAST]" was displayed instead of avatar name.
Some of the affected notifications:
* avatar went online/offline notification
* object return notification
* calling card offer
* script dialog
* auto-unmute notification.
See the diff for more details.
The fixes apply to all locales but English (which is already correct).
Besides, I fixed calling card offer notification to display avatar name correctly. It was broken even in English.
2010-11-16 23:26:08 +02:00
50d21a75a7
merge
2010-11-15 15:52:54 -08:00
Oz Linden