b95bd0dc27
Backed out changeset 68feae2ef00a
2010-06-15 14:41:01 +01:00
0e5347432c
EXT-7498 WIP Hide share to web button until the code behind it is complete.
2010-05-28 22:42:19 +01:00
ea7047579d
automated merge
2010-05-28 17:01:46 -04:00
bb973c38e3
automated merge
2010-05-28 13:58:49 -07:00
7efaa216a1
EXT-7504 WIP Force decloud after timeout using lower res textures
...
Code cleanup.
Some minor changes in logic for when low res texture is used.
Added more metrics to notifications and texture debug output.
2010-05-28 16:45:23 -04:00
285c4c47f5
EXT-7505 FIX stuck in appearance edit mode if close appearance sidebar
...
Added a check for visibility changes that should prevent users from getting
"stuck" in appearance editing mode by closing the appearance editor
prematurely (clicking sidebar hide, etc).
Camera state should be restored when panel is restored.
reviewed by Seraph
2010-05-28 16:20:00 -04:00
d427942d95
EXT-7466 - [BROKEN STRING] the word "administrator" is broken in strings.xml in 2 places
...
Simple fix
2010-05-28 12:26:29 -07:00
1fe7b13d1f
automated merge
2010-05-28 12:10:29 -07:00
a5c9e30fc8
automated merge
2010-05-28 15:01:45 -04:00
df853b1066
Fix for compile error in lltexlayer.cpp
2010-05-28 15:01:22 -04:00
3f5abfb2bf
ND-46735 WIP FR JA linguistic
2010-05-28 11:47:38 -07:00
b7bfc3ae7a
automated merge
2010-05-28 14:08:38 -04:00
0b96ae29cf
Fixed linux compile error due to missing forward declare in lltextureview.h.
2010-05-28 14:02:44 -04:00
7983de2207
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-05-28 11:39:28 -04:00
e07deaa3da
AVP-44 WIP architectural cleanup for multi-wearables
...
Implemented some resident-suggested tweaks to better support multiwearables
code reviewed by Seraph
2010-05-28 11:38:37 -04:00
955698c7a6
automated merge
2010-05-28 10:41:17 -04:00
7e0b36d610
CID-442
...
Checker: FORWARD_NULL
Function: LLBasicCertificateVector::insert(LLCertificateVector::iterator, LLPointer<LLCertificate>)
File: /indra/newview/llsechandler_basic.cpp
2010-05-28 12:47:45 +01:00
58fb834a6e
CID-443
...
Checker: FORWARD_NULL
Function: LLBasicCertificateVector::BasicIteratorImpl::equals(const LLPointer<LLCertificateVector::iterator_impl> &) const
File: /indra/newview/llsechandler_basic.h
2010-05-28 12:46:31 +01:00
6f8e96159a
CID-448
...
Checker: UNINIT_CTOR
Function: LLVoiceClient::LLVoiceClient()
File: /indra/newview/llvoiceclient.cpp
2010-05-28 12:41:54 +01:00
3927d18327
CID-466
...
Checker: NULL_RETURNS
Function: LLInventoryItemsList::refresh()
File: /indra/newview/llinventoryitemslist.cpp
2010-05-28 12:31:43 +01:00
878e1d06d5
CID-476
...
Checker: NULL_RETURNS
Function: LLPanelEditWearable::updateScrollingPanelUI()
File: /indra/newview/llpaneleditwearable.cpp
2010-05-28 12:20:06 +01:00
14e03b56fc
CID-480
...
Checker: UNINIT_CTOR
Function: LLVivoxVoiceClient::participantState::participantState(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/newview/llvoicevivox.cpp
2010-05-28 12:09:48 +01:00
b3f758785d
CID-479
...
Checker: UNINIT_CTOR
Function: LLVivoxVoiceClient::sessionState::sessionState()
File: /indra/newview/llvoicevivox.cpp
2010-05-28 12:07:45 +01:00
89990d746e
CID-477
...
Checker: NULL_RETURNS
Function: LLCOFWearables::buildClothingListItem(LLViewerInventoryItem *, bool, bool)
File: /indra/newview/llcofwearables.cpp
2010-05-28 12:06:03 +01:00
c68e4c5597
CID-478
...
Checker: NULL_RETURNS
Function: LLCOFWearables::buildBodypartListItem(LLViewerInventoryItem *)
File: /indra/newview/llcofwearables.cpp
2010-05-28 12:04:49 +01:00
e25d0d34ba
CID-481
...
Checker: FORWARD_NULL
Function: LLTaskInvFVBridge::createObjectBridge(LLPanelObjectInventory *, LLInventoryObject *)
File: /indra/newview/llpanelobjectinventory.cpp
2010-05-28 12:01:26 +01:00
20d223620e
remove dos line-endings, grr.
2010-05-28 11:18:02 +01:00
a7ffd8b7a3
merge from PE's viewer-trunk
2010-05-28 09:56:21 +01:00
6b8fec008b
Fix build break
2010-05-28 01:03:17 -07:00
0ffba7c663
automated merge
2010-05-27 22:58:40 -07:00
d7144e76bf
automated merge
2010-05-27 21:48:20 -07:00
e44d0254af
automated merge
2010-05-27 21:22:46 -07:00
8ec4f45daa
merge
2010-05-27 18:28:31 -07:00
68ca9dc957
VI-49 FIX "_external" links should work in shared media
...
monroe already did most of this, just moved dialog for confirming opening external browser to common code that calls out to external browser
so no way to skip notification unless the user opts out
2010-05-27 18:26:06 -07:00
64ba7744e6
mo' mergin mo problems
2010-05-27 18:23:24 -07:00
cf05f59dd9
EXT-7388 - --grid command-line argument does nothing
...
Fix up overriding of --loginuri --loginpage --helperuri
2010-05-27 17:20:29 -07:00
f6ee642edf
merge
2010-05-27 17:19:52 -07:00
776fea3764
Merge
2010-05-27 16:54:57 -07:00
9cbd65d679
EXT-7504 WIP Force decloud after timeout using lower res textures
...
Changed lower res timeout setting to be persistent.
2010-05-27 19:08:25 -04:00
e89611291e
EXT-7504 WIP Force decloud after timeout using lower res textures
...
EXT-7526 FIXED Add baked texture information to texture view
First attempt at low res textures after timeout.
Added debug setting to control whether low res texture timeout is used.
Added baked texture load information to texture view debug display.
Trivial name changes to some variables.
2010-05-27 18:59:28 -04:00
495f62298c
explicit cast cr:Roxie
2010-05-27 15:36:45 -07:00
d7f065684d
EXT-7332 WIP remove DE override
2010-05-27 14:13:27 -07:00
0c7fafb704
merge
2010-05-27 17:05:30 -04:00
d213946c6c
EXT-6953 WIP - pre-push cleanup after review. Accumulated EXT-6953 commits reviewed by Nyx.
2010-05-27 17:04:48 -04:00
a1b973fc2a
EXT-7118 FIXED Changed text in group call invite.
...
- Changed group invite string from "has joined a Voice Chat call with the group [GROUP]" to "just joined '[GROUP]' voice channel."
- Added special string for group invite question saying "Would you like to leave [CURRENT_CHAT] and join the call with '[GROUP]'"?
- Hooked up this string in code.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/458/
--HG--
branch : product-engine
2010-05-28 00:03:08 +03:00
250e57cc95
ifdef out windows includes
2010-05-27 14:02:58 -07:00
2a061dbccc
Merge
2010-05-27 13:49:18 -07:00
d01b99adea
ND-47144 WIP ES edit
2010-05-27 13:48:36 -07:00
8ac65297f6
EXT 7525 FIXED Took out overaggressive warning when querying whether an item is a wearable.
2010-05-27 16:40:09 -04:00
aa9c621cb9
EXT-6953 WIP - cleanup
2010-05-27 15:19:26 -04:00
Tofu Linden