Commit Graph

174 Commits (c4e18fbcaab2413d153ec79356930bf667839b4f)

Author SHA1 Message Date
Ansariel c4e18fbcaa Merge viewer-neko 2018-02-27 18:08:48 +01:00
maxim_productengine 2cd1460763 MAINT-2564 FIXED Alpha mask does not hide hair in the Outfit Editor 2018-02-21 15:10:40 +02:00
Ansariel 832911cea5 Merge Firestorm LGPL 2018-01-04 12:53:34 +01:00
Ansariel 46291642ec Merge Firestorm LGPL 2017-12-07 20:23:29 +01:00
Ansariel 29c6277460 Remember and apply the correct camera position for the last subpart in appearance editor since we don't switch to the first subpart automatically 2017-12-06 16:40:58 +01:00
Ansariel 2bb855d137 Fix a bunch of XUI warnings and as a result the long-standing bug of camera not switching properly when editing appearance
LLView::getChild: Found child named "wearable_accordion" but of wrong type class LLTabContainer, expecting class LLAccordionCtrl * __ptr64
LLView::getChild: Making dummy class LLAccordionCtrl named "wearable_accordion" in edit_shape_panel
LLView::getChild: Found child named "wearable_accordion" but of wrong type class LLTabContainer, expecting class LLAccordionCtrl * __ptr64
LLView::getChild: Making dummy class LLAccordionCtrl named "wearable_accordion" in edit_skin_panel
LLView::getChild: Making dummy class LLAccordionCtrl named "wearable_accordion" in edit_eyes_panel
LLView::getChild: Found child named "wearable_accordion" but of wrong type class LLTabContainer, expecting class LLAccordionCtrl * __ptr64
LLView::getChild: Making dummy class LLAccordionCtrl named "wearable_accordion" in edit_hair_panel
LLView::getChild: Making dummy class LLAccordionCtrlTab named "shape_ears_tab" in panel_edit_wearable
LLView::getChild: Making dummy class LLAccordionCtrlTab named "alpha_main_tab" in panel_edit_wearable
LLView::getChild: Making dummy class LLAccordionCtrlTab named "tattoo_main_tab" in panel_edit_wearable
LLView::getChild: Making dummy class LLAccordionCtrlTab named "physics_belly_updown_tab" in panel_edit_wearable
LLView::getChild: Making dummy class LLAccordionCtrlTab named "physics_butt_updown_tab" in panel_edit_wearable
2017-12-06 15:28:30 +01:00
Ansariel 457ebc6c2a FIRE-21936: Option to disable visual hints for appearance editor 2017-12-18 15:11:47 +01:00
Ansariel 77c765e04c Build fix 2017-10-02 19:33:20 +02:00
Ansariel 547df251e4 Merge viewer64 2017-10-02 17:57:56 +02:00
Nat Goodspeed d1ab470542 DRTVWR-418: Fix C++ errors detected by Xcode 9.
You can't legitimately perform an ordered comparison between a pointer and an
int, even 0. Fix a number of 'if (ptr > 0)' to plain 'if (ptr)'.

Fix LLEditWearableDictionary::WearableEntry constructor to avoid varargs
mechanism. It used to accept three different counts, followed by three
different lists of enums, fetched in each case as 'int' -- dubious in itself.
The constructor body performed three different loops to populate those enums
into three different member vectors.

Instead, make the constructor accept three vectors and initialize the member
vectors from the passed vectors. Now that C++ has inline vector
initialization, change existing constructor calls to pass temporary vectors
initialized with what used to be the varargs enum values.
2017-09-20 16:58:58 -04:00
Ansariel c182741596 Merge viewer-lynx 2016-11-16 09:55:54 +01:00
Nicky 24308dc929 The sheer amount of calls into LLVOAvatar::getJoint get very costly in complex scenes. This is due to a string being used as index. Change the index to U32 for faster access. 2016-09-16 21:46:39 +02:00
Nat Goodspeed d2c3c2f9fe MAINT-5232: Normalize LLSingleton subclasses.
A shocking number of LLSingleton subclasses had public constructors -- and in
several instances, were being explicitly instantiated independently of the
LLSingleton machinery. This breaks the new LLSingleton dependency-tracking
machinery. It seems only fair that if you say you want an LLSingleton, there
should only be ONE INSTANCE!

Introduce LLSINGLETON() and LLSINGLETON_EMPTY_CTOR() macros. These handle the
friend class LLSingleton<whatevah>;
and explicitly declare a private nullary constructor.

To try to enforce the LLSINGLETON() convention, introduce a new pure virtual
LLSingleton method you_must_use_LLSINGLETON_macro() which is, as you might
suspect, defined by the macro. If you declare an LLSingleton subclass without
using LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() in the class body, you can't
instantiate the subclass for lack of a you_must_use_LLSINGLETON_macro()
implementation -- which will hopefully remind the coder.

Trawl through ALL LLSingleton subclass definitions, sprinkling in
LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() as appropriate. Remove all explicit
constructor declarations, public or private, along with relevant 'friend class
LLSingleton<myself>' declarations. Where destructors are declared, move them
into private section as well. Where the constructor was inline but nontrivial,
move out of class body.

