Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Vadim Savchuk f5fa5dbb25 merge
--HG--
branch : product-engine
2010-03-26 21:06:57 +02:00
Eugene Mutavchi ac141e1862 Related to normal bug EXT-6345 (SLapp group profile does not display group name.) - fixed group info panel title to show "Loading..." while waiting for group info.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/124/

--HG--
branch : product-engine
2010-03-26 20:45:04 +02:00
Loren Shih 46fe5d49ca EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
Eugene Mutavchi aebfa2f6f3 Fixed normal bug EXT-6353 (SLapp chat cannot chat spaces).
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/119/

--HG--
branch : product-engine
2010-03-26 20:22:52 +02:00
Loren Shih 0bcfbde3a4 EXT-6536 : Make LLVOAvatarSelf a singleton
Lots of superficial cleanup, particularly around "if (" formatting.
Removed LLAgent as a friend of LLAgentCamera and refactored to use accessors.
2010-03-26 13:58:19 -04:00
Vadim Savchuk b7d0bb9e1e Fixed bug EXT-6399 (System locale is the same for all languages).
Problem:
* English locale was set for all languages.
* Specifying a correct locale didn't affect anything, including date/time formatting.

My investigation has shown that LLStringUtil was instantiated twice: in the
main binary and in libllcommon.so.
Because LLStringUtil::setLocale() was called from newview and getLocale()
was called from llcommon, they effectively used *different* instances of
LLStringUtil::sLocale. Hence getLocale() always returned empty string.

This seems to be caused by get/setLocale() methods not being dllexported.

The fix instantiates get/setLocale() and sLocale in llcommon and exposes
them to use from newview (i.e. prevents multiple instantiation).

Besides, I specified correct locale names for all languages and platforms.

Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/104/

--HG--
branch : product-engine
2010-03-26 19:09:11 +02:00
Vadim Savchuk 5a12802503 Fixed bug EXT-6268 (Group spawns Resident inspector when called from About Land > Objects for group deeded object)
Reason: groups were added to the list as avatars, which led to invoking
incorrect inspector on hover.
Also added a fix for potential crash on hovering name list items.

Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/110/

--HG--
branch : product-engine
2010-03-26 19:02:14 +02:00
Vadim Savchuk a5227864bd Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp.

--HG--
branch : product-engine
2010-03-26 19:00:27 +02:00
Kent Quirk 1ed3117a6d Backed out changeset 686628355e4a as it caused a crash. 2010-03-26 11:38:42 -04:00
Mike Antipov 3f3c9c7e25 Fixed normal bug EXT-5116 (Voice notification should display on top of IM window, not under.)
Replaced sending voice notifications to front (in floater view) with adding them to popup view.
In this case Voice Notifications are shown on top even IM window has focus. And Resident can continue enter the text when Voice notification is shown.

Reviewad by Vadim at https://codereview.productengine.com/secondlife/r/120/

--HG--
branch : product-engine
2010-03-26 17:08:32 +02:00
Mike Antipov be66b52057 Fixed normal bug EXT-6448 (People -> My Friends list has overlapping text at the top covering the first few contacts.)
Unfortunately I was unable to reproduce this bug. But I have some idea about the reason of it.
Decision to show or not the help text based on count of people in Inventory/Calling Cards/Friends/All list. So, if this list is empty even if Resident has some friend (and at least one of them is online) both help text & online list were shown at the same time.

The reason of why Friends/All can be empty in inventory can be clean cachу & slow connection to upload it from the server. But I could not reproduce it.

So, the fix is to check both all friends & online friends lists to prevent overlaping in the future.

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/118/

--HG--
branch : product-engine
2010-03-26 16:44:43 +02:00
Kent Quirk d2cbc6c5b6 Fix for EXT-3818 -- back out some code that was put in for EXT-6373, but overreached. 2010-03-26 10:43:07 -04:00
Yuri Chebotarev 35b5b5e2a3 merge
--HG--
branch : product-engine
2010-03-26 16:32:38 +02:00
Yuri Chebotarev e962b8418f fix for
EXT-6475 Scrollbar in the Notices panel is semitransparent and overlaps controls
(also for EXT-6374  Side Panel> Create a Notice> dialog boxes overrun up/down slider)
https://codereview.productengine.com/secondlife/r/100/
reviewed Leyla Farazha ,vsavchuk

--HG--
branch : product-engine
2010-03-26 16:29:47 +02:00
Kent Quirk 3eca1e1ff9 EXT-6514 -- backing out my incorrect fix for this and putting in the one from PE. 2010-03-26 10:23:21 -04:00
Loren Shih b74e1d9423 automated merge 2010-03-26 10:16:41 -04:00
Dmitry Zaporozhan 379517ce5e Fixed normal bug EXT-6070 - Truncated strings in window to buy linden dollars
Increased textbox width. French translation is the longest so other languages will be ok.

Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/114/

--HG--
branch : product-engine
2010-03-26 14:39:46 +02:00
Dmitry Zaporozhan 56fa20e168 Fixed major bug EXT-6544 - remove Admin > God Tools > Grid > Kick All Residents button.
Removed "Kick all" button and corresponding code.

Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/117/

