Added links to the Buy L$ floater to access payment method, local
currency settings, and exchange rate. Also included required text
about re-entering value in order to update exhance rate. And added a
notification on successful payment, as some foreign currency
transactions can take up to 20 mins to complete.
Worked with Ram on Erica on the design. The actual text may need some
tweaking once we hear back from Gisland. The URLs are placeholder for
now.
The bug was driven by the following sequence in llstartup.cpp:
if(reason_response == "update"
|| reason_response == "optional")
{
// used to resend status event still containing "update",
// erroneously instantiating a second forced-update
// LLAlertDialog
LLLoginInstance::getInstance()->disconnect();
// quit with an LLAlertDialog still on sModalStack used
// to result in LL_ERRS
LLAppViewer::instance()->forceQuit();
}
I hope to be able to introduce a test script to verify the fix. That
script would need to be able to call LLAppViewer::forceQuit() rather than
requestQuit(), which is already available via LLAppViewerListener.
At the same time, changed LLAppViewerListener to bind a functor to
retrieve an LLAppViewer instance (namely LLAppViewer::instance) rather
than an LLAppViewer*. Apparently the static instantiation of
LLAppViewerListener was calling LLAppViewer::instance() too early, before
things were ready, so the declaration was changed to pass NULL -- then
in each method, call LLAppViewer::instance() if the bound pointer is NULL.
Binding the LLAppViewer* is a Feathers tactic intended to avoid the need
to reference the singleton. Binding a functor still leaves it up to the
instantiating code to reference LLAppViewer::instance, while deferring
the actual call to that method.
Based on discussion with James and Richard, this operation should allow an
automation script to locate a visible LLFloater and simulate clicking any one
of its LLButton children by name. As yet untested.
The logic was redundantly expressed in LLFloaterReg -- and would be
useful elsewhere -- so was introduced as LLFloater::isShown(). Thanks to
Richard and James for suggesting the terminology.
For DEV-32867 : Avatar Pipeline Project - Multi-Attachments
This is a viewer-side-only, infrastructure-only merge for multi-attachments. This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly.
Reviewed by: Vir.
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .
Progress can be tracked in DEV-32551.
-Nyx
parsing in text editors. Any time we are looking up segment start/end
ranges we should do this on a wide string.
Also added a convenience LLUrlRegistry::hasUrl() method to easily
determine if a string contains a valid SLURL.
LLViewerMediaFocus now tracks two separate objects: the currently focused media object, and the media object that's currently being hovered over. It no longer stores smart pointers to either the LLViewerObject or the LLViewerMediaImpl -- it now looks up both by UUID every time they're needed, and fails gracefully if either goes away. This will prevent it from keeping objects from being deleted.
The poorly-understood "mouseOverFlag" has been expunged.
LLViewerMediaFocus no longer uses LLSelectMgr at all. The object to focus on is explicitly passed between LLViewerMediaFocus and LLPanelMediaHUD instead of going indirectly through the selection manager.
LLViewerMediaFocus also no longer interacts with the pick from LLToolPie -- the data it needs from the pick (the object and normal vector) is passed explicitly.
LLViewerMediaFocus::setCameraZoom and LLViewerMediaFocus::getBBoxAspectRatio now have no dependencies on the LLViewerMediaFocus object -- all the data they need is passed in when they're called by the LLPanelMediaHUD. I made them static member functions, but they could be moved to LLPanelMediaHUD or even made into file-scoped static functions. The only reason I didn't do either of those is that it seems like they belong with the LLViewerMediaFocus code as opposed to the HUD.
EXT-770 Update Me Profile and Me Edit Profile to match updated style guide
EXT-302 Update and My Account links in the Me Panel are misplaced
EXT-805 Update Me Pick Info and Me Edit Edit Pick Info to match updated style guide
Review #21
This attempts to tweak the target camera position slightly towards where the camera started from, so as to avoid the flip noted in this JIRA.
angela@angelas-macbook-pro.local