9aae3a31c8
merge
2010-02-12 15:56:25 -08:00
ae39812d70
Merge with tip
2010-02-12 15:26:08 -08:00
c0f2f151b2
"Fix for EXT-4968 - Media DnD cannot navigate prims owned by other people"
...
Reviewed by Rick via CodeCollab (http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=110 )
2010-02-12 15:24:53 -08:00
418504207b
merge
2010-02-12 15:16:19 -08:00
434436ef6b
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-12 15:11:21 -08:00
c1b0625f38
fix for EXT-4653: Textures saved with "Save As" appear to be very low rez. and beyond: remove saved raw image automatically.
2010-02-12 14:23:22 -08:00
03d79f1bf7
some code dents change (nothing else).
2010-02-12 14:21:36 -08:00
2cabf100e2
automated merge viewer2.0->viewer2.0
2010-02-12 17:13:55 -05:00
dce57c6b80
EXT-5297 : System folders no longer sort properly in Snowglobe (and Emerald) inventory windows
...
EXT-5399 : Ensemble folder typing code has been reenabled and is mangling inventory folders
This fixes two issues:
1. A very serious issue where ensemble auto-typing code was somehow uncommented/reintroduced into viewer2. This randomly changes folder types (sometimes into what older viewers will treat as system folders; i.e. you can't delete or move them).
2. A minor issue where sorting was not correctly identifying what was a system folder or not.
2010-02-12 17:13:05 -05:00
21be0916a4
fixing windows eol
2010-02-12 12:07:16 -08:00
426aca61d3
Merge
2010-02-12 12:05:51 -08:00
01d4624821
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-12 11:39:20 -08:00
8c8e904f93
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-12 11:38:26 -08:00
5d199b220b
EXT-4996 Master volume slider blends into other UI chrome, nearly impossible to see
2010-02-12 11:37:58 -08:00
318a88f57b
fix typos in EXT-5248 / d6fd7b96d638
2010-02-12 19:32:26 +00:00
c61cb61ecc
EXT-5050 Make sure there is a Delete button in God Mode and that it works
...
reviewed by Monore CC# 108
2010-02-12 11:09:39 -08:00
dc8a9dc57d
merge
2010-02-12 13:46:21 -05:00
1e76fc2b1f
Log spam cleanup
2010-02-12 13:44:32 -05:00
a3d8338cdc
For EXT-5259: Major regression in load time for new users from 1.23 to 2.0. Moved autopopulate to after avatar appearance resolves
2010-02-12 13:12:26 -05:00
6e0ebfe18c
CID-215
...
Checker: REVERSE_INULL
File: /indra/newview/llfloatergesture.cpp
2010-02-12 17:55:39 +00:00
a80fdcd8f2
CID-217
...
Checker: REVERSE_INULL
Function: LLFloaterGesture::postBuild()
File: /indra/newview/llfloatergesture.cpp
2010-02-12 17:53:02 +00:00
21e86251c0
CID-218
...
Checker: REVERSE_INULL
Function: LLAgentWearables::setWearableOutfit(const LLDynamicArray<LLPointer<LLInventoryItem>, (int)32> &, LLDynamicArray<LLWearable *, (int)32>&, int)
File: /indra/newview/llagentwearables.cpp
2010-02-12 17:51:23 +00:00
290a5846fc
CID-218
...
Checker: REVERSE_INULL
Function: LLAgentWearables::setWearableOutfit(const LLDynamicArray<LLPointer<LLInventoryItem>, (int)32> &, LLDynamicArray<LLWearable *, (int)32>&, int)
File: /indra/newview/llagentwearables.cpp
2010-02-12 17:49:55 +00:00
41bd792032
CID-285
...
Checker: UNINIT_CTOR
Function: LLScriptState::LLScriptState(int, int, e_lscript_state_type, LLScriptIdentifier *, LLScriptEventHandler *)
File: /indra/lscript/lscript_compile/lscript_tree.h
2010-02-12 17:47:21 +00:00
23b1c3d16f
CID-286
...
Checker: UNINIT_CTOR
Function: LLScriptStateChange::LLScriptStateChange(int, int, LLScriptIdentifier *)
File: /indra/lscript/lscript_compile/lscript_tree.h
2010-02-12 17:46:34 +00:00
69aa73656e
CID-287
...
Checker: UNINIT_CTOR
Function: LLScriptScript::LLScriptScript(LLScritpGlobalStorage *, LLScriptState *)
File: /indra/lscript/lscript_compile/lscript_tree.cpp
2010-02-12 17:43:47 +00:00
6d80e75e0b
CID-412
...
Checker: UNUSED_VALUE
Function: LLFloaterWindLight::deleteAlertCallback(const LLSD &, const LLSD &)
File: /indra/newview/llfloaterwindlight.cpp
dead code.
2010-02-12 17:41:55 +00:00
947aeb1915
CID-413
...
Checker: UNUSED_VALUE
Function: LLFloaterWater::deleteAlertCallback(const LLSD &, const LLSD &)
File: /indra/newview/llfloaterwater.cpp
dead code.
2010-02-12 17:40:39 +00:00
4fa10e3596
CID-427
...
Checker: FORWARD_NULL
Function: LLFolderBridge::pasteFromClipboard()
File: /indra/newview/llinventorybridge.cpp
2010-02-12 17:38:19 +00:00
df6af052e0
CID-428
...
Checker: FORWARD_NULL
Function: LLCallFloater::updateSession()
File: /indra/newview/llcallfloater.cpp
2010-02-12 17:37:08 +00:00
713eb289b0
Fixed normal bug EXT-5117 (Voice Control Panel sorting should default to by Recent speaker).
...
- Changed sort order of participant list in VCP to by Recent speaker after it's creation.
--HG--
branch : product-engine
2010-02-12 17:54:57 +02:00
6ead0d131f
Fixed normal bug EXT-1093 - Dialog boxes should be centered in the viewport(game area).
...
--HG--
branch : product-engine
2010-02-12 16:56:29 +02:00
b1a5d52f75
merge
...
--HG--
branch : product-engine
2010-02-12 16:29:00 +02:00
951fd66000
Completed normal task EXT-3410 (Liberate filter_editor clear_button height width parameters - art is distorted)
...
- improved calculation of clear_button position (to be xml driven)
- replaced clear_button art with suggested Icon_Close_Toast in filter_editor widget
--HG--
branch : product-engine
2010-02-12 16:26:52 +02:00
5a5262bbdc
Fixed normal bug EXT - 5248 (Default group icon for IM sessions in multifloater). The problem was in LLAgent::isInGroup() logic. In God Mode it always returned true, even if it was not so. Added ability to ignore God Mode in LLAgent::isInGroup().
...
--HG--
branch : product-engine
2010-02-12 16:24:24 +02:00
c06742b231
fixed Bug Low EXT-4732 Group invitation is broken for offline avatars
...
Cause:
gObjectList does contain offline avatars and panel could get avatar name and fill the list
Solution:
This situation is possible only for offline friend, therefore extra avatartracker search has been added.
--HG--
branch : product-engine
2010-02-12 16:09:18 +02:00
8b609519ea
fixed reopened EXT-926 System notification toast has avatar's icon
...
--HG--
branch : product-engine
2010-02-12 15:15:49 +02:00
b1fad9d38c
Merge with 391ec5cd9368c2711e836415b21f8e8421226b10
...
--HG--
branch : product-engine
2010-02-12 14:21:39 +02:00
2c72deb0b0
Backed out of changeset 9306:f5c332c1ddcb. Restored fix of (EXT-5245) Cannot create a new line in group notice creation with enter key
...
--HG--
branch : product-engine
2010-02-12 14:19:16 +02:00
074a5b6566
Removed old function declaration.
...
--HG--
branch : product-engine
2010-02-12 13:42:07 +02:00
8c2a6a691a
Fixed low bug EXT-5166 - Undocked lldialogs respawn in chiclet tray.
...
LLDialog floater position is saved per originating object.
--HG--
branch : product-engine
2010-02-12 13:41:34 +02:00
b4c13247f7
PE merge.
2010-02-12 04:46:49 +00:00
a5c725c189
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-11 18:02:43 -08:00
e0e82c908d
more refinement for EXT-4352: texture problem in viewer 2.0.
2010-02-11 18:02:16 -08:00
17707455d2
additional fix for EXT-4632: LLViewerMediaTexture::getMaxVirtualSize() sometimes returns bad values
2010-02-11 15:35:22 -08:00
fb994809f4
fix for EXT-5353: prim visibility issues.
2010-02-11 14:58:08 -08:00
f791d103c8
Merge with tip
2010-02-11 14:04:40 -08:00
92468f0dea
Fix for EXT-5175 (prefs review: Chat Prefs tab settings need labels)
...
Not reviewed - coordinate and whitespace changes only
2010-02-11 14:04:06 -08:00
dc61885aa6
automated merge viewer2.0->viewer2.0
2010-02-11 16:34:24 -05:00
35d43f2562
EXT-5105 Incorrect keyboard shortcut for Inventory in main menu
...
EXT-5334 CTRL+SHIFT+I now brings up InventorySP instead of InventoryFloater
Fixed a regression due to EXT-5105 where CTRL+SHIFT+I was bringing up the InventorySP instead of InventoryFloater. Note that this reverts some code checked in for EXT-5105 (i.e. it re-adds in some functions that were deleted).
As a side bonus, now the Gestures CTRL+G menu option shows as being checked when the gestures floater is active.
2010-02-11 16:33:56 -05:00
Palmer