--HG--
branch : product-engine
2010-03-26 14:38:03 +02:00
Paul Guslisty b846bc1fe4 Fixed normal bug EXT-6331 (Gestures floater has an extra column titled \"1\")
- Corrected wrong indexes at the point of adding gestures to the gestures list.
Problem probably is a result of 'copy & paste'.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/113/

--HG--
branch : product-engine
2010-03-26 14:21:50 +02:00
Tofu Linden a4741cdd10 merge from viewer-2-0 2010-03-26 08:55:58 +00:00
Tofu Linden 6a1677d9e5 If the EXT-5854 fix is correct, this assert no longer makes sense.
(transplanted from 3bef6f249a0ab74f823e67fb32339abb92b13165)
2010-03-26 08:54:58 +00:00
Tofu Linden 6acaa5fe30 If the EXT-5854 fix is correct, this assert no longer makes sense. 2010-03-26 08:54:58 +00:00
Alexei Arabadji 65ed2a4231 Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG--
branch : product-engine
2010-03-26 10:29:28 +02:00
Alexei Arabadji 4b847b4388 fixed EXT-6373 “Consecutive offer messages are unreadable in the IM log”,
replaced [NAME] with [NAME_SLURL] in teleport offer notification, this will unify offers appearance and gap between offers in IM chat log with disabled plaintext mode;

--HG--
branch : product-engine
2010-03-26 10:28:57 +02:00
Paul Guslisty 4d8338ff3e Fixen normal EXT-6434 (Mini Map does not go transparent when not in focus)
- Set background opaque of the floater depending on focus and made map's background color transparent

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/99/

--HG--
branch : product-engine
2010-03-26 09:47:42 +02:00
Loren Shih 0a56031bd3 automated merge 2010-03-25 20:15:51 -04:00
Loren Shih 885fc3f9b5 EXT-6536 : Make LLVOAvatarSelf a singleton
Minor superficial cleanup to have all references to getAvatarObject use LLVOAvatarSelf *avatarp = gAgent.getAvatarObject()
2010-03-25 19:56:52 -04:00
Eli Linden 6bee636a8b FR linguistic 2010-03-25 16:46:44 -07:00
Xiaohong Bao fad31dc087 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-03-25 17:46:36 -06:00
Eli Linden ff91cb1f79 VWR-18445 en_xui_change for DE truncation; remove old DE hard returns; FR linguistic 2010-03-25 16:44:58 -07:00
Loren Shih 8a75b90709 EXT-6536 : Make LLVOAvatarSelf a singleton
Minor superficial cleanup to use proper naming conventions.
2010-03-25 19:42:08 -04:00
Xiaohong Bao 2e47e6d816 fix for EXT-5854:Unable to Pay Object That Features Transparant (alpha) Texture.
(transplanted from 3939f139f6caff2bb192a2afde18e51aada4d57a)
2010-03-25 17:21:39 -06:00
Xiaohong Bao 6f179fc6ac fix for EXT-5854:Unable to Pay Object That Features Transparant (alpha) Texture. 2010-03-25 17:21:39 -06:00
Xiaohong Bao 09d488e20b more fix for EXT-5711: Some textures loading from cache seems jammed.
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-03-25 17:14:27 -06:00
Xiaohong Bao 7de49ce1d1 fix for EXT-6435: crash at writeEntriesAndClose: ASSERT (num_entries == mHeaderEntriesInfo.mEntries) 2010-03-29 11:32:47 -06:00
Xiaohong Bao a0022e65ec fix for EXT-6566: crash at LLTextureCache::updatedHeaderEntriesFile [secondlife-bin lltexturecache.cpp:1292] 2010-03-29 11:28:42 -06:00
Xiaohong Bao 7bd603544e add some debug code for EXT-5394: Crash in LLViewerMediaImpl::calculateInterest() 2010-04-02 10:33:20 -06:00
Xiaohong Bao 8dd401e4a1 fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin lltexturecache.cpp:1111] 2010-04-01 11:39:01 -06:00
Xiaohong Bao 88df86bcc3 fix for all wierd crashes happening to lltexturecache.cpp, cuased by running viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras:
EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145]
EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126]
possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-07 11:51:41 -06:00
Xiaohong Bao 4a8b13e4fd Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix 2010-04-08 22:39:52 -06:00
Mark Palange (Mani) 3b9e4f43ed Enabling Watchdog. 2010-04-08 17:40:17 -07:00
Xiaohong Bao d34588b7a7 fix for EXT-6278: profile picture is blurry / fuzzy if IM is opened first. 2010-04-08 17:08:32 -06:00
Monroe Linden e02e45fd76 Fix for EXT-6615 (SL webkit no longer reports "Second Life" in the HTTP_USER_AGENT)
The issue here is that initBrowserWindow() was doing the wrong thing if it got called after the set_user_agent message was received.

Made the handler for the set_user_agent message save the string in a member variable (mUserAgent).

Initialize mUserAgent to the default string in the MediaPluginWebKit constructor.

initBrowserWindow() now sets the user agent string from mUserAgent instead of from a literal.
2010-03-29 18:36:47 -07:00
Richard Linden b69a454aab merge 2010-04-08 16:43:48 -07:00
Richard Linden 70bbcf7c2d EXT-5849 - crash in LLView::drawChildren()
added logging to help track down cause
2010-04-08 16:41:56 -07:00
Tofu Linden 02d3106885 merge from PE's viewer-hotfox 2010-04-08 12:23:13 +01:00
Tofu Linden cc9d069722 Update Linux build of qt/llqtwebkit. For DEV-47911.
revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch)
revision 8eff99f78fb0 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'default' branch)
2010-04-07 15:34:24 +01:00
Xiaohong Bao 81350ec5a9 more fix for EXT-5711: Some textures loading from cache seems jammed.
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-03-25 17:14:27 -06:00
Eli Linden bb53ecc458 VWR-18451 en_xui_change for DE truncation; remove invalid DE name in mime_type.xml; remove invalid attributes in floater_about_land and the extra .. in "set" button translation 2010-03-25 16:08:56 -07:00
Leyla Farazha 091e4c2bdc Merge 2010-03-25 16:07:21 -07:00