Fix several LLSingleton abuses revealed by making ctors/dtors private:

LLGlobalEconomy was both an LLSingleton and the base class for
LLRegionEconomy, a non-LLSingleton. (Therefore every LLRegionEconomy instance
contained another instance of the LLGlobalEconomy "singleton.") Extract
LLBaseEconomy; LLGlobalEconomy is now a trivial subclass of that.
LLRegionEconomy, as you might suspect, now derives from LLBaseEconomy.

LLToolGrab, an LLSingleton, was also explicitly instantiated by
LLToolCompGun's constructor. Extract LLToolGrabBase, explicitly instantiated,
with trivial subclass LLToolGrab, the LLSingleton instance.

(WARNING: LLToolGrabBase methods have an unnerving tendency to go after
LLToolGrab::getInstance(). I DO NOT KNOW what should be the relationship
between the instance in LLToolCompGun and the LLToolGrab singleton instance.)

LLGridManager declared a variant constructor accepting (const std::string&),
with the comment:
// initialize with an explicity grid file for testing.
As there is no evidence of this being called from anywhere, delete it.

LLChicletBar's constructor accepted an optional (const LLSD&). As the LLSD
parameter wasn't used, and as there is no evidence of it being passed from
anywhere, delete the parameter.

LLViewerWindow::shutdownViews() was checking LLNavigationBar::
instanceExists(), then deleting its getInstance() pointer -- leaving a
dangling LLSingleton instance pointer, a land mine if any subsequent code
should attempt to reference it. Use deleteSingleton() instead.

~LLAppViewer() was calling LLViewerEventRecorder::instance() and then
explicitly calling ~LLViewerEventRecorder() on that instance -- leaving the
LLSingleton instance pointer pointing to an allocated-but-destroyed instance.
Use deleteSingleton() instead.
2016-09-15 20:18:12 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Nicky 2c4a3e7610 Crash in LLPanelEditWearable::isDirty(): Make sure there's no dangling pointer to a LLWearable. 2016-02-17 12:18:53 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02:00
Ansariel 234691f4dd Float(ing)... 2015-08-03 19:14:11 +02:00
vyacheslavsproductengine a2bd04ca24 MAINT-5186 FIXED (Avatar textures do not load in the Appearance editor after disabling an Alpha mask) 2015-06-05 20:53:16 +04:00
Brad Payne (Vir Linden) 6aa63dce33 SL-103 WIP - viewer enforces wearable limits based on total articles of clothing rather than per-type limit. Limit is artificially low for testing, will bump before release. 2015-03-05 16:17:45 -05:00
Ansariel 0e2a827873 Merge LL V3.7.30 2015-05-27 00:27:29 +02:00
Nicky 3de3e6e762 Need to call va_end once done with varargs. 2015-04-18 01:47:05 +02:00
Ansariel 546b276eba Fix merge issue 2015-01-18 17:18:23 +01:00
Ansariel 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
Ansariel e1ce6e3d58 Merge Firestorm LGPL tip 2015-01-08 23:12:58 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
Brad Payne (Vir Linden) 487ca1bad3 v-r -> s-e merge WIP 2014-05-14 17:50:59 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
andreylproductengine 6bbb86811e MAINT-3842 FIXED Using "Close Window" (Ctrl + W) shortcut while in Appearance mode doesn't visually revert any changes... 2014-03-21 04:55:55 +02:00
Mnikolenko ProductEngine 9670f19cc3 MAINT-1190 FIXED Update visual param list when changing sex. 2014-03-20 11:37:20 +02:00
Brad Payne (Vir Linden) d9e3a2948a merge 2014-03-12 17:24:07 -04:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Tank_Master 3d1ac7c0ec Merge LL 3.7.3 (Viewer-Bear fixes) 2014-03-17 14:14:15 -07:00
Mnikolenko ProductEngine 0d3eb8eef7 MAINT-1190 FIXED Update visual param list when changing sex. 2014-03-20 11:37:20 +02:00
maksymsproductengine 1033c9d67f MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
maksymsproductengine e6c85c46c4 MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
Brad Payne (Vir Linden) 39900843c9 SH-3455 WIP 2013-09-26 16:24:25 -04:00
Cinders 8cdbb01285 FIRE-10986: Shape import 2013-12-15 07:27:04 -07:00
Brad Payne (Vir Linden) 9a8afee83f SH-3455 WIP - removing bake upload code 2013-09-19 17:52:58 -04:00
Brad Payne (Vir Linden) 82f147367f SH-3455 WIP - removing bake upload code 2013-09-19 11:10:59 -04:00
Brad Payne (Vir Linden) 2157cf5e71 SH-4422 FIX - fixed some recently introduced issues with link description fields, which among other things reduces the number of appearance requests sent. 2013-08-14 14:25:22 -04:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Don Kjer 3ed3b88892 Refactoring link creation calls in preparation for adding AIS v3 hook. 2013-08-09 13:36:36 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Brad Payne (Vir Linden) 3d8d4227f1 SH-3889 WIP - added callbacks to control ordering of operations after wearable save. 2013-07-19 17:22:53 -04:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Richard Linden 6b81b8629e Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies 2013-05-05 17:45:35 -07:00