4f4afcf489
merge backout.
2010-02-13 12:50:06 +00:00
f5572abb5e
Backed out changeset 6c161782dba3
2010-02-13 12:49:54 +00:00
fb994141da
resolve.
2010-02-13 12:49:25 +00:00
827c1adc91
Backed out changeset d89b00b44ab6
2010-02-13 12:48:42 +00:00
f0062fa41a
merge from viewer2. this fucks up davep's optimizations, so I'll backout their backout next to restore them. I hope. Sheesh.
2010-02-13 12:46:14 +00:00
bcbd12f7b1
PE merge.
2010-02-13 12:33:56 +00:00
3b8463f0fd
merge
2010-02-12 21:06:25 -08:00
1f672990e7
Backed out davep's optimization pass. changeset 3c3685de430a
2010-02-12 21:06:02 -08:00
660c3b182c
merge
2010-02-12 21:05:09 -08:00
651b14fcae
Backed out davep's UI optimization. changeset 3134cb7bb181
2010-02-12 21:04:51 -08:00
6499aee37c
merge
2010-02-12 21:04:01 -08:00
b392e1c3bd
Backed out dave's FSAA/FBO change changeset 89f62bede16f
2010-02-12 21:03:43 -08:00
85abcf4206
merge
2010-02-12 21:02:40 -08:00
25be5a201f
Backed out bao's fix to FSAA that will also be backed out. changeset ae9bbbf181d9
2010-02-12 21:02:25 -08:00
718e45f6e4
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-12 17:15:35 -08:00
fecd9b2bab
EXT-5365change shoe icon in Viewer 2.0 inventory list
2010-02-12 17:15:15 -08:00
af229a7bb0
cast type F32 to GLint to eliminate some compiling warnings.
2010-02-12 17:11:36 -08:00
0b450b6003
Changing viewer unit test licenses to viewergpl
2010-02-12 16:32:28 -08:00
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
e890055da3
Fixed reopened critical bug (EXT-4827) [NUX] The Places Panel should default to the Landmarks tab with the Library expanded.
...
- Added expanding "Landmarks" folder in the Library on startup.
--HG--
branch : product-engine
2010-02-12 22:08:55 +02:00
630c107eb9
Fixed critical bug (EXT-5313) Duplicated xui xml IDs, blocking l10n, for public beta.
...
- Added suffixes to duplicating "OK" and "Cancel" buttons names in notification templates.
--HG--
branch : product-engine
2010-02-12 22:07:55 +02:00
21be0916a4
fixing windows eol
2010-02-12 12:07:16 -08:00
426aca61d3
Merge
2010-02-12 12:05:51 -08:00
995fca4d36
viewer2 merge.
2010-02-12 19:44:02 +00: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
f9092a94a9
viewer 2 merge.
2010-02-12 19:24:58 +00:00
9cfae239a9
viewer2 merge.
2010-02-12 19:24:36 +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
Tofu Linden