livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with fs-lgpl.

master
Nicky 2017-04-04 16:25:22 +02:00
parent 326723557d 78409751f7
commit 03e7dc1a6f
161 changed files with 1641 additions and 794 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hgtags
View File

@ -559,3 +559,5 @@ b280a1c797a3891e68dbc237e73de9cf19f426e9 4.1.1-release
bfbba2244320dc2ae47758cd7edd8fa3b67dc756 4.1.2-release
b41e1e7c7876f7656c505f552b5888b4e478f92b 5.0.0-release
c9ce2295012995e3cf5c57bcffcb4870b94c649f 5.0.1-release
cea1632c002c065985ebea15eeeb4aac90f50545 5.0.2-release
02c24e9f4f7d8aa0de75f27817dda098582f4936 5.0.3-release

8
autobuild.xml
View File

@ -1847,9 +1847,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>96d11160278115f6d468171f67aa7a4e</string>
<string>1c4e11f6ca7cdc2a3e5158eda7a432be</string>
<key>url</key>
<string>file:///opt/firestorm/kdu-7.9.0-linux-201701222135-r58.tar.bz2</string>
<string>file:///opt/firestorm/kdu-7.9.1-linux-201703182157.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -1871,9 +1871,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>26cc3fbe6a3b9885d697aa639d17a20a</string>
<string>adeb9db4d4435a65c44a72f981a18b33</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/kdu-7.9.0-windows-201701221929-r58.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/kdu-7.9.1-windows-201703182143-r61.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>

1
doc/contributions.txt
View File

@ -216,6 +216,7 @@ Ansariel Hiller
STORM-2141
MAINT-6953
MAINT-7028
MAINT-7059
Aralara Rajal
Arare Chantilly
CHUIBUG-191

2
indra/cmake/00-Common.cmake
View File

@ -180,7 +180,7 @@ if (DARWIN)
# NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
## Really?? On developer machines too?
##set(ENABLE_SIGNING TRUE)
##set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
##set(SIGNING_IDENTITY "Developer ID Application: Phoenix Firestorm Project, Inc., The"")
endif (DARWIN)

62
indra/llimagej2coj/llimagej2coj2.cpp
View File

@ -33,6 +33,7 @@
#include "lltimer.h"
//#include "llmemory.h"
#define OPENJPEG_VERSION "2.1" // This actually needs to be in openjpeg.h
struct ndUserdata
{
@ -126,23 +127,16 @@ OPJ_BOOL nd_opj_stream_seek_fn(OPJ_OFF_T p_nb_bytes, void * p_user_data)
return OPJ_TRUE;
}
const char* fallbackEngineInfoLLImageJ2CImpl()
{
static std::string version_string =
std::string("OpenJPEG: 2.1, Runtime: ")
+ opj_version();
return version_string.c_str();
}
// Factory function: see declaration in llimagej2c.cpp
LLImageJ2CImpl* fallbackCreateLLImageJ2CImpl()
{
return new LLImageJ2COJ();
}
void fallbackDestroyLLImageJ2CImpl(LLImageJ2CImpl* impl)
std::string LLImageJ2COJ::getEngineInfo() const
{
delete impl;
impl = NULL;
return std::string("OpenJPEG: " OPENJPEG_VERSION ", Runtime: ")
+ opj_version();
}
// Return string from message, eliminating final \n if present
@ -200,19 +194,19 @@ LLImageJ2COJ::~LLImageJ2COJ()
{
}
BOOL LLImageJ2COJ::initDecode(LLImageJ2C &base, LLImageRaw &raw_image, int discard_level, int* region)
bool LLImageJ2COJ::initDecode(LLImageJ2C &base, LLImageRaw &raw_image, int discard_level, int* region)
{
// No specific implementation for this method in the OpenJpeg case
return FALSE;
return false;
}
BOOL LLImageJ2COJ::initEncode(LLImageJ2C &base, LLImageRaw &raw_image, int blocks_size, int precincts_size, int levels)
bool LLImageJ2COJ::initEncode(LLImageJ2C &base, LLImageRaw &raw_image, int blocks_size, int precincts_size, int levels)
{
// No specific implementation for this method in the OpenJpeg case
return FALSE;
return false;
}
BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count)
bool LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count)
{
// <FS:Techwolf Lupindo> texture comment metadata reader
U8* c_data = base.getData();
@ -304,7 +298,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
opj_image_destroy(image);
}
return TRUE; // done
return true; // done
}
// sometimes we get bad data out of the cache - check to see if the decode succeeded
@ -314,8 +308,8 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
{
// if we didn't get the discard level we're expecting, fail
opj_image_destroy(image);
base.mDecoding = FALSE;
return TRUE;
base.mDecoding = false;
return true;
}
}
@ -327,7 +321,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
opj_image_destroy(image);
}
return TRUE;
return true;
}
// Copy image data into our raw image format (instead of the separate channel format
@ -351,6 +345,16 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
raw_image.resize(width, height, channels);
U8 *rawp = raw_image.getData();
// <FS:Ansariel> Port fix for MAINT-4327/MAINT-6584 to OpenJPEG decoder
if (!rawp)
{
base.setLastError("Memory error");
base.decodeFailed();
opj_image_destroy(image);
return true; // done
}
// <FS:Ansariel>
// first_channel is what channel to start copying from
// dest is what channel to copy to. first_channel comes from the
// argument, dest always starts writing at channel zero.
@ -374,18 +378,18 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
LL_DEBUGS("Texture") << "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)" << LL_ENDL;
opj_image_destroy(image);
return TRUE; // done
return true; // done
}
}
/* free image data structure */
opj_image_destroy(image);
return TRUE; // done
return true; // done
}
BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time, BOOL reversible)
bool LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, const char* comment_text, F32 encode_time, bool reversible)
{
const S32 MAX_COMPS = 5;
opj_cparameters_t parameters; /* compression parameters */
@ -495,7 +499,7 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con
if (!bSuccess)
{
LL_DEBUGS("Texture") << "Failed to encode image." << LL_ENDL;
return FALSE;
return false;
}
codestream_length = pStreamdata->mOutput.size();
@ -513,7 +517,7 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con
/* free image data */
opj_image_destroy(image);
return TRUE;
return true;
}
inline S32 extractLong4( U8 const *aBuffer, int nOffset )
@ -573,7 +577,7 @@ bool getMetadataFast( LLImageJ2C &aImage, S32 &aW, S32 &aH, S32 &aComps )
return true;
}
BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
bool LLImageJ2COJ::getMetadata(LLImageJ2C &base)
{
//
// FIXME: We get metadata by decoding the ENTIRE image.
@ -589,7 +593,7 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
if ( getMetadataFast( base, width, height, img_components ) )
{
base.setSize(width, height, img_components);
return TRUE;
return true;
}
// Do it the old and slow way, decode the image with openjpeg
@ -634,7 +638,7 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
if(!image)
{
LL_WARNS() << "ERROR -> getMetadata: failed to decode image!" << LL_ENDL;
return FALSE;
return false;
}
// Copy image data into our raw image format (instead of the separate channel format
@ -647,5 +651,5 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
/* free image data structure */
opj_image_destroy(image);
return TRUE;
return true;
}

135
indra/llmath/llvolume.cpp
View File

@ -3767,10 +3767,46 @@ void LLVolume::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
continue;
}
if (face.mTypeMask & (LLVolumeFace::CAP_MASK)) {
if (face.mTypeMask & (LLVolumeFace::CAP_MASK))
{
LLVector4a* v = (LLVector4a*)face.mPositions;
LLVector4a* n = (LLVector4a*)face.mNormals;
for (U32 j = 0; j < face.mNumIndices / 3; j++)
{
for (S32 k = 0; k < 3; k++)
{
S32 index = face.mEdge[j * 3 + k];
if (index == -1)
{
// silhouette edge, currently only cubes, so no other conditions
S32 v1 = face.mIndices[j * 3 + k];
S32 v2 = face.mIndices[j * 3 + ((k + 1) % 3)];
LLVector4a t;
mat.affineTransform(v[v1], t);
vertices.push_back(LLVector3(t[0], t[1], t[2]));
norm_mat.rotate(n[v1], t);
t.normalize3fast();
normals.push_back(LLVector3(t[0], t[1], t[2]));
mat.affineTransform(v[v2], t);
vertices.push_back(LLVector3(t[0], t[1], t[2]));
norm_mat.rotate(n[v2], t);
t.normalize3fast();
normals.push_back(LLVector3(t[0], t[1], t[2]));
}
}
}
}
else {
else
{
//==============================================
//DEBUG draw edge map instead of silhouette edge
@ -5629,10 +5665,17 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build)
if (!partial_build)
{
resizeIndices(grid_size*grid_size*6);
if (!volume->isMeshAssetLoaded())
{
mEdge.resize(grid_size*grid_size * 6);
}
U16* out = mIndices;
S32 idxs[] = {0,1,(grid_size+1)+1,(grid_size+1)+1,(grid_size+1),0};
int cur_edge = 0;
for(S32 gx = 0;gx<grid_size;gx++)
{
@ -5643,7 +5686,49 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build)
for(S32 i=5;i>=0;i--)
{
*out++ = ((gy*(grid_size+1))+gx+idxs[i]);
}
}
S32 edge_value = grid_size * 2 * gy + gx * 2;
if (gx > 0)
{
mEdge[cur_edge++] = edge_value;
}
else
{
mEdge[cur_edge++] = -1; // Mark face to higlight it
}
if (gy < grid_size - 1)
{
mEdge[cur_edge++] = edge_value;
}
else
{
mEdge[cur_edge++] = -1;
}
mEdge[cur_edge++] = edge_value;
if (gx < grid_size - 1)
{
mEdge[cur_edge++] = edge_value;
}
else
{
mEdge[cur_edge++] = -1;
}
if (gy > 0)
{
mEdge[cur_edge++] = edge_value;
}
else
{
mEdge[cur_edge++] = -1;
}
mEdge[cur_edge++] = edge_value;
}
else
{
@ -5651,8 +5736,50 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build)
{
*out++ = ((gy*(grid_size+1))+gx+idxs[i]);
}
S32 edge_value = grid_size * 2 * gy + gx * 2;
if (gy > 0)
{
mEdge[cur_edge++] = edge_value;
}
else
{
mEdge[cur_edge++] = -1;
}
if (gx < grid_size - 1)
{
mEdge[cur_edge++] = edge_value;
}
else
{
mEdge[cur_edge++] = -1;
}
mEdge[cur_edge++] = edge_value;
if (gy < grid_size - 1)
{
mEdge[cur_edge++] = edge_value;
}
else
{
mEdge[cur_edge++] = -1;
}
if (gx > 0)
{
mEdge[cur_edge++] = edge_value;
}
else
{
mEdge[cur_edge++] = -1;
}
mEdge[cur_edge++] = edge_value;
}
}
}
}
}

10
indra/llmessage/llavatarname.cpp
View File

@ -173,10 +173,10 @@ void LLAvatarName::setExpires(F64 expires)
mExpires = LLFrameTimer::getTotalSeconds() + expires;
}
std::string LLAvatarName::getCompleteName(bool use_parentheses) const
std::string LLAvatarName::getCompleteName(bool use_parentheses, bool force_use_complete_name) const
{
std::string name;
if (sUseDisplayNames)
if (sUseDisplayNames || force_use_complete_name)
{
if (mUsername.empty() || mIsDisplayNameDefault)
{
@ -219,7 +219,7 @@ std::string LLAvatarName::getCompleteName(bool use_parentheses) const
else
{
name = mDisplayName;
if(sUseUsernames)
if(sUseUsernames || force_use_complete_name)
{
if(use_parentheses)
{
@ -257,9 +257,9 @@ std::string LLAvatarName::getLegacyName() const
return name;
}
std::string LLAvatarName::getDisplayName() const
std::string LLAvatarName::getDisplayName(bool force_use_display_name) const
{
if (sUseDisplayNames)
if (sUseDisplayNames || force_use_display_name)
{
return mDisplayName;
}

4
indra/llmessage/llavatarname.h
View File

@ -73,7 +73,7 @@ public:
// For normal names, returns "James Linden (james.linden)"
// When display names are disabled returns just "James Linden"
std::string getCompleteName(bool use_parentheses = true) const;
std::string getCompleteName(bool use_parentheses = true, bool force_use_complete_name = false) const;
// Returns "James Linden" or "bobsmith123 Resident" for backwards
// compatibility with systems like voice and muting
@ -83,7 +83,7 @@ public:
// "José Sanchez" or "James Linden", UTF-8 encoded Unicode
// Takes the display name preference into account. This is truly the name that should
// be used for all UI where an avatar name has to be used unless we truly want something else (rare)
std::string getDisplayName() const;
std::string getDisplayName(bool force_use_display_name = false) const;
// Returns "James Linden" or "bobsmith123 Resident"
// Used where we explicitely prefer or need a non UTF-8 legacy (ASCII) name

28
indra/llui/llmenugl.cpp
View File

@ -1752,6 +1752,7 @@ LLMenuGL::LLMenuGL(const LLMenuGL::Params& p)
mJumpKey(p.jump_key),
mCreateJumpKeys(p.create_jump_keys),
mNeedsArrange(FALSE),
mAlwaysShowMenu(FALSE),
mResetScrollPositionOnShow(true),
mShortcutPad(p.shortcut_pad)
{
@ -3245,20 +3246,23 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
menu->setVisible( TRUE );
//Do not show menu if all menu items are disabled
BOOL item_enabled = false;
for (LLView::child_list_t::const_iterator itor = menu->getChildList()->begin();
itor != menu->getChildList()->end();
++itor)
if(!menu->getAlwaysShowMenu())
{
LLView *menu_item = (*itor);
item_enabled = item_enabled || menu_item->getEnabled();
}
//Do not show menu if all menu items are disabled
BOOL item_enabled = false;
for (LLView::child_list_t::const_iterator itor = menu->getChildList()->begin();
itor != menu->getChildList()->end();
++itor)
{
LLView *menu_item = (*itor);
item_enabled = item_enabled || menu_item->getEnabled();
}
if(!item_enabled)
{
menu->setVisible( FALSE );
return;
if(!item_enabled)
{
menu->setVisible( FALSE );
return;
}
}
// Save click point for detecting cursor moves before mouse-up.

5
indra/llui/llmenugl.h
View File

@ -535,6 +535,9 @@ public:
void resetScrollPositionOnShow(bool reset_scroll_pos) { mResetScrollPositionOnShow = reset_scroll_pos; }
bool isScrollPositionOnShowReset() { return mResetScrollPositionOnShow; }
void setAlwaysShowMenu(BOOL show) { mAlwaysShowMenu = show; }
BOOL getAlwaysShowMenu() { return mAlwaysShowMenu; }
// add a context menu branch
BOOL appendContextSubMenu(LLMenuGL *menu);
@ -576,6 +579,8 @@ private:
static LLColor4 sDefaultBackgroundColor;
static BOOL sKeyboardMode;
BOOL mAlwaysShowMenu;
LLUIColor mBackgroundColor;
BOOL mBgVisible;
LLHandle<LLView> mParentMenuItem;

53
indra/llui/llradiogroup.cpp
View File

@ -54,6 +54,7 @@ public:
/*virtual*/ void setValue(const LLSD& value);
/*virtual*/ BOOL postBuild();
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
LLSD getPayload() { return mPayload; }
@ -224,6 +225,22 @@ BOOL LLRadioGroup::setSelectedIndex(S32 index, BOOL from_event)
return TRUE;
}
void LLRadioGroup::focusSelectedRadioBtn()
{
if (mSelectedIndex >= 0)
{
LLRadioCtrl* radio_item = mRadioButtons[mSelectedIndex];
if (radio_item->hasTabStop() && radio_item->getEnabled())
{
radio_item->focusFirstItem(FALSE, FALSE);
}
}
else if (mRadioButtons[0]->hasTabStop() || hasTabStop())
{
focusFirstItem(FALSE, FALSE);
}
}
BOOL LLRadioGroup::handleKeyHere(KEY key, MASK mask)
{
BOOL handled = FALSE;
@ -283,19 +300,6 @@ BOOL LLRadioGroup::handleKeyHere(KEY key, MASK mask)
return handled;
}
BOOL LLRadioGroup::handleMouseDown(S32 x, S32 y, MASK mask)
{
// grab focus preemptively, before child button takes mousecapture
//
if (hasTabStop())
{
focusFirstItem(FALSE, FALSE);
}
return LLUICtrl::handleMouseDown(x, y, mask);
}
// Handle one button being clicked. All child buttons must have this
// function as their callback function.
@ -466,6 +470,29 @@ BOOL LLRadioCtrl::postBuild()
return TRUE;
}
BOOL LLRadioCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
{
// Grab focus preemptively, before button takes mousecapture
if (hasTabStop() && getEnabled())
{
focusFirstItem(FALSE, FALSE);
}
else
{
// Only currently selected item in group has tab stop as result it is
// unclear how focus should behave on click, just let the group handle
// focus and LLRadioGroup::onClickButton() will set correct state later
// if needed
LLRadioGroup* parent = (LLRadioGroup*)getParent();
if (parent)
{
parent->focusSelectedRadioBtn();
}
}
return LLCheckBoxCtrl::handleMouseDown(x, y, mask);
}
LLRadioCtrl::~LLRadioCtrl()
{
}

4
indra/llui/llradiogroup.h
View File

@ -66,8 +66,6 @@ public:
virtual BOOL postBuild();
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleKeyHere(KEY key, MASK mask);
void setIndexEnabled(S32 index, BOOL enabled);
@ -75,6 +73,8 @@ public:
S32 getSelectedIndex() const { return mSelectedIndex; }
// set the index value programatically
BOOL setSelectedIndex(S32 index, BOOL from_event = FALSE);
// foxus child by index if it can get focus
void focusSelectedRadioBtn();
// Accept and retrieve strings of the radio group control names
virtual void setValue(const LLSD& value );

2
indra/llui/llspellcheck.cpp
View File

@ -161,7 +161,7 @@ void LLSpellChecker::refreshDictionaryMap()
}
// Load user installed dictionary information
user_filename = user_path + DICT_FILE_USER; // <FS:Ansariel> FIRE-20725: Import of custom spellcheck dictionary doesn't work
user_filename = user_path + DICT_FILE_USER;
llifstream custom_file(user_filename.c_str(), std::ios::binary);
if (custom_file.is_open())
{

16
indra/llui/lltabcontainer.cpp
View File

@ -214,6 +214,7 @@ LLTabContainer::Params::Params()
label_pad_left("label_pad_left"),
tab_position("tab_position"),
hide_tabs("hide_tabs", false),
hide_scroll_arrows("hide_scroll_arrows", false),
// [SL:KB] - Patch: UI-TabRearrange | Checked: 2010-06-05 (Catznip-3.3)
tab_allow_rearrange("tab_allow_rearrange", false),
// [/SL:KB]
@ -252,6 +253,7 @@ LLTabContainer::LLTabContainer(const LLTabContainer::Params& p)
mPrevArrowBtn(NULL),
mNextArrowBtn(NULL),
mIsVertical( p.tab_position == LEFT ),
mHideScrollArrows(p.hide_scroll_arrows),
// Horizontal Specific
mJumpPrevArrowBtn(NULL),
mJumpNextArrowBtn(NULL),
@ -460,7 +462,7 @@ void LLTabContainer::draw()
// [/SL:KB]
// setScrollPosPixels((S32)lerp((F32)getScrollPosPixels(), (F32)target_pixel_scroll, LLSmoothInterpolation::getInterpolant(0.08f)));
BOOL has_scroll_arrows = !getTabsHidden() && ((mMaxScrollPos > 0) || (mScrollPosPixels > 0));
BOOL has_scroll_arrows = !mHideScrollArrows && !getTabsHidden() && ((mMaxScrollPos > 0) || (mScrollPosPixels > 0));
if (!mIsVertical)
{
mJumpPrevArrowBtn->setVisible( has_scroll_arrows );
@ -585,7 +587,7 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
{
static LLUICachedControl<S32> tabcntrv_pad ("UITabCntrvPad", 0);
BOOL handled = FALSE;
BOOL has_scroll_arrows = (getMaxScrollPos() > 0) && !getTabsHidden();
BOOL has_scroll_arrows = !mHideScrollArrows && (getMaxScrollPos() > 0) && !getTabsHidden();
if (has_scroll_arrows)
{
@ -668,7 +670,7 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
BOOL LLTabContainer::handleHover( S32 x, S32 y, MASK mask )
{
BOOL handled = FALSE;
BOOL has_scroll_arrows = (getMaxScrollPos() > 0) && !getTabsHidden();
BOOL has_scroll_arrows = !mHideScrollArrows && (getMaxScrollPos() > 0) && !getTabsHidden();
if (has_scroll_arrows)
{
@ -710,7 +712,7 @@ BOOL LLTabContainer::handleHover( S32 x, S32 y, MASK mask )
BOOL LLTabContainer::handleMouseUp( S32 x, S32 y, MASK mask )
{
BOOL handled = FALSE;
BOOL has_scroll_arrows = (getMaxScrollPos() > 0) && !getTabsHidden();
BOOL has_scroll_arrows = !mHideScrollArrows && (getMaxScrollPos() > 0) && !getTabsHidden();
S32 local_x = x - getRect().mLeft;
S32 local_y = y - getRect().mBottom;
@ -808,7 +810,7 @@ BOOL LLTabContainer::handleToolTip( S32 x, S32 y, MASK mask)
{
LLTabTuple* firsttuple = getTab(0);
BOOL has_scroll_arrows = (getMaxScrollPos() > 0);
BOOL has_scroll_arrows = !mHideScrollArrows && (getMaxScrollPos() > 0);
LLRect clip;
if (mIsVertical)
{
@ -971,7 +973,7 @@ BOOL LLTabContainer::handleKeyHere(KEY key, MASK mask)
// virtual
BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType type, void* cargo_data, EAcceptance *accept, std::string &tooltip)
{
BOOL has_scroll_arrows = (getMaxScrollPos() > 0);
BOOL has_scroll_arrows = !mHideScrollArrows && (getMaxScrollPos() > 0);
if(mOpenTabsOnDragAndDrop && !getTabsHidden())
{
@ -1733,7 +1735,7 @@ BOOL LLTabContainer::setTab(S32 which)
// is_visible = FALSE;
// }
}
else if (getMaxScrollPos() > 0)
else if (!mHideScrollArrows && getMaxScrollPos() > 0)
{
if( i < getScrollPos() )
{

2
indra/llui/lltabcontainer.h
View File

@ -89,6 +89,7 @@ public:
label_pad_left;
Optional<bool> hide_tabs;
Optional<bool> hide_scroll_arrows;
// [SL:KB] - Patch: UI-TabRearrange | Checked: 2010-06-05 (Catznip-3.3)
Optional<bool> tab_allow_rearrange;
// [/SL:KB]
@ -290,6 +291,7 @@ private:
S32 mCurrentTabIdx;
BOOL mTabsHidden;
BOOL mHideScrollArrows;
// [SL:KB] - Patch: UI-TabRearrange | Checked: 2012-05-05 (Catznip-3.3)
bool mAllowRearrange;
tab_rearrange_signal_t* mRearrangeSignal;

46
indra/llui/lltextbase.cpp
View File

@ -1634,6 +1634,7 @@ void LLTextBase::reflow()
}
S32 line_height = 0;
S32 seg_line_offset = line_count + 1;
while(seg_iter != mSegments.end())
{
@ -1646,7 +1647,8 @@ void LLTextBase::reflow()
S32 character_count = segment->getNumChars(getWordWrap() ? llmax(0, remaining_pixels) : S32_MAX,
seg_offset,
cur_index - line_start_index,
S32_MAX);
S32_MAX,
line_count - seg_line_offset);
S32 segment_width, segment_height;
bool force_newline = segment->getDimensions(seg_offset, character_count, segment_width, segment_height);
@ -1709,6 +1711,7 @@ void LLTextBase::reflow()
}
++seg_iter;
seg_offset = 0;
seg_line_offset = force_newline ? line_count + 1 : line_count;
}
if (force_newline)
{
@ -3303,7 +3306,7 @@ LLTextSegment::~LLTextSegment()
bool LLTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const { width = 0; height = 0; return false;}
S32 LLTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const { return 0; }
S32 LLTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const { return 0; }
S32 LLTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const { return 0; }
void LLTextSegment::updateLayout(const LLTextBase& editor) {}
F32 LLTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect) { return draw_rect.mLeft; }
bool LLTextSegment::canEdit() const { return false; }
@ -3573,7 +3576,7 @@ S32 LLNormalTextSegment::getOffset(S32 segment_local_x_coord, S32 start_offset,
round);
}
S32 LLNormalTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
S32 LLNormalTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const
{
const LLWString &text = getWText();
@ -3595,7 +3598,7 @@ S32 LLNormalTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 lin
// if no character yet displayed on this line, don't require word wrapping since
// we can just move to the next line, otherwise insist on it so we make forward progress
LLFontGL::EWordWrapStyle word_wrap_style = (line_offset == 0)
LLFontGL::EWordWrapStyle word_wrap_style = (line_offset == 0)
? LLFontGL::WORD_BOUNDARY_IF_POSSIBLE
: LLFontGL::ONLY_WORD_BOUNDARIES;
@ -3741,12 +3744,26 @@ LLInlineViewSegment::~LLInlineViewSegment()
bool LLInlineViewSegment::getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const
{
if (first_char == 0 && num_chars == 0)
if (first_char == 0 && num_chars == 0)
{
// we didn't fit on a line, the widget will fall on the next line
// so dimensions here are 0
// We didn't fit on a line or were forced to new string
// the widget will fall on the next line, so width here is 0
width = 0;
height = 0;
if (mForceNewLine)
{
// Chat, string can't be smaller then font height even if it is empty
LLStyleSP s(new LLStyle(LLStyle::Params().visible(true)));
height = s->getFont()->getLineHeight();
return true; // new line
}
else
{
// height from previous segment in same string will be used, word-wrap
height = 0;
}
}
else
{
@ -3757,13 +3774,16 @@ bool LLInlineViewSegment::getDimensions(S32 first_char, S32 num_chars, S32& widt
return false;
}
S32 LLInlineViewSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
S32 LLInlineViewSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const
{
// if putting a widget anywhere but at the beginning of a line
// and the widget doesn't fit or mForceNewLine is true
// then return 0 chars for that line, and all characters for the next
if (line_offset != 0
&& (mForceNewLine || num_pixels < mView->getRect().getWidth()))
if (mForceNewLine && line_ind == 0)
{
return 0;
}
else if (line_offset != 0 && num_pixels < mView->getRect().getWidth())
{
return 0;
}
@ -3816,7 +3836,7 @@ bool LLLineBreakTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& w
return true;
}
S32 LLLineBreakTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
S32 LLLineBreakTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const
{
return 1;
}
@ -3852,7 +3872,7 @@ bool LLImageTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width
return false;
}
S32 LLImageTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
S32 LLImageTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const
{
LLUIImagePtr image = mStyle->getImage();

22
indra/llui/lltextbase.h
View File

@ -64,7 +64,19 @@ public:
virtual bool getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
virtual S32 getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const;
virtual S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
/**
* Get number of chars that fit into free part of current line.
*
* @param num_pixels - maximum width of rect
* @param segment_offset - symbol in segment we start processing line from
* @param line_offset - symbol in line after which segment starts
* @param max_chars - limit of symbols that will fit in current line
* @param line_ind - index of not word-wrapped string inside segment for multi-line segments.
* Two string separated by word-wrap will have same index.
* @return number of chars that will fit into current line
*/
virtual S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const;
virtual void updateLayout(const class LLTextBase& editor);
virtual F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect);
virtual bool canEdit() const;
@ -116,7 +128,7 @@ public:
/*virtual*/ bool getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
/*virtual*/ S32 getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const;
/*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
/*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const;
/*virtual*/ F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect);
/*virtual*/ bool canEdit() const { return true; }
/*virtual*/ const LLColor4& getColor() const { return mStyle->getColor(); }
@ -201,7 +213,7 @@ public:
LLInlineViewSegment(const Params& p, S32 start, S32 end);
~LLInlineViewSegment();
/*virtual*/ bool getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
/*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
/*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const;
/*virtual*/ void updateLayout(const class LLTextBase& editor);
/*virtual*/ F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect);
/*virtual*/ bool canEdit() const { return false; }
@ -225,7 +237,7 @@ public:
LLLineBreakTextSegment(S32 pos);
~LLLineBreakTextSegment();
bool getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const;
F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect);
private:
@ -238,7 +250,7 @@ public:
LLImageTextSegment(LLStyleConstSP style,S32 pos,class LLTextBase& editor);
~LLImageTextSegment();
bool getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const;
S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const;
S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 char_offset, S32 max_chars, S32 line_ind) const;
F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect);
/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);

20
indra/llui/llurlentry.cpp
View File

@ -865,7 +865,23 @@ LLUrlEntryAgentCompleteName::LLUrlEntryAgentCompleteName()
std::string LLUrlEntryAgentCompleteName::getName(const LLAvatarName& avatar_name)
{
return avatar_name.getCompleteName();
return avatar_name.getCompleteName(true, true);
}
//
// LLUrlEntryAgentLegacyName describes a Second Life agent legacy name Url, e.g.,
// secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/legacyname
// x-grid-location-info://lincoln.lindenlab.com/app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/legacyname
//
LLUrlEntryAgentLegacyName::LLUrlEntryAgentLegacyName()
{
mPattern = boost::regex(APP_HEADER_REGEX "/agent/[\\da-f-]+/legacyname",
boost::regex::perl|boost::regex::icase);
}
std::string LLUrlEntryAgentLegacyName::getName(const LLAvatarName& avatar_name)
{
return avatar_name.getLegacyName();
}
//
@ -881,7 +897,7 @@ LLUrlEntryAgentDisplayName::LLUrlEntryAgentDisplayName()
std::string LLUrlEntryAgentDisplayName::getName(const LLAvatarName& avatar_name)
{
return avatar_name.getDisplayName();
return avatar_name.getDisplayName(true);
}
//

8
indra/llui/llurlentry.h
View File

@ -312,6 +312,14 @@ private:
/*virtual*/ std::string getName(const LLAvatarName& avatar_name);
};
class LLUrlEntryAgentLegacyName : public LLUrlEntryAgentName
{
public:
LLUrlEntryAgentLegacyName();
private:
/*virtual*/ std::string getName(const LLAvatarName& avatar_name);
};
///
/// LLUrlEntryAgentDisplayName Describes a Second Life agent display name Url, e.g.,
/// secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/displayname

3
indra/llui/llurlregistry.cpp
View File

@ -41,7 +41,7 @@ LLUrlRegistry::LLUrlRegistry()
{
// mUrlEntry.reserve(20);
// [RLVa:KB] - Checked: 2010-11-01 (RLVa-1.2.2a) | Added: RLVa-1.2.2a
mUrlEntry.reserve(26);
mUrlEntry.reserve(27);
// [/RLVa:KB]
// Urls are matched in the order that they were registered
@ -65,6 +65,7 @@ LLUrlRegistry::LLUrlRegistry()
mUrlEntryHTTPLabel = new LLUrlEntryHTTPLabel();
registerUrl(mUrlEntryHTTPLabel);
registerUrl(new LLUrlEntryAgentCompleteName());
registerUrl(new LLUrlEntryAgentLegacyName());
registerUrl(new LLUrlEntryAgentDisplayName());
registerUrl(new LLUrlEntryAgentUserName());
// [RLVa:KB] - Checked: 2010-11-01 (RLVa-1.2.2a) | Added: RLVa-1.2.2a

2
indra/newview/VIEWER_VERSION.txt
View File

@ -1 +1 @@
5.0.2
5.0.4

1
indra/newview/app_settings/graphic_preset_controls.xml
View File

@ -1,7 +1,6 @@
<llsd>
<array>
<string>AgentPause</string>
<string>CameraAspectRatio</string>
<string>CameraDoFResScale</string>
<string>CameraFieldOfView</string>
<string>CameraFocalLength</string>

35
indra/newview/app_settings/settings.xml
View File

@ -702,13 +702,13 @@
<key>ScriptDialogsPosition</key>
<map>
<key>Comment</key>
<string>Holds the position where script llDialog floaters will show up. 1 = docked to chiclet, 2 = top left, 3 = top right, 4 = bottom left, 5 = bottom right, 0 = follow legacy ShowScriptDialogsTopRight</string>
<string>Holds the position where script llDialog floaters will show up. 1 = docked to chiclet, 2 = top left, 3 = top right, 4 = bottom left, 5 = bottom right</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
<integer>3</integer>
</map>
<key>DialogStackIconVisible</key>
@ -723,19 +723,6 @@
<integer>0</integer>
</map>
<!-- Legacy setting, can be removed when ScriptDialogsPosition was adopted -->
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen (OBSOLETE, see ScriptDialogsPosition).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>ShowGroupNoticesTopRight</key>
<map>
<key>Comment</key>
@ -3091,18 +3078,6 @@
<real>60.0</real>
</map>
<key>CameraAspectRatio</key>
<map>
<key>Comment</key>
<string>Camera aspect ratio for DoF effect</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.5</real>
</map>
<key>CertStore</key>
<map>
<key>Comment</key>
@ -7616,7 +7591,7 @@
<key>LeftClickShowMenu</key>
<map>
<key>Comment</key>
<string>Left click opens pie menu (FALSE = left click touches or grabs object)</string>
<string>Unused obsolete setting</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -21989,7 +21964,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0</real>
<real>0.0</real>
<key>SanityCheckType</key>
<string>LessThanEquals</string>
<key>SanityValue</key>
@ -22008,7 +21983,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0</real>
<real>2.0</real>
</map>
<key>FSRenderVignette</key>
<map>

12
indra/newview/app_settings/settings_firestorm.xml
View File

@ -183,18 +183,6 @@
<integer>1</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableGroupChatPopups</key>
<map>
<key>Comment</key>

12
indra/newview/app_settings/settings_hybrid.xml
View File

@ -159,18 +159,6 @@
<integer>1</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableGroupChatPopups</key>
<map>
<key>Comment</key>

44
indra/newview/app_settings/settings_per_account.xml
View File

@ -610,6 +610,50 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>ModelUploadFolder</key>
<map>
<key>Comment</key>
<string>All model uploads will be stored in this directory (UUID)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>TextureUploadFolder</key>
<map>
<key>Comment</key>
<string>All image(texture) uploads will be stored in this directory (UUID)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>SoundUploadFolder</key>
<map>
<key>Comment</key>
<string>All sound uploads will be stored in this directory (UUID)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>AnimationUploadFolder</key>
<map>
<key>Comment</key>
<string>All animation uploads will be stored in this directory (UUID)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<!-- Firestorm settings -->
<key>DebugLookAt</key>

24
indra/newview/app_settings/settings_phoenix.xml
View File

@ -171,18 +171,6 @@
<integer>1</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableGroupChatPopups</key>
<map>
<key>Comment</key>
@ -483,18 +471,6 @@
<integer>1</integer>
</map>
<key>ScriptDialogsPosition</key>
<map>
<key>Comment</key>
<string>Holds the position where script llDialog floaters will show up. 1 = docked to chiclet, 2 = top left, 3 = top right, 4 = bottom left, 5 = bottom right, 0 = follow legacy ShowScriptDialogsTopRight</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>3</integer>
</map>
<key>FSUseLegacyCursors</key>
<map>
<key>Comment</key>

12
indra/newview/app_settings/settings_text.xml
View File

@ -147,18 +147,6 @@
<integer>1</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>EnableGroupChatPopups</key>
<map>
<key>Comment</key>

8
indra/newview/app_settings/settings_v3.xml
View File

@ -183,16 +183,16 @@
<integer>0</integer>
</map>
<key>ShowScriptDialogsTopRight</key>
<key>ScriptDialogsPosition</key>
<map>
<key>Comment</key>
<string>Show script llDialog floaters always in the top right corner of the screen.</string>
<string>Holds the position where script llDialog floaters will show up. 1 = docked to chiclet, 2 = top left, 3 = top right, 4 = bottom left, 5 = bottom right</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
<key>EnableGroupChatPopups</key>

56
indra/newview/fsfloateravatarrendersettings.cpp
View File

@ -31,6 +31,7 @@
#include "fscommon.h"
#include "llfiltereditor.h"
#include "llfloateravatarpicker.h"
#include "llnamelistctrl.h"
#include "lltrans.h"
#include "llviewercontrol.h"
@ -45,6 +46,7 @@ FSFloaterAvatarRenderSettings::FSFloaterAvatarRenderSettings(const LLSD& key)
mFilterSubString(LLStringUtil::null),
mFilterSubStringOrig(LLStringUtil::null)
{
mCommitCallbackRegistrar.add("Settings.AddNewEntry", boost::bind(&FSFloaterAvatarRenderSettings::onClickAdd, this, _2));
}
FSFloaterAvatarRenderSettings::~FSFloaterAvatarRenderSettings()
@ -87,11 +89,21 @@ BOOL FSFloaterAvatarRenderSettings::postBuild()
mRenderSettingChangedCallbackConnection = FSAvatarRenderPersistence::instance().setAvatarRenderSettingChangedCallback(boost::bind(&FSFloaterAvatarRenderSettings::onAvatarRenderSettingChanged, this, _1, _2));
this->setVisibleCallback(boost::bind(&FSFloaterAvatarRenderSettings::removePicker, this));
loadInitialList();
return TRUE;
}
void FSFloaterAvatarRenderSettings::removePicker()
{
if (mPicker.get())
{
mPicker.get()->closeFloater();
}
}
void FSFloaterAvatarRenderSettings::onCloseBtn()
{
closeFloater();
@ -145,6 +157,50 @@ BOOL FSFloaterAvatarRenderSettings::handleKeyHere(KEY key, MASK mask)
return LLFloater::handleKeyHere(key, mask);
}
void FSFloaterAvatarRenderSettings::onClickAdd(const LLSD& userdata)
{
const std::string command_name = userdata.asString();
LLVOAvatar::VisualMuteSettings render_setting = LLVOAvatar::AV_RENDER_NORMALLY;
if ("never" == command_name)
{
render_setting = LLVOAvatar::AV_DO_NOT_RENDER;
}
else if ("always" == command_name)
{
render_setting = LLVOAvatar::AV_ALWAYS_RENDER;
}
LLView* button = findChild<LLButton>("plus_btn", TRUE);
LLFloater* root_floater = gFloaterView->getParentFloater(this);
LLFloaterAvatarPicker* picker = LLFloaterAvatarPicker::show(boost::bind(&FSFloaterAvatarRenderSettings::callbackAvatarPicked, this, _1, render_setting),
TRUE, TRUE, TRUE, root_floater->getName(), button);
if (root_floater)
{
root_floater->addDependentFloater(picker);
}
mPicker = picker->getHandle();
}
void FSFloaterAvatarRenderSettings::callbackAvatarPicked(const uuid_vec_t& ids, LLVOAvatar::VisualMuteSettings render_setting)
{
for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it)
{
LLUUID avatar_id = *it;
LLVOAvatar *avatarp = dynamic_cast<LLVOAvatar*>(gObjectList.findObject(avatar_id));
if (avatarp)
{
avatarp->setVisualMuteSettings(render_setting);
}
else
{
FSAvatarRenderPersistence::instance().setAvatarRenderSettings(avatar_id, render_setting);
}
}
}
//---------------------------------------------------------------------------
// Context menu

5
indra/newview/fsfloateravatarrendersettings.h
View File

@ -50,11 +50,16 @@ private:
void onCloseBtn();
void onFilterEdit(const std::string& search_string);
void onAvatarRenderSettingChanged(const LLUUID& avatar_id, LLVOAvatar::VisualMuteSettings render_setting);
void onClickAdd(const LLSD& userdata);
void loadInitialList();
void addElementToList(const LLUUID& avatar_id, LLVOAvatar::VisualMuteSettings render_setting);
void callbackAvatarPicked(const uuid_vec_t& ids, LLVOAvatar::VisualMuteSettings render_setting);
void removePicker();
LLNameListCtrl* mAvatarList;
LLHandle<LLFloater> mPicker;
boost::signals2::connection mRenderSettingChangedCallbackConnection;

4
indra/newview/fspanelblocklist.cpp
View File

@ -187,8 +187,8 @@ void FSPanelBlockList::refreshBlockedList()
mBlockedList->refreshLineHeight();
LLUICtrl* block_limit = getChild<LLUICtrl>("block_limit");
block_limit->setTextArg("[COUNT]", llformat("%d", LLMuteList::getInstance()->getMutes().size()));
block_limit->setTextArg("[LIMIT]", llformat("%d", gSavedSettings.getS32("MuteListLimit")));
block_limit->setTextArg("[COUNT]", llformat("%d", LLMuteList::getInstance()->getMutes().size()));
block_limit->setTextArg("[LIMIT]", llformat("%d", gSavedSettings.getS32("MuteListLimit")));
}
void FSPanelBlockList::updateButtons()

8
indra/newview/llagent.cpp
View File

@ -2484,6 +2484,12 @@ void LLAgent::endAnimationUpdateUI()
{
skip_list.insert(LLFloaterReg::findInstance("mini_map"));
}
// <FS:Ansariel> Beacons floater doesn't need to be open for us to show beacons
//if (LLFloaterReg::findInstance("beacons"))
//{
// skip_list.insert(LLFloaterReg::findInstance("beacons"));
//}
// </FS:Ansariel>
if(gSavedSettings.getBOOL("FSShowStatsBarInMouselook"))
{
skip_list.insert(LLFloaterReg::findInstance("stats"));
@ -2656,6 +2662,8 @@ void LLAgent::endAnimationUpdateUI()
#else // Use this for now
LLFloaterView::skip_list_t skip_list;
skip_list.insert(LLFloaterReg::findInstance("mini_map"));
// <FS:Ansariel> Beacons floater doesn't need to be open for us to show beacon
//skip_list.insert(LLFloaterReg::findInstance("beacons"));
if(gSavedSettings.getBOOL("FSShowStatsBarInMouselook"))
{
skip_list.insert(LLFloaterReg::findInstance("stats"));

46
indra/newview/llappearancemgr.cpp
View File

@ -1270,11 +1270,12 @@ void LLWearableHoldingPattern::onWearableAssetFetch(LLViewerWearable *wearable)
return;
}
U32 use_count = 0;
for (LLWearableHoldingPattern::found_list_t::iterator iter = getFoundList().begin();
iter != getFoundList().end(); ++iter)
iter != getFoundList().end(); ++iter)
{
LLFoundData& data = *iter;
if(wearable->getAssetID() == data.mAssetID)
if (wearable->getAssetID() == data.mAssetID)
{
// Failing this means inventory or asset server are corrupted in a way we don't handle.
if ((data.mWearableType >= LLWearableType::WT_COUNT) || (wearable->getType() != data.mWearableType))
@ -1283,9 +1284,48 @@ void LLWearableHoldingPattern::onWearableAssetFetch(LLViewerWearable *wearable)
break;
}
data.mWearable = wearable;
if (use_count == 0)
{
data.mWearable = wearable;
use_count++;
}
else
{
LLViewerInventoryItem* wearable_item = gInventory.getItem(data.mItemID);
if (wearable_item && wearable_item->isFinished() && wearable_item->getPermissions().allowModifyBy(gAgentID))
{
// We can't edit and do some other interactions with same asset twice, copy it
// Note: can't update incomplete items. Usually attached from previous viewer build, but
// consider adding fetch and completion callback
LLViewerWearable* new_wearable = LLWearableList::instance().createCopy(wearable, wearable->getName());
data.mWearable = new_wearable;
data.mAssetID = new_wearable->getAssetID();
// Update existing inventory item
wearable_item->setAssetUUID(new_wearable->getAssetID());
wearable_item->setTransactionID(new_wearable->getTransactionID());
gInventory.updateItem(wearable_item, LLInventoryObserver::INTERNAL);
wearable_item->updateServer(FALSE);
use_count++;
}
else
{
// Note: technically a bug, LLViewerWearable can identify only one item id at a time,
// yet we are tying it to multiple items here.
// LLViewerWearable need to support more then one item.
LL_WARNS() << "Same LLViewerWearable is used by multiple items! " << wearable->getAssetID() << LL_ENDL;
data.mWearable = wearable;
}
}
}
}
if (use_count > 1)
{
LL_WARNS() << "Copying wearable, multiple asset id uses! " << wearable->getAssetID() << LL_ENDL;
gInventory.notifyObservers();
}
}
static void onWearableAssetFetch(LLViewerWearable* wearable, void* data)

18
indra/newview/llappviewer.cpp
View File

@ -1433,7 +1433,8 @@ bool LLAppViewer::init()
// <FS:Ansariel> Init debug rects
LLView::sDebugRects = gSavedSettings.getBOOL("DebugViews");
showReleaseNotesIfRequired();
// TODO: consider moving proxy initialization here or LLCopocedureManager after proxy initialization, may be implement
// some other protection to make sure we don't use network before initializng proxy
/*----------------------------------------------------------------------*/
// nat 2016-06-29 moved the following here from the former mainLoop().
@ -6829,21 +6830,6 @@ void LLAppViewer::launchUpdater()
// LLAppViewer::instance()->forceQuit();
}
/**
* Check if user is running a new version of the viewer.
* Display the Release Notes if it's not overriden by the "UpdaterShowReleaseNotes" setting.
*/
void LLAppViewer::showReleaseNotesIfRequired()
{
if (LLVersionInfo::getChannelAndVersion() != gLastRunVersion
&& gSavedSettings.getBOOL("UpdaterShowReleaseNotes")
&& !gSavedSettings.getBOOL("FirstLoginThisInstall"))
{
LLSD info(getViewerInfo());
LLWeb::loadURLInternal(info["VIEWER_RELEASE_NOTES_URL"]);
}
}
//virtual
void LLAppViewer::setMasterSystemAudioMute(bool mute)
{

2
indra/newview/llappviewer.h
View File

@ -265,8 +265,6 @@ private:
void sendLogoutRequest();
void disconnectViewer();
void showReleaseNotesIfRequired();
// *FIX: the app viewer class should be some sort of singleton, no?
// Perhaps its child class is the singleton and this should be an abstract base.
static LLAppViewer* sInstance;

2
indra/newview/llblocklist.h
View File

@ -67,6 +67,8 @@ public:
void sortByType();
void refresh();
U32 getMuteListSize() { return mMuteListSize; }
private:
void addNewItem(const LLMute* mute);

9
indra/newview/llconversationloglist.cpp
View File

@ -379,8 +379,13 @@ bool LLConversationLogList::isActionEnabled(const LLSD& userdata)
bool is_p2p = LLIMModel::LLIMSession::P2P_SESSION == stype;
bool is_group = LLIMModel::LLIMSession::GROUP_SESSION == stype;
bool is_group_member = is_group && gAgent.isInGroup(selected_id, TRUE);
if ("can_im" == command_name || "can_view_profile" == command_name)
if ("can_im" == command_name)
{
return is_p2p || is_group_member;
}
else if ("can_view_profile" == command_name)
{
return is_p2p || is_group;
}
@ -390,7 +395,7 @@ bool LLConversationLogList::isActionEnabled(const LLSD& userdata)
}
else if ("can_call" == command_name)
{
return (is_p2p || is_group) && LLAvatarActions::canCall();
return (is_p2p || is_group_member) && LLAvatarActions::canCall();
}
else if ("add_rem_friend" == command_name ||
"can_invite_to_group" == command_name ||

4
indra/newview/llexpandabletextbox.cpp
View File

@ -63,10 +63,10 @@ public:
{
return start_offset;
}
/*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
/*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const
{
// require full line to ourselves
if (line_offset == 0)
if (line_offset == 0)
{
// print all our text
return getEnd() - getStart();

10
indra/newview/llfloaterimcontainer.cpp
View File

@ -1506,15 +1506,21 @@ bool LLFloaterIMContainer::checkContextMenuItem(const std::string& item, uuid_ve
bool LLFloaterIMContainer::visibleContextMenuItem(const LLSD& userdata)
{
const LLConversationItem *conversation_item = getCurSelectedViewModelItem();
if(!conversation_item)
{
return false;
}
const std::string& item = userdata.asString();
if ("show_mute" == item)
{
return !isMuted(getCurSelectedViewModelItem()->getUUID());
return !isMuted(conversation_item->getUUID());
}
else if ("show_unmute" == item)
{
return isMuted(getCurSelectedViewModelItem()->getUUID());
return isMuted(conversation_item->getUUID());
}
return true;

7
indra/newview/llfloaterimnearbychat.cpp
View File

@ -314,6 +314,13 @@ void LLFloaterIMNearbyChat::onClose(bool app_quitting)
{
// Override LLFloaterIMSessionTab::onClose() so that Nearby Chat is not removed from the conversation floater
LLFloaterIMSessionTab::restoreFloater();
if (app_quitting)
{
// We are starting and closing floater in "expanded" state
// Update expanded (restored) rect and position for use in next session
forceReshape();
storeRectControl();
}
}
// virtual

21
indra/newview/llfloaterland.cpp
View File

@ -2178,7 +2178,6 @@ void LLPanelLandOptions::refresh()
else
{
// something selected, hooray!
//LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion(); // <FS:LO> FIRE-16112 fix
// Display options
BOOL can_change_options = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_OPTIONS);
@ -2194,7 +2193,6 @@ void LLPanelLandOptions::refresh()
mCheckGroupObjectEntry ->set( parcel->getAllowGroupObjectEntry() || parcel->getAllowAllObjectEntry());
mCheckGroupObjectEntry ->setEnabled( can_change_options && !parcel->getAllowAllObjectEntry() );
//BOOL region_damage = regionp ? regionp->getAllowDamage() : FALSE; // <FS:LO> FIRE-16112 fix
// <FS:WF> FIRE-6604 : Reinstate the "Allow Other Residents to Edit Terrain" option in About Land
BOOL can_change_terraform = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_EDIT);
@ -2203,10 +2201,7 @@ void LLPanelLandOptions::refresh()
// <FS:WF>
mCheckSafe ->set( !parcel->getAllowDamage() );
// <FS:LO> FIRE-16112 fix
//mCheckSafe ->setEnabled( can_change_options && region_damage );
mCheckSafe ->setEnabled( can_change_options );
// </FS:LO>
mCheckFly ->set( parcel->getAllowFly() );
mCheckFly ->setEnabled( can_change_options );
@ -2292,7 +2287,7 @@ void LLPanelLandOptions::refresh()
// they can see the checkbox, but its disposition depends on the
// state of the region
LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion(); // <FS:LO> FIRE-16112 fix
LLViewerRegion* regionp = LLViewerParcelMgr::getInstance()->getSelectionRegion();
if (regionp)
{
if (regionp->getSimAccess() == SIM_ACCESS_PG)
@ -2666,11 +2661,8 @@ void LLPanelLandAccess::refresh()
mListAccess->clearSortOrder();
mListAccess->deleteAllItems();
S32 count = parcel->mAccessList.size();
// <FS:Ansariel> FIRE-9211: Add counter to parcel ban and access lists
//getChild<LLUICtrl>("AllowedText")->setTextArg("[COUNT]", llformat("%d",count));
getChild<LLUICtrl>("AllowedText")->setTextArg(LLStringExplicit("[LISTED]"), llformat("%d",count));
getChild<LLUICtrl>("AllowedText")->setTextArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST));
// </FS:Ansariel>
getChild<LLUICtrl>("AllowedText")->setTextArg("[COUNT]", llformat("%d",count));
getChild<LLUICtrl>("AllowedText")->setTextArg("[MAX]", llformat("%d",PARCEL_MAX_ACCESS_LIST));
getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",count));
getChild<LLUICtrl>("AccessList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST));
@ -2717,11 +2709,8 @@ void LLPanelLandAccess::refresh()
mListBanned->clearSortOrder();
mListBanned->deleteAllItems();
S32 count = parcel->mBanList.size();
// <FS:Ansariel> FIRE-9211: Add counter to parcel ban and access lists
//getChild<LLUICtrl>("BanCheck")->setTextArg("[COUNT]", llformat("%d",count));
getChild<LLUICtrl>("BanCheck")->setTextArg(LLStringExplicit("[LISTED]"), llformat("%d",count));
getChild<LLUICtrl>("BanCheck")->setTextArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST));
// </FS:Ansariel>
getChild<LLUICtrl>("BanCheck")->setTextArg("[COUNT]", llformat("%d",count));
getChild<LLUICtrl>("BanCheck")->setTextArg("[MAX]", llformat("%d",PARCEL_MAX_ACCESS_LIST));
getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[LISTED]"), llformat("%d",count));
getChild<LLUICtrl>("BannedList")->setToolTipArg(LLStringExplicit("[MAX]"), llformat("%d",PARCEL_MAX_ACCESS_LIST));

13
indra/newview/llfloaterpathfindingobjects.cpp
View File

@ -329,7 +329,7 @@ void LLFloaterPathfindingObjects::handleUpdateObjectList(LLPathfindingManager::r
}
}
void LLFloaterPathfindingObjects::rebuildObjectsScrollList()
void LLFloaterPathfindingObjects::rebuildObjectsScrollList(bool update_if_needed)
{
if (!mHasObjectsToBeSelected)
{
@ -355,7 +355,14 @@ void LLFloaterPathfindingObjects::rebuildObjectsScrollList()
{
buildObjectsScrollList(mObjectList);
mObjectsScrollList->selectMultiple(mObjectsToBeSelected);
if(mObjectsScrollList->selectMultiple(mObjectsToBeSelected) == 0)
{
if(update_if_needed && mRefreshListButton->getEnabled())
{
requestGetObjects();
return;
}
}
if (mHasObjectsToBeSelected)
{
mObjectsScrollList->scrollToShowSelected();
@ -484,7 +491,7 @@ void LLFloaterPathfindingObjects::showFloaterWithSelectionObjects()
}
else
{
rebuildObjectsScrollList();
rebuildObjectsScrollList(true);
if (isMinimized())
{
setMinimized(FALSE);

2
indra/newview/llfloaterpathfindingobjects.h
View File

@ -80,7 +80,7 @@ protected:
void handleNewObjectList(LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::ERequestStatus pRequestStatus, LLPathfindingObjectListPtr pObjectList);
void handleUpdateObjectList(LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::ERequestStatus pRequestStatus, LLPathfindingObjectListPtr pObjectList);
void rebuildObjectsScrollList();
void rebuildObjectsScrollList(bool update_if_needed = false);
virtual void buildObjectsScrollList(const LLPathfindingObjectListPtr pObjectListPtr);
void addObjectToScrollList(const LLPathfindingObjectPtr pObjectPr, const LLSD &pScrollListItemData);

81
indra/newview/llfloaterpreference.cpp
View File

@ -658,6 +658,11 @@ BOOL LLFloaterPreference::postBuild()
gSavedSettings.getControl("PreferredMaturity")->getSignal()->connect(boost::bind(&LLFloaterPreference::onChangeMaturity, this));
gSavedPerAccountSettings.getControl("ModelUploadFolder")->getSignal()->connect(boost::bind(&LLFloaterPreference::onChangeModelFolder, this));
gSavedPerAccountSettings.getControl("TextureUploadFolder")->getSignal()->connect(boost::bind(&LLFloaterPreference::onChangeTextureFolder, this));
gSavedPerAccountSettings.getControl("SoundUploadFolder")->getSignal()->connect(boost::bind(&LLFloaterPreference::onChangeSoundFolder, this));
gSavedPerAccountSettings.getControl("AnimationUploadFolder")->getSignal()->connect(boost::bind(&LLFloaterPreference::onChangeAnimationFolder, this));
LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
if (!tabcontainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
tabcontainer->selectFirstTab();
@ -770,6 +775,10 @@ BOOL LLFloaterPreference::postBuild()
onAvatarTagSettingsChanged();
// </FS:Ansariel>
// <FS:Ansariel> Correct enabled state of Animated Script Dialogs option
gSavedSettings.getControl("ScriptDialogsPosition")->getCommitSignal()->connect(boost::bind(&LLFloaterPreference::updateAnimatedScriptDialogs, this));
updateAnimatedScriptDialogs();
// <FS:Ansariel> Set max. UI scaling factor depending on max. supported OS scaling factor
#if LL_WINDOWS
if (IsWindowsVersionOrGreater(10, 0, 0))
@ -1149,7 +1158,12 @@ void LLFloaterPreference::onOpen(const LLSD& key)
// Display selected maturity icons.
onChangeMaturity();
onChangeModelFolder();
onChangeTextureFolder();
onChangeSoundFolder();
onChangeAnimationFolder();
// Load (double-)click to walk/teleport settings.
updateClickActionControls();
@ -3229,6 +3243,63 @@ void LLFloaterPreference::onChangeMaturity()
getChild<LLIconCtrl>("rating_icon_adult")->setVisible(sim_access == SIM_ACCESS_ADULT);
}
std::string get_category_path(LLUUID cat_id)
{
LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
std::string localized_cat_name;
if (!LLTrans::findString(localized_cat_name, "InvFolder " + cat->getName()))
{
localized_cat_name = cat->getName();
}
if (cat->getParentUUID().notNull())
{
return get_category_path(cat->getParentUUID()) + " > " + localized_cat_name;
}
else
{
return localized_cat_name;
}
}
std::string get_category_path(LLFolderType::EType cat_type)
{
LLUUID cat_id = gInventory.findUserDefinedCategoryUUIDForType(cat_type);
return get_category_path(cat_id);
}
void LLFloaterPreference::onChangeModelFolder()
{
if (gInventory.isInventoryUsable())
{
getChild<LLTextBox>("upload_models")->setText(get_category_path(LLFolderType::FT_OBJECT));
}
}
void LLFloaterPreference::onChangeTextureFolder()
{
if (gInventory.isInventoryUsable())
{
getChild<LLTextBox>("upload_textures")->setText(get_category_path(LLFolderType::FT_TEXTURE));
}
}
void LLFloaterPreference::onChangeSoundFolder()
{
if (gInventory.isInventoryUsable())
{
getChild<LLTextBox>("upload_sounds")->setText(get_category_path(LLFolderType::FT_SOUND));
}
}
void LLFloaterPreference::onChangeAnimationFolder()
{
if (gInventory.isInventoryUsable())
{
getChild<LLTextBox>("upload_animation")->setText(get_category_path(LLFolderType::FT_ANIMATION));
}
}
// FIXME: this will stop you from spawning the sidetray from preferences dialog on login screen
// but the UI for this will still be enabled
void LLFloaterPreference::onClickBlockList()
@ -3440,6 +3511,14 @@ void LLFloaterPreference::onAvatarTagSettingsChanged()
}
// </FS:Ansariel>
// <FS:Ansariel> Correct enabled state of Animated Script Dialogs option
void LLFloaterPreference::updateAnimatedScriptDialogs()
{
S32 position = gSavedSettings.getS32("ScriptDialogsPosition");
childSetEnabled("FSAnimatedScriptDialogs", position == 2 || position == 3);
}
// </FS:Ansariel>
//------------------------------Updater---------------------------------------
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues

7
indra/newview/llfloaterpreference.h
View File

@ -164,6 +164,9 @@ protected:
// <FS:Ansariel> Properly disable avatar tag setting
void onAvatarTagSettingsChanged();
// <FS:Ansariel> Correct enabled state of Animated Script Dialogs option
void updateAnimatedScriptDialogs();
public:
// This function squirrels away the current values of the controls so that
// cancel() can restore them.
@ -242,6 +245,10 @@ public:
void onCommitMusicEnabled();
void applyResolution();
void onChangeMaturity();
void onChangeModelFolder();
void onChangeTextureFolder();
void onChangeSoundFolder();
void onChangeAnimationFolder();
void onClickBlockList();
void onClickProxySettings();
void onClickTranslationSettings();

51
indra/newview/llfloaterscriptdebug.cpp
View File

@ -34,6 +34,7 @@
#include "llrect.h"
#include "llerror.h"
#include "llstring.h"
#include "llvoavatarself.h"
#include "message.h"
#include "lltrans.h"
@ -89,6 +90,38 @@ BOOL LLFloaterScriptDebug::postBuild()
return FALSE;
}
// <FS:Ansariel> Improved script debug floater
//void LLFloaterScriptDebug::setVisible(BOOL visible)
//{
// if(visible)
// {
// LLFloaterScriptDebugOutput* floater_output = LLFloaterReg::findTypedInstance<LLFloaterScriptDebugOutput>("script_debug_output", LLUUID::null);
// if (floater_output == NULL)
// {
// floater_output = dynamic_cast<LLFloaterScriptDebugOutput*>(LLFloaterReg::showInstance("script_debug_output", LLUUID::null, FALSE));
// if (floater_output)
// {
// addFloater(floater_output, false);
// }
// }
// }
// LLMultiFloater::setVisible(visible);
//}
//void LLFloaterScriptDebug::closeFloater(bool app_quitting/* = false*/)
//{
// if(app_quitting)
// {
// LLMultiFloater::closeFloater(app_quitting);
// }
// else
// {
// setVisible(false);
// }
//}
// </FS:Ansariel>
// <FS:Ansariel> Script debug icon
//LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id)
LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID& object_id, bool show /* = false */)
@ -132,10 +165,18 @@ void LLFloaterScriptDebug::addScriptLine(const LLChat& chat)
// <FS:Kadah> [FSllOwnerSayToScriptDebugWindow]
if (chat.mChatType == CHAT_TYPE_DEBUG_MSG)
{
objectp->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI));
// <FS:Ansariel> Mark script error icons
objectp->getIcon()->setScriptError();
// </FS:Ansariel> Mark script error icons
if(objectp->isHUDAttachment())
{
((LLViewerObject*)gAgentAvatarp)->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI));
// <FS:Ansariel> Mark script error icons
((LLViewerObject*)gAgentAvatarp)->getIcon()->setScriptError();
}
else
{
objectp->setIcon(LLViewerTextureManager::getFetchedTextureFromFile("script_error.j2c", FTT_LOCAL_FILE, TRUE, LLGLTexture::BOOST_UI));
// <FS:Ansariel> Mark script error icons
objectp->getIcon()->setScriptError();
}
}
// </FS:Kadah> [FSllOwnerSayToScriptDebugWindow]
floater_label = llformat("%s (%.0f, %.0f, %.0f)",
@ -153,7 +194,7 @@ void LLFloaterScriptDebug::addScriptLine(const LLChat& chat)
floater_label = chat.mFromName;
}
addOutputWindow(LLUUID::null);
addOutputWindow(LLUUID::null); // <FS:Ansariel> Improved script debug floater
// <FS:Kadah> [FSllOwnerSayToScriptDebugWindow]
// addOutputWindow(source_id);
static LLCachedControl<U32> FSllOwnerSayRouting(gSavedSettings, "FSllOwnerSayToScriptDebugWindowRouting");

3
indra/newview/llfloaterscriptdebug.h
View File

@ -39,7 +39,10 @@ public:
LLFloaterScriptDebug(const LLSD& key);
virtual ~LLFloaterScriptDebug();
virtual BOOL postBuild();
//virtual void setVisible(BOOL visible); // <FS:Ansariel> Improved script debug floater
static void show(const LLUUID& object_id);
/*virtual*/ //void closeFloater(bool app_quitting = false); // <FS:Ansariel> Improved script debug floater
// <FS:Kadah> [FSllOwnerSayToScriptDebugWindow]
// static void addScriptLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color, const LLUUID& source_id);
static void addScriptLine(const LLChat& chat);

14
indra/newview/llimview.cpp
View File

@ -3041,7 +3041,7 @@ void LLIMMgr::addMessage(
// Logically it would make more sense to reject the session sooner, in another area of the
// code, but the session has to be established inside the server before it can be left.
if (LLMuteList::getInstance()->isMuted(other_participant_id) && !from_linden)
if (LLMuteList::getInstance()->isMuted(other_participant_id, LLMute::flagTextChat) && !from_linden)
{
LL_WARNS() << "Leaving IM session from initiating muted resident " << from << LL_ENDL;
if(!gIMMgr->leaveSession(new_session_id))
@ -3492,14 +3492,20 @@ void LLIMMgr::inviteToSession(
payload["question_type"] = question_type;
//ignore invites from muted residents
if (LLMuteList::getInstance()->isMuted(caller_id) && !is_linden)
if (!is_linden)
{
if (voice_invite && "VoiceInviteQuestionDefault" == question_type)
if (LLMuteList::getInstance()->isMuted(caller_id, LLMute::flagVoiceChat)
&& voice_invite && "VoiceInviteQuestionDefault" == question_type)
{
LL_INFOS() << "Rejecting voice call from initiating muted resident " << caller_name << LL_ENDL;
LLIncomingCallDialog::processCallResponse(1, payload);
return;
}
else if (LLMuteList::getInstance()->isMuted(caller_id, LLMute::flagAll & ~LLMute::flagVoiceChat))
{
LL_INFOS() << "Rejecting session invite from initiating muted resident " << caller_name << LL_ENDL;
return;
}
return;
}
LLVoiceChannel* channelp = LLVoiceChannel::getChannelByID(session_id);

3
indra/newview/llinventorybridge.cpp
View File

@ -4134,6 +4134,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
disabled_items.push_back(std::string("New Gesture"));
disabled_items.push_back(std::string("New Clothes"));
disabled_items.push_back(std::string("New Body Parts"));
disabled_items.push_back(std::string("upload_def"));
}
if (favorites == mUUID)
{
@ -4160,6 +4161,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
disabled_items.push_back(std::string("New Gesture"));
disabled_items.push_back(std::string("New Clothes"));
disabled_items.push_back(std::string("New Body Parts"));
disabled_items.push_back(std::string("upload_def"));
}
if (marketplace_listings_id == mUUID)
{
@ -4213,6 +4215,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t& items
items.push_back(std::string("New Gesture"));
items.push_back(std::string("New Clothes"));
items.push_back(std::string("New Body Parts"));
items.push_back(std::string("upload_def"));
}
}
getClipboardEntries(false, items, disabled_items, flags);

11
indra/newview/llinventoryfilter.cpp
View File

@ -40,6 +40,7 @@
#include "llinventorybridge.h"
#include "llviewerfoldertype.h"
#include "llradiogroup.h"
#include "llstartup.h"
// linden library includes
#include "llclipboard.h"
@ -219,8 +220,10 @@ bool LLInventoryFilter::checkFolder(const LLUUID& folder_id) const
}
// when applying a filter, matching folders get their contents downloaded first
// but make sure we are not interfering with pre-download
if (isNotDefault()
&& !gInventory.isCategoryComplete(folder_id))
&& !gInventory.isCategoryComplete(folder_id)
&& LLStartUp::getStartupState() > STATE_WEARABLES_WAIT)
{
LLInventoryModelBackgroundFetch::instance().start(folder_id);
}
@ -425,7 +428,11 @@ bool LLInventoryFilter::checkAgainstFilterType(const LLFolderViewModelItemInvent
if (is_hidden_if_empty)
{
// Force the fetching of those folders so they are hidden if they really are empty...
gInventory.fetchDescendentsOf(object_id);
// But don't interfere with startup download
if (LLStartUp::getStartupState() > STATE_WEARABLES_WAIT)
{
gInventory.fetchDescendentsOf(object_id);
}
LLInventoryModel::cat_array_t* cat_array = NULL;
LLInventoryModel::item_array_t* item_array = NULL;

36
indra/newview/llinventorymodel.cpp
View File

@ -539,6 +539,42 @@ const LLUUID LLInventoryModel::findCategoryUUIDForType(LLFolderType::EType prefe
return findCategoryUUIDForTypeInRoot(preferred_type, create_folder, gInventory.getRootFolderID());
}
const LLUUID LLInventoryModel::findUserDefinedCategoryUUIDForType(LLFolderType::EType preferred_type)
{
LLUUID cat_id;
switch (preferred_type)
{
case LLFolderType::FT_OBJECT:
{
cat_id = LLUUID(gSavedPerAccountSettings.getString("ModelUploadFolder"));
break;
}
case LLFolderType::FT_TEXTURE:
{
cat_id = LLUUID(gSavedPerAccountSettings.getString("TextureUploadFolder"));
break;
}
case LLFolderType::FT_SOUND:
{
cat_id = LLUUID(gSavedPerAccountSettings.getString("SoundUploadFolder"));
break;
}
case LLFolderType::FT_ANIMATION:
{
cat_id = LLUUID(gSavedPerAccountSettings.getString("AnimationUploadFolder"));
break;
}
default:
break;
}
if (cat_id.isNull() || !getCategory(cat_id))
{
cat_id = findCategoryUUIDForTypeInRoot(preferred_type, true, getRootFolderID());
}
return cat_id;
}
const LLUUID LLInventoryModel::findLibraryCategoryUUIDForType(LLFolderType::EType preferred_type, bool create_folder)
{
return findCategoryUUIDForTypeInRoot(preferred_type, create_folder, gInventory.getLibraryRootFolderID());

3
indra/newview/llinventorymodel.h
View File

@ -312,6 +312,9 @@ public:
// will search in the user's library folder instead of "My Inventory"
const LLUUID findLibraryCategoryUUIDForType(LLFolderType::EType preferred_type,
bool create_folder = true);
// Returns user specified category for uploads, returns default id if there are no
// user specified one or it does not exist, creates default category if it is missing.
const LLUUID findUserDefinedCategoryUUIDForType(LLFolderType::EType preferred_type);
// Get whatever special folder this object is a child of, if any.
const LLViewerInventoryCategory *getFirstNondefaultParent(const LLUUID& obj_id) const;

23
indra/newview/llinventorypanel.cpp
View File

@ -178,8 +178,8 @@ LLInventoryPanel::LLInventoryPanel(const LLInventoryPanel::Params& p) :
mCommitCallbackRegistrar.add("Inventory.AttachObject", boost::bind(&LLInventoryPanel::attachObject, this, _2));
mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&LLInventoryPanel::beginIMSession, this));
mCommitCallbackRegistrar.add("Inventory.Share", boost::bind(&LLAvatarActions::shareWithAvatars, this));
mCommitCallbackRegistrar.add("Inventory.FileUploadLocation", boost::bind(&LLInventoryPanel::fileUploadLocation, this, _2));
mCommitCallbackRegistrar.add("Inventory.CustomAction", boost::bind(&LLInventoryPanel::onCustomAction, this, _2)); // <FS:Ansariel> Prevent warning "No callback found for: 'Inventory.CustomAction' in control: Find Links"
}
LLFolderView * LLInventoryPanel::createFolderRoot(LLUUID root_id )
@ -1320,6 +1320,27 @@ bool LLInventoryPanel::beginIMSession()
return true;
}
void LLInventoryPanel::fileUploadLocation(const LLSD& userdata)
{
const std::string param = userdata.asString();
if (param == "model")
{
gSavedPerAccountSettings.setString("ModelUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
}
else if (param == "texture")
{
gSavedPerAccountSettings.setString("TextureUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
}
else if (param == "sound")
{
gSavedPerAccountSettings.setString("SoundUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
}
else if (param == "animation")
{
gSavedPerAccountSettings.setString("AnimationUploadFolder", LLFolderBridge::sSelf.get()->getUUID().asString());
}
}
bool LLInventoryPanel::attachObject(const LLSD& userdata)
{
// Copy selected item UUIDs to a vector.

1
indra/newview/llinventorypanel.h
View File

@ -210,6 +210,7 @@ public:
void onCustomAction(const LLSD& userdata); // <FS:Ansariel> Prevent warning "No callback found for: 'Inventory.CustomAction' in control: Find Links"
void doCreate(const LLSD& userdata);
bool beginIMSession();
void fileUploadLocation(const LLSD& userdata);
bool attachObject(const LLSD& userdata);
static void idle(void* user_data);

2
indra/newview/llloginhandler.cpp
View File

@ -175,7 +175,7 @@ LLPointer<LLCredential> LLLoginHandler::loadSavedUserLoginInfo()
authenticator["algorithm"] = "md5";
authenticator["secret"] = md5pass;
// yuck, we'll fix this with mani's changes.
gSavedSettings.setBOOL("AutoLogin", TRUE);
gSavedSettings.setBOOL("AutoLogin", TRUE); // <FS:Ansariel> Re-added because handled via FSLoginDontSavePassword debug setting
return gSecAPIHandler->createCredential(identifier["first_name"].asString() + " " + identifier["last_name"].asString() + "@" +LLGridManager::getInstance()->getGrid(),
identifier, authenticator);
}

12
indra/newview/llmeshrepository.cpp
View File

@ -2036,8 +2036,8 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures)
LLSD result;
LLSD res;
result["folder_id"] = gInventory.findCategoryUUIDForType(LLFolderType::FT_OBJECT);
result["texture_folder_id"] = gInventory.findCategoryUUIDForType(LLFolderType::FT_TEXTURE);
result["folder_id"] = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_OBJECT);
result["texture_folder_id"] = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_TEXTURE);
result["asset_type"] = "mesh";
result["inventory_type"] = "object";
result["description"] = "(No Description)";
@ -3582,11 +3582,11 @@ void LLMeshRepository::notifyLoadedMeshes()
// Handle addition of texture, if any.
if ( data.mResponse.has("new_texture_folder_id") )
{
const LLUUID& folder_id = data.mResponse["new_texture_folder_id"].asUUID();
const LLUUID& new_folder_id = data.mResponse["new_texture_folder_id"].asUUID();
if ( folder_id.notNull() )
if ( new_folder_id.notNull() )
{
LLUUID parent_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TEXTURE);
LLUUID parent_id = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_TEXTURE);
std::string name;
// Check if the server built a different name for the texture folder
@ -3601,7 +3601,7 @@ void LLMeshRepository::notifyLoadedMeshes()
// Add the category to the internal representation
LLPointer<LLViewerInventoryCategory> cat =
new LLViewerInventoryCategory(folder_id, parent_id,
new LLViewerInventoryCategory(new_folder_id, parent_id,
LLFolderType::FT_NONE, name, gAgent.getID());
cat->setVersion(LLViewerInventoryCategory::VERSION_UNKNOWN);

3
indra/newview/llpanelblockedlist.cpp
View File

@ -146,6 +146,9 @@ void LLPanelBlockedList::updateButtons()
bool hasSelected = NULL != mBlockedList->getSelectedItem();
getChildView("unblock_btn")->setEnabled(hasSelected);
getChildView("blocked_gear_btn")->setEnabled(hasSelected);
getChild<LLUICtrl>("block_limit")->setTextArg("[COUNT]", llformat("%d", mBlockedList->getMuteListSize()));
getChild<LLUICtrl>("block_limit")->setTextArg("[LIMIT]", llformat("%d", gSavedSettings.getS32("MuteListLimit")));
}
void LLPanelBlockedList::unblockItem()

28
indra/newview/llpanelface.cpp
View File

@ -750,7 +750,7 @@ void LLPanelFace::getState()
updateUI();
}
void LLPanelFace::updateUI()
void LLPanelFace::updateUI(bool force_set_values /*false*/)
{ //set state of UI to match state of texture entry(ies) (calls setEnabled, setValue, etc, but NOT setVisible)
LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
@ -1146,7 +1146,14 @@ void LLPanelFace::updateUI()
mCtrlBumpyScaleV->setEnabled(editable && normmap_id.notNull()
&& enable_material_controls); // <FS:CR> Materials alignment
mCtrlTexScaleV->setValue(diff_scale_t);
if (force_set_values)
{
mCtrlTexScaleV->forceSetValue(diff_scale_t);
}
else
{
mCtrlTexScaleV->setValue(diff_scale_t);
}
mCtrlShinyScaleV->setValue(norm_scale_t);
mCtrlBumpyScaleV->setValue(spec_scale_t);
@ -1366,9 +1373,18 @@ void LLPanelFace::updateUI()
BOOL repeats_tentative = !identical_repeats;
mCtrlRpt->setEnabled(identical_planar_texgen ? FALSE : enabled);
mCtrlRpt->setValue(editable ? repeats : 1.0f);
//LLSpinCtrl* rpt_ctrl = getChild<LLSpinCtrl>("rptctrl");
if (force_set_values)
{
//onCommit, previosly edited element updates related ones
mCtrlRpt->forceSetValue(editable ? repeats : 1.0f);
}
else
{
mCtrlRpt->setValue(editable ? repeats : 1.0f);
}
mCtrlRpt->setTentative(LLSD(repeats_tentative));
// <FS:CR> FIRE-11407 - Flip buttons
getChildView("flipTextureScaleU")->setEnabled(enabled);
getChildView("flipTextureScaleV")->setEnabled(enabled);
@ -2115,6 +2131,8 @@ void LLPanelFace::onCommitTextureInfo( LLUICtrl* ctrl, void* userdata )
{
LLPanelFace* self = (LLPanelFace*) userdata;
self->sendTextureInfo();
// vertical scale and repeats per meter depends on each other, so force set on changes
self->updateUI(true);
// <FS:CR> Materials alignment
if (gSavedSettings.getBOOL("FSSyncronizeTextureMaps"))
{
@ -2185,6 +2203,8 @@ void LLPanelFace::onCommitRepeatsPerMeter(LLUICtrl* ctrl, void* userdata)
llassert(false);
break;
}
// vertical scale and repeats per meter depends on each other, so force set on changes
self->updateUI(true);
}
struct LLPanelFaceSetMediaFunctor : public LLSelectedTEFunctor

3
indra/newview/llpanelface.h
View File

@ -154,7 +154,8 @@ protected:
// Make UI reflect state of currently selected material (refresh)
// and UI mode (e.g. editing normal map v diffuse map)
//
void updateUI();
// @param force_set_values forces spinners to set value even if they are focused
void updateUI(bool force_set_values = false);
// Convenience func to determine if all faces in selection have
// identical planar texgen settings during edits

2
indra/newview/llpanelgroupgeneral.cpp
View File

@ -1161,7 +1161,7 @@ S32 LLPanelGroupGeneral::sortMembersList(S32 col_idx,const LLScrollListItem* i1,
// <FS:Ansariel> FIRE-20149: Refresh insignia texture when clicking the refresh button
void LLPanelGroupGeneral::refreshInsigniaTexture()
{
if (mInsignia)
if (mInsignia && mInsignia->getTexture())
{
destroy_texture(mInsignia->getTexture()->getID());
}

13
indra/newview/llpanelobjectinventory.cpp
View File

@ -1655,6 +1655,7 @@ LLPanelObjectInventory::LLPanelObjectInventory(const LLPanelObjectInventory::Par
mCommitCallbackRegistrar.add("Inventory.AttachObject", boost::bind(&do_nothing));
mCommitCallbackRegistrar.add("Inventory.BeginIMSession", boost::bind(&do_nothing));
mCommitCallbackRegistrar.add("Inventory.Share", boost::bind(&LLAvatarActions::shareWithAvatars, this));
mCommitCallbackRegistrar.add("Inventory.FileUploadLocation", boost::bind(&do_nothing));
mCommitCallbackRegistrar.add("Inventory.CustomAction", boost::bind(&do_nothing)); // <FS:Ansariel> Prevent warning "No callback found for: 'Inventory.CustomAction' in control: Find Links"
}
@ -2000,6 +2001,7 @@ void LLPanelObjectInventory::refresh()
if(mTaskUUID != object->mID)
{
mTaskUUID = object->mID;
mAttachmentUUID = object->getAttachmentItemID();
make_request = TRUE;
// This is a new object so pre-emptively clear the contents
@ -2009,6 +2011,16 @@ void LLPanelObjectInventory::refresh()
// Register for updates from this object,
registerVOInventoryListener(object,NULL);
}
else if (mAttachmentUUID != object->getAttachmentItemID())
{
mAttachmentUUID = object->getAttachmentItemID();
if (mAttachmentUUID.notNull())
{
// Server unsubsribes viewer (deselects object) from property
// updates after "ObjectAttach" so we need to resubscribe
LLSelectMgr::getInstance()->sendSelect();
}
}
// Based on the node information, we may need to dirty the
// object inventory and get it again.
@ -2039,6 +2051,7 @@ void LLPanelObjectInventory::refresh()
void LLPanelObjectInventory::clearInventoryTask()
{
mTaskUUID = LLUUID::null;
mAttachmentUUID = LLUUID::null;
removeVOInventoryListener();
clearContents();
}

1
indra/newview/llpanelobjectinventory.h
View File

@ -108,6 +108,7 @@ private:
LLFolderView* mFolders;
LLUUID mTaskUUID;
LLUUID mAttachmentUUID;
BOOL mHaveInventory;
BOOL mIsInventoryEmpty;
BOOL mInventoryNeedsUpdate;

10
indra/newview/llpanelplaces.cpp
View File

@ -314,7 +314,11 @@ BOOL LLPanelPlaces::postBuild()
enable_registrar.add("Places.OverflowMenu.Enable", boost::bind(&LLPanelPlaces::onOverflowMenuItemEnable, this, _2));
mPlaceMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_place.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
if (!mPlaceMenu)
if (mPlaceMenu)
{
mPlaceMenu->setAlwaysShowMenu(TRUE);
}
else
{
LL_WARNS() << "Error loading Place menu" << LL_ENDL;
}
@ -1043,7 +1047,7 @@ void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)
mPlaceInfoType == LANDMARK_TAB_INFO_TYPE)
{
mLandmarkInfo->setVisible(visible);
mPlaceProfile->setVisible(FALSE);
if (visible)
{
mLandmarkInfo->resetLocation();
@ -1051,8 +1055,6 @@ void LLPanelPlaces::togglePlaceInfoPanel(BOOL visible)
LLRect rect = getRect();
LLRect new_rect = LLRect(rect.mLeft, rect.mTop, rect.mRight, mTabContainer->getRect().mBottom);
mLandmarkInfo->reshape(new_rect.getWidth(), new_rect.getHeight());
mPlaceProfile->setVisible(FALSE);
}
else
{

11
indra/newview/llpanelprimmediacontrols.cpp
View File

@ -566,11 +566,16 @@ void LLPanelPrimMediaControls::updateShape()
}
}
// MAINT-1392 If this is a HUD always set it visible, but hide each control if user has no perms.
// When setting it invisible it won't receive any mouse messages anymore
// Web plugins and HUD may have media controls invisible for user, but still need scroll mouse events.
// LLView checks for visibleEnabledAndContains() and won't pass events to invisible panel, so instead
// of hiding whole panel hide each control instead (if user has no perms).
// Note: It might be beneficial to keep panel visible for all plugins to make behavior consistent, but
// for now limiting change to cases that need events.
if( !is_hud )
if (!is_hud && (!media_plugin || media_plugin->pluginSupportsMediaTime()))
{
setVisible(enabled);
}
else
{
if( !hasPermsControl )

40
indra/newview/llpanelsnapshotpostcard.cpp
View File

@ -45,6 +45,8 @@
#include <boost/regex.hpp>
#include "llviewernetwork.h"
/**
* Sends postcard via email.
*/
@ -58,6 +60,7 @@ public:
/*virtual*/ ~LLPanelSnapshotPostcard(); // <FS:Ansariel> Store settings at logout
/*virtual*/ BOOL postBuild();
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ S32 notify(const LLSD& info); // <FS:Ansariel> For OpenSim compatibility
private:
/*virtual*/ std::string getWidthSpinnerName() const { return "postcard_snapshot_width"; }
@ -79,6 +82,7 @@ private:
void onSend();
bool mHasFirstMsgFocus;
std::string mAgentEmail; // <FS:Ansariel> For OpenSim compatibility
};
static LLPanelInjector<LLPanelSnapshotPostcard> panel_class("llpanelsnapshotpostcard");
@ -123,9 +127,36 @@ void LLPanelSnapshotPostcard::onOpen(const LLSD& key)
}
// </FS:Ansariel>
// <FS:Ansariel> For OpenSim compatibility
// pick up the user's up-to-date email address
if (mAgentEmail.empty())
{
gAgent.sendAgentUserInfoRequest();
}
// </FS:Ansariel>
LLPanelSnapshot::onOpen(key);
}
// <FS:Ansariel> For OpenSim compatibility
// virtual
S32 LLPanelSnapshotPostcard::notify(const LLSD& info)
{
if (!info.has("agent-email"))
{
llassert(info.has("agent-email"));
return 0;
}
if (mAgentEmail.empty())
{
mAgentEmail = info["agent-email"].asString();
}
return 1;
}
// </FS:Ansariel>
// virtual
void LLPanelSnapshotPostcard::updateControls(const LLSD& info)
{
@ -178,6 +209,7 @@ void LLPanelSnapshotPostcard::sendPostcard()
if (!url.empty())
{
LLResourceUploadInfo::ptr_t uploadInfo(new LLPostcardUploadInfo(
mAgentEmail, // <FS:Ansariel> For OpenSim compatibility; LLResourceUploadInfo will omit this in case of SL
getChild<LLUICtrl>("name_form")->getValue().asString(),
getChild<LLUICtrl>("to_form")->getValue().asString(),
getChild<LLUICtrl>("subject_form")->getValue().asString(),
@ -240,6 +272,14 @@ void LLPanelSnapshotPostcard::onSend()
return;
}
// <FS:Ansariel> For OpenSim compatibility
if (!LLGridManager::instance().isInSecondLife() && (mAgentEmail.empty() || !boost::regex_match(mAgentEmail, email_format)))
{
LLNotificationsUtil::add("PromptSelfEmail");
return;
}
// </FS:Ansariel>
std::string subject(getChild<LLUICtrl>("subject_form")->getValue().asString());
if(subject.empty() || !mHasFirstMsgFocus)
{

13
indra/newview/llpostcard.cpp
View File

@ -38,12 +38,17 @@
#include "llassetstorage.h"
#include "llviewerassetupload.h"
#include "llviewernetwork.h"
///////////////////////////////////////////////////////////////////////////////
LLPostcardUploadInfo::LLPostcardUploadInfo(std::string nameFrom, std::string emailTo,
// <FS:Ansariel> For OpenSim compatibility
//LLPostcardUploadInfo::LLPostcardUploadInfo(std::string nameFrom, std::string emailTo,
LLPostcardUploadInfo::LLPostcardUploadInfo(std::string emailFrom, std::string nameFrom, std::string emailTo,
// </FS:Ansariel>
std::string subject, std::string message, LLVector3d globalPosition,
LLPointer<LLImageFormatted> image, invnUploadFinish_f finish) :
LLBufferedAssetUploadInfo(LLUUID::null, image, finish),
mEmailFrom(emailFrom), // <FS:Ansariel> For OpenSim compatibility
mNameFrom(nameFrom),
mEmailTo(emailTo),
mSubject(subject),
@ -57,6 +62,12 @@ LLSD LLPostcardUploadInfo::generatePostBody()
LLSD postcard = LLSD::emptyMap();
postcard["pos-global"] = mGlobalPosition.getValue();
postcard["to"] = mEmailTo;
// <FS:Ansariel> For OpenSim compatibility
if (!LLGridManager::instance().isInSecondLife())
{
postcard["from"] = mEmailFrom;
}
// </FS:Ansariel>
postcard["name"] = mNameFrom;
postcard["subject"] = mSubject;
postcard["msg"] = mMessage;

6
indra/newview/llpostcard.h
View File

@ -53,12 +53,16 @@ private:
class LLPostcardUploadInfo : public LLBufferedAssetUploadInfo
{
public:
LLPostcardUploadInfo(std::string nameFrom, std::string emailTo,
// <FS:Ansariel> For OpenSim compatibility
//LLPostcardUploadInfo(std::string nameFrom, std::string emailTo,
LLPostcardUploadInfo(std::string emailFrom, std::string nameFrom, std::string emailTo,
// </FS:Ansariel>
std::string subject, std::string message, LLVector3d globalPosition,
LLPointer<LLImageFormatted> image, invnUploadFinish_f finish);
virtual LLSD generatePostBody();
private:
std::string mEmailFrom; // <FS:Ansariel> For OpenSim compatibility
std::string mNameFrom;
std::string mEmailTo;
std::string mSubject;

50
indra/newview/llscriptfloater.cpp
View File

@ -127,47 +127,9 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id)
//LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445)
floater->setAutoFocus(FALSE);
LLScriptFloaterManager::e_object_type floaterType=LLScriptFloaterManager::getObjectType(notification_id);
// for some reason an inventory offer comes back as OBJ_UNKNOWN -Zi
if(floaterType==LLScriptFloaterManager::OBJ_UNKNOWN ||
floaterType==LLScriptFloaterManager::OBJ_SCRIPT)
if(LLScriptFloaterManager::OBJ_SCRIPT == LLScriptFloaterManager::getObjectType(notification_id))
{
floater->setSavePosition(true);
if(gSavedSettings.getBOOL("ShowScriptDialogsTopRight") ||
gSavedSettings.getBOOL("FSDisableIMChiclets")
)
{
// undock the dialog
floater->setDocked(false,true);
LLRect pos=floater->getRect();
S32 width=pos.getWidth();
S32 height=pos.getHeight();
pos.setOriginAndSize(gViewerWindow->getWorldViewWidthScaled()-width,
gViewerWindow->getWorldViewHeightScaled()-height,
width,height);
floater->setRect(pos);
floater->savePosition();
}
// do this only for inventory offers -Zi
else if(floaterType==LLScriptFloaterManager::OBJ_UNKNOWN)
{
// undock the dialog
floater->setDocked(false,true);
LLRect pos=floater->getRect();
S32 width=pos.getWidth();
S32 height=pos.getHeight();
pos.setOriginAndSize(gViewerWindow->getWorldViewWidthScaled()-width,
gViewerWindow->getWorldViewHeightScaled()-height,
width,height);
floater->setRect(pos);
floater->savePosition();
}
floater->restorePosition();
}
else
@ -892,16 +854,6 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id)
{
eDialogPosition dialog_position = (eDialogPosition)gSavedSettings.getS32("ScriptDialogsPosition");
if (dialog_position == POS_LEGACY)
{
dialog_position = POS_TOP_RIGHT;
if (!gSavedSettings.getBOOL("ShowScriptDialogsTopRight"))
{
dialog_position = POS_DOCKED;
}
gSavedSettings.setS32("ScriptDialogsPosition", (S32)dialog_position);
}
if (dialog_position == POS_DOCKED && chicletsDisabled)
{
dialog_position = POS_TOP_RIGHT;

3
indra/newview/llscriptfloater.h
View File

@ -235,8 +235,7 @@ public:
// <FS:Zi> script dialogs position
enum eDialogPosition
{
POS_LEGACY, // Use ShowScriptDialogsTopRight once and convert to one of these
POS_DOCKED,
POS_DOCKED = 1,
POS_TOP_LEFT,
POS_TOP_RIGHT,
POS_BOTTOM_LEFT,

5
indra/newview/llselectmgr.cpp
View File

@ -4576,6 +4576,9 @@ void LLSelectMgr::sendAttach(U8 attachment_point, bool replace)
SEND_ONLY_ROOTS );
if (!build_mode)
{
// After "ObjectAttach" server will unsubscribe us from properties updates
// so either deselect objects or resend selection after attach packet reaches server
// In case of build_mode LLPanelObjectInventory::refresh() will deal with selection
deselectAll();
}
}
@ -7385,7 +7388,7 @@ F32 LLObjectSelection::getSelectedLinksetCost()
LLSelectNode* node = *iter;
LLViewerObject* object = node->getObject();
if (object)
if (object && !object->isAttachment())
{
LLViewerObject* root = static_cast<LLViewerObject*>(object->getRoot());
if (root)

1
indra/newview/llsidepanelappearance.cpp
View File

@ -425,6 +425,7 @@ void LLSidepanelAppearance::toggleWearableEditPanel(BOOL visible, LLViewerWearab
{
// Save changes if closing.
mEditWearable->saveChanges();
mEditWearable->setWearable(NULL);
LLAppearanceMgr::getInstance()->updateIsDirty();
if (change_state)
{

113
indra/newview/llsidepaneliteminfo.cpp
View File

@ -818,23 +818,7 @@ void LLSidepanelItemInfo::onCommitName()
{
LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
new_item->rename(labelItemName->getText());
if(mObjectID.isNull())
{
new_item->updateServer(FALSE);
gInventory.updateItem(new_item);
gInventory.notifyObservers();
}
else
{
LLViewerObject* object = gObjectList.findObject(mObjectID);
if(object)
{
object->updateInventory(
new_item,
TASK_INVENTORY_ITEM_KEY,
false);
}
}
onCommitChanges(new_item);
}
}
@ -855,23 +839,7 @@ void LLSidepanelItemInfo::onCommitDescription()
LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
new_item->setDescription(labelItemDesc->getText());
if(mObjectID.isNull())
{
new_item->updateServer(FALSE);
gInventory.updateItem(new_item);
gInventory.notifyObservers();
}
else
{
LLViewerObject* object = gObjectList.findObject(mObjectID);
if(object)
{
object->updateInventory(
new_item,
TASK_INVENTORY_ITEM_KEY,
false);
}
}
onCommitChanges(new_item);
}
}
@ -947,23 +915,7 @@ void LLSidepanelItemInfo::onCommitPermissions()
flags |= LLInventoryItemFlags::II_FLAGS_OBJECT_PERM_OVERWRITE_GROUP;
}
new_item->setFlags(flags);
if(mObjectID.isNull())
{
new_item->updateServer(FALSE);
gInventory.updateItem(new_item);
gInventory.notifyObservers();
}
else
{
LLViewerObject* object = gObjectList.findObject(mObjectID);
if(object)
{
object->updateInventory(
new_item,
TASK_INVENTORY_ITEM_KEY,
false);
}
}
onCommitChanges(new_item);
}
else
{
@ -1047,25 +999,7 @@ void LLSidepanelItemInfo::updateSaleInfo()
}
new_item->setSaleInfo(sale_info);
if(mObjectID.isNull())
{
// This is in the agent's inventory.
new_item->updateServer(FALSE);
gInventory.updateItem(new_item);
gInventory.notifyObservers();
}
else
{
// This is in an object's contents.
LLViewerObject* object = gObjectList.findObject(mObjectID);
if(object)
{
object->updateInventory(
new_item,
TASK_INVENTORY_ITEM_KEY,
false);
}
}
onCommitChanges(new_item);
}
else
{
@ -1074,6 +1008,45 @@ void LLSidepanelItemInfo::updateSaleInfo()
}
}
void LLSidepanelItemInfo::onCommitChanges(LLPointer<LLViewerInventoryItem> item)
{
if (item.isNull())
{
return;
}
if (mObjectID.isNull())
{
// This is in the agent's inventory.
item->updateServer(FALSE);
gInventory.updateItem(item);
gInventory.notifyObservers();
}
else
{
// This is in an object's contents.
LLViewerObject* object = gObjectList.findObject(mObjectID);
if (object)
{
object->updateInventory(
item,
TASK_INVENTORY_ITEM_KEY,
false);
if (object->isSelected())
{
// Since object is selected (build floater is open) object will
// receive properties update, detect serial mismatch, dirty and
// reload inventory, meanwhile some other updates will refresh it.
// So mark dirty early, this will prevent unnecessary changes
// and download will be triggered by LLPanelObjectInventory - it
// prevents flashing in content tab and some duplicated request.
object->dirtyInventory();
}
}
}
}
LLViewerInventoryItem* LLSidepanelItemInfo::findItem() const
{
LLViewerInventoryItem* item = NULL;

1
indra/newview/llsidepaneliteminfo.h
View File

@ -89,6 +89,7 @@ protected:
void onCommitSaleInfo();
void onCommitSaleType();
void updateSaleInfo();
void onCommitChanges(LLPointer<LLViewerInventoryItem> item);
};
#endif // LL_LLSIDEPANELITEMINFO_H

27
indra/newview/llstartup.cpp
View File

@ -300,6 +300,7 @@ boost::scoped_ptr<LLViewerStats::PhaseMap> LLStartUp::sPhases(new LLViewerStats:
void login_show();
void login_callback(S32 option, void* userdata);
void show_release_notes_if_required();
//void show_first_run_dialog(); // <FS:CR> Unused in Firestorm
bool first_run_dialog_callback(const LLSD& notification, const LLSD& response);
void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);
@ -1023,6 +1024,7 @@ bool idle_startup()
}
else if (gSavedSettings.getBOOL("AutoLogin"))
{
// Log into last account
// <FS:Ansariel> Option to not save password if using login cmdline switch;
// gLoginHandler.initializeLoginInfo() sets AutoLogin to TRUE,
// so we end up here!
@ -1041,6 +1043,14 @@ bool idle_startup()
show_connect_box = false;
}
// <FS:Ansariel> Handled via FSLoginDontSavePassword debug setting
//else if (gSavedSettings.getLLSD("UserLoginInfo").size() == 3)
//{
// // Console provided login&password
// gRememberPassword = gSavedSettings.getBOOL("RememberPassword");
// show_connect_box = false;
//}
// </FS:Ansariel>
else
{
gRememberPassword = gSavedSettings.getBOOL("RememberPassword");
@ -1064,6 +1074,7 @@ bool idle_startup()
set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str());
display_startup();
// LLViewerMedia::initBrowser();
show_release_notes_if_required();
LLStartUp::setStartupState( STATE_LOGIN_SHOW );
return FALSE;
}
@ -3035,6 +3046,22 @@ void login_callback(S32 option, void *userdata)
}
}
/**
* Check if user is running a new version of the viewer.
* Display the Release Notes if it's not overriden by the "UpdaterShowReleaseNotes" setting.
*/
void show_release_notes_if_required()
{
if (LLVersionInfo::getChannelAndVersion() != gLastRunVersion
&& LLVersionInfo::getViewerMaturity() != LLVersionInfo::TEST_VIEWER // don't show Release Notes for the test builds
&& gSavedSettings.getBOOL("UpdaterShowReleaseNotes")
&& !gSavedSettings.getBOOL("FirstLoginThisInstall"))
{
LLSD info(LLAppViewer::instance()->getViewerInfo());
LLWeb::loadURLInternal(info["VIEWER_RELEASE_NOTES_URL"]);
}
}
// <FS:CR> Ditch the first run modal. Assume the user already has an account.
//void show_first_run_dialog()
//{

73
indra/newview/lltoolpie.cpp
View File

@ -370,60 +370,45 @@ BOOL LLToolPie::handleLeftClickPick()
// If left-click never selects or spawns a menu
// Eat the event.
if (!gSavedSettings.getBOOL("LeftClickShowMenu"))
// mouse already released
if (!mMouseButtonDown)
{
// mouse already released
if (!mMouseButtonDown)
{
return true;
}
return true;
}
while( object && object->isAttachment() && !object->flagHandleTouch())
while (object && object->isAttachment() && !object->flagHandleTouch())
{
// don't pick avatar through hud attachment
if (object->isHUDAttachment())
{
// don't pick avatar through hud attachment
if (object->isHUDAttachment())
{
break;
}
object = (LLViewerObject*)object->getParent();
break;
}
// <FS:Ansariel> FIRE-15189: Fix ClickToWalk not allowing mouse-walk (behavior change)
//if (object && object == gAgentAvatarp && !gSavedSettings.getBOOL("ClickToWalk"))
if (object && object == gAgentAvatarp)
// </FS:Ansariel>
{
// we left clicked on avatar, switch to focus mode
mMouseButtonDown = false;
LLToolMgr::getInstance()->setTransientTool(LLToolCamera::getInstance());
gViewerWindow->hideCursor();
LLToolCamera::getInstance()->setMouseCapture(TRUE);
LLToolCamera::getInstance()->pickCallback(mPick);
if(!gSavedSettings.getBOOL("ClickOnAvatarKeepsCamera")) // keep camera in place when clicking on ourselves -Zi
gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
object = (LLViewerObject*)object->getParent();
}
// <FS:Ansariel> FIRE-15189: Fix ClickToWalk not allowing mouse-walk (behavior change)
//if (object && object == gAgentAvatarp && !gSavedSettings.getBOOL("ClickToWalk"))
if (object && object == gAgentAvatarp)
// </FS:Ansariel>
{
// we left clicked on avatar, switch to focus mode
mMouseButtonDown = false;
LLToolMgr::getInstance()->setTransientTool(LLToolCamera::getInstance());
gViewerWindow->hideCursor();
LLToolCamera::getInstance()->setMouseCapture(TRUE);
LLToolCamera::getInstance()->pickCallback(mPick);
if(!gSavedSettings.getBOOL("ClickOnAvatarKeepsCamera")) // <FS:Zi> keep camera in place when clicking on ourselves
gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
return TRUE;
}
return TRUE;
}
//////////
// // Could be first left-click on nothing
// LLFirstUse::useLeftClickNoHit();
/////////
// Eat the event
return LLTool::handleMouseDown(x, y, mask);
}
if (gAgent.leftButtonGrabbed())
{
// if the left button is grabbed, don't put up the pie menu
return LLTool::handleMouseDown(x, y, mask);
}
// Can't ignore children here.
LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE);
// Spawn pie menu
LLTool::handleRightMouseDown(x, y, mask);
return TRUE;
// Eat the event
return LLTool::handleMouseDown(x, y, mask);
}
BOOL LLToolPie::useClickAction(MASK mask,

3
indra/newview/llviewerassetupload.cpp
View File

@ -310,10 +310,9 @@ void LLResourceUploadInfo::assignDefaults()
mDescription = "(No Description)";
}
mFolderId = gInventory.findCategoryUUIDForType(
mFolderId = gInventory.findUserDefinedCategoryUUIDForType(
(mDestinationFolderType == LLFolderType::FT_NONE) ?
(LLFolderType::EType)mAssetType : mDestinationFolderType);
}
std::string LLResourceUploadInfo::getDisplayName() const

5
indra/newview/llviewercontrol.cpp
View File

@ -619,8 +619,8 @@ bool handleAvatarZOffsetChanged(const LLSD& sdValue)
bool handleForceShowGrid(const LLSD& newvalue)
{
// <FS:Ansariel> [FS Login Panel]
//LLPanelLogin::updateServer( );
FSPanelLogin::updateServer( );
//LLPanelLogin::updateLocationSelectorsVisibility( );
FSPanelLogin::updateLocationSelectorsVisibility( );
// </FS:Ansariel> [FS Login Panel]
return true;
}
@ -1104,6 +1104,7 @@ void settings_setup_listeners()
gSavedSettings.getControl("ShowObjectRenderingCost")->getSignal()->connect(boost::bind(&toggle_show_object_render_cost, _2));
gSavedSettings.getControl("UpdaterServiceSetting")->getSignal()->connect(boost::bind(&toggle_updater_service_active, _2));
gSavedSettings.getControl("ForceShowGrid")->getSignal()->connect(boost::bind(&handleForceShowGrid, _2));
gSavedSettings.getControl("ShowStartLocation")->getSignal()->connect(boost::bind(&handleForceShowGrid, _2)); // <FS:Ansariel> Show start location setting has no effect on login
gSavedSettings.getControl("RenderTransparentWater")->getSignal()->connect(boost::bind(&handleRenderTransparentWaterChanged, _2));
gSavedSettings.getControl("SpellCheck")->getSignal()->connect(boost::bind(&handleSpellCheckChanged));
gSavedSettings.getControl("SpellCheckDictionary")->getSignal()->connect(boost::bind(&handleSpellCheckChanged));

3
indra/newview/llviewerparcelmgr.cpp
View File

@ -755,8 +755,7 @@ bool LLViewerParcelMgr::allowAgentScripts(const LLViewerRegion* region, const LL
bool LLViewerParcelMgr::allowAgentDamage(const LLViewerRegion* region, const LLParcel* parcel) const
{
return (region && region->getAllowDamage())
//&& (parcel && parcel->getAllowDamage());
|| (parcel && parcel->getAllowDamage()); // <FS:LO> FIRE-16112 fix
|| (parcel && parcel->getAllowDamage());
}
BOOL LLViewerParcelMgr::isOwnedAt(const LLVector3d& pos_global) const

12
indra/newview/llviewertexteditor.cpp
View File

@ -229,7 +229,7 @@ public:
return false;
}
/*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const
/*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars, S32 line_ind) const
{
// always draw at beginning of line
if (line_offset == 0)
@ -1182,10 +1182,6 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLPointer<LLInventoryItem> item, llwch
openEmbeddedSound( item, wc );
return TRUE;
case LLAssetType::AT_NOTECARD:
openEmbeddedNotecard( item, wc );
return TRUE;
case LLAssetType::AT_LANDMARK:
openEmbeddedLandmark( item, wc );
return TRUE;
@ -1194,6 +1190,7 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLPointer<LLInventoryItem> item, llwch
openEmbeddedCallingcard( item, wc );
return TRUE;
case LLAssetType::AT_NOTECARD:
case LLAssetType::AT_LSL_TEXT:
case LLAssetType::AT_CLOTHING:
case LLAssetType::AT_OBJECT:
@ -1265,11 +1262,6 @@ void LLViewerTextEditor::openEmbeddedLandmark( LLPointer<LLInventoryItem> item_p
}
}
void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, llwchar wc )
{
copyInventory(item, gInventoryCallbacks.registerCB(mInventoryCallback));
}
void LLViewerTextEditor::openEmbeddedCallingcard( LLInventoryItem* item, llwchar wc )
{
if(item && !item->getCreatorUUID().isNull())

1
indra/newview/llviewertexteditor.h
View File

@ -105,7 +105,6 @@ private:
void openEmbeddedTexture( LLInventoryItem* item, llwchar wc );
void openEmbeddedSound( LLInventoryItem* item, llwchar wc );
void openEmbeddedLandmark( LLPointer<LLInventoryItem> item_ptr, llwchar wc );
void openEmbeddedNotecard( LLInventoryItem* item, llwchar wc);
void openEmbeddedCallingcard( LLInventoryItem* item, llwchar wc);
void showCopyToInvDialog( LLInventoryItem* item, llwchar wc );
void showUnsavedAlertDialog( LLInventoryItem* item );

15
indra/newview/llvoavatar.cpp
View File

@ -133,6 +133,9 @@ extern U32 JOINT_COUNT_REQUIRED_FOR_FULLRIG;
const F32 MAX_HOVER_Z = 2.0f;
const F32 MIN_HOVER_Z = -2.0f;
const F32 MIN_ATTACHMENT_COMPLEXITY = 0.f;
const F32 MAX_ATTACHMENT_COMPLEXITY = 1.0e6f;
using namespace LLAvatarAppearanceDefines;
//-----------------------------------------------------------------------------
@ -9943,10 +9946,10 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
const LLVOVolume* volume = drawable->getVOVolume();
if (volume)
{
U32 attachment_total_cost = 0;
U32 attachment_volume_cost = 0;
U32 attachment_texture_cost = 0;
U32 attachment_children_cost = 0;
F32 attachment_total_cost = 0;
F32 attachment_volume_cost = 0;
F32 attachment_texture_cost = 0;
F32 attachment_children_cost = 0;
attachment_volume_cost += volume->getRenderCost(textures);
@ -9970,7 +9973,6 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
// add the cost of each individual texture in the linkset
attachment_texture_cost += volume_texture->second;
}
attachment_total_cost = attachment_volume_cost + attachment_texture_cost + attachment_children_cost;
LL_DEBUGS("ARCdetail") << "Attachment costs " << attached_object->getAttachmentItemID()
<< " total: " << attachment_total_cost
@ -9979,7 +9981,8 @@ void LLVOAvatar::calculateUpdateRenderComplexity()
<< ", " << volume->numChildren()
<< " children: " << attachment_children_cost
<< LL_ENDL;
cost += attachment_total_cost;
// Limit attachment complexity to avoid signed integer flipping of the wearer's ACI
cost += (U32)llclamp(attachment_total_cost, MIN_ATTACHMENT_COMPLEXITY, MAX_ATTACHMENT_COMPLEXITY);
}
}
}

21
indra/newview/llwlanimator.cpp
View File

@ -183,17 +183,28 @@ F64 LLWLAnimator::getDayTime()
// we're not solving the non-linear equation that determines sun phase
// we're just linearly interpolating between the major points
if (phase <= 5.0 / 4.0) {
if (phase <= 5.0 / 4.0)
{
// mDayTime from 0.33 to 0.75 (6:00 to 21:00)
mDayTime = (1.0 / 3.0) * phase + (1.0 / 3.0);
}
else if (phase > 7.0 / 4.0)
{
// maximum value for phase is 2
// mDayTime from 0.25 to 0.33 (3:00 to 6:00)
mDayTime = (1.0 / 3.0) - (1.0 / 3.0) * (2 - phase);
}
else
{
// phase == 3/2 is where day restarts (24:00)
// mDayTime from 0.75 to 0.999 and 0 to 0.25 (21:00 to 03:00)
mDayTime = phase - (1.0 / 2.0);
}
if(mDayTime > 1)
{
mDayTime--;
if(mDayTime > 1)
{
mDayTime--;
}
}
return mDayTime;

2
indra/newview/pipeline.cpp
View File

@ -7872,12 +7872,10 @@ void LLPipeline::renderBloom(bool for_snapshot, F32 zoom_factor, int subfield)
F32 fov = LLViewerCamera::getInstance()->getView();
const F32 default_fov = CameraFieldOfView * F_PI/180.f;
//const F32 default_aspect_ratio = gSavedSettings.getF32("CameraAspectRatio");
//F32 aspect_ratio = (F32) mScreen.getWidth()/(F32)mScreen.getHeight();
F32 dv = 2.f*default_focal_length * tanf(default_fov/2.f);
//F32 dh = 2.f*default_focal_length * tanf(default_fov*default_aspect_ratio/2.f);
F32 focal_length = dv/(2*tanf(fov/2.f));

1
indra/newview/skins/ansastorm/xui/en/panel_outfits_inventory.xml
View File

@ -32,6 +32,7 @@
name="appearance_tabs"
tab_position="top"
halign="center"
hide_scroll_arrows="true"
top="8"
right="-1">
<panel

4
indra/newview/skins/default/xui/de/floater_about_land.xml
View File

@ -481,7 +481,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
<spinner label="Online-Zeit:" name="HoursSpin"/>
<panel name="Allowed_layout_panel">
<text label="Immer erlauben" name="AllowedText">
Zulässige Einwohner ([LISTED]/[MAX])
Zulässige Einwohner ([COUNT]/[MAX])
</text>
<name_list name="AccessList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
<button label="Hinzufügen" name="add_allowed"/>
@ -489,7 +489,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
</panel>
<panel name="Banned_layout_panel">
<text label="Verbannen" name="BanCheck">
Verbannte Einwohner ([LISTED]/[MAX])
Verbannte Einwohner ([COUNT]/[MAX])
</text>
<name_list name="BannedList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
<button label="Hinzufügen" name="add_banned"/>

1
indra/newview/skins/default/xui/de/floater_fs_avatar_render_settings.xml
View File

@ -7,6 +7,7 @@
Komplett
</floater.string>
<filter_editor label="Avatare filtern" name="filter_input"/>
<menu_button name="plus_btn" tool_tip="Person zur Liste hinzufügen"/>
<name_list name="avatar_list">
<name_list.columns label="Name" name="name"/>
<name_list.columns label="Anzeigeeinstellung" name="render_setting" width="125"/>

5
indra/newview/skins/default/xui/de/menu_avatar_rendering_settings.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<toggleable_menu>
<menu_item_call label="Einwohner komplett anzeigen..." name="add_avatar_always_render"/>
<menu_item_call label="Einwohner niemals anzeigen..." name="add_avatar_never_render"/>
</toggleable_menu>

6
indra/newview/skins/default/xui/de/menu_inventory.xml
View File

@ -42,6 +42,12 @@
<menu_item_call label="Neues Haar" name="New Hair"/>
<menu_item_call label="Neue Augen" name="New Eyes"/>
</menu>
<menu label="Als Standard nutzen für" name="upload_def">
<menu_item_call label="Hochgeladene Bilder" name="Image uploads"/>
<menu_item_call label="Hochgeladene Sounds" name="Sound uploads"/>
<menu_item_call label="Hochgeladene Animationen" name="Animation uploads"/>
<menu_item_call label="Hochgeladene Modelle" name="Model uploads"/>
</menu>
<menu label="Typ ändern" name="Change Type">
<menu_item_call label="Standard" name="Default"/>
<menu_item_call label="Handschuhe" name="Gloves"/>

2
indra/newview/skins/default/xui/de/menu_login.xml
View File

@ -2,6 +2,7 @@
<menu_bar name="Login Menu">
<menu label="Viewer" name="File">
<menu_item_call label="Einstellungen..." name="Preferences..."/>
<menu_item_check label="Grid-Auswahl anzeigen" name="Show Grid Picker"/>
<menu_item_call label="[APP_NAME] beenden" name="Quit"/>
</menu>
<menu label="Hilfe" name="Help">
@ -36,7 +37,6 @@
<menu_item_check label="Fehler" name="Error"/>
<menu_item_check label="Keine" name="None"/>
</menu>
<menu_item_check label="Grid-Auswahl anzeigen" name="Show Grid Picker"/>
<menu_item_call label="Benachrichtigungs-Konsole anzeigen" name="Show Notifications Console"/>
</menu>
</menu_bar>

1
indra/newview/skins/default/xui/de/menu_viewer.xml
View File

@ -82,6 +82,7 @@
<menu_item_call label="Teleport-Liste" name="Teleport History"/>
<menu_item_check label="Orte" name="Places"/>
<menu_item_call label="Ziele" name="Destinations"/>
<menu_item_call label="Events" name="Events"/>
<menu_item_check label="Minikarte" name="Mini-Map"/>
<menu_item_check label="Karte" name="World Map"/>
<menu_item_check label="Regions-Tracker" name="Region Tracker"/>

36
indra/newview/skins/default/xui/de/notifications.xml
View File

@ -4088,32 +4088,32 @@ Sie ist voll oder startet in Kürze neu.
<notification name="AvatarEjectFailed">
Hinauswerfen fehlgeschlagen, da Sie keine Admin-Berechtigung für diese Parzelle haben.
</notification>
<notification name="CantMoveObjectParcelFull">
Objekt „[OBJECT_NAME]“ kann nicht nach
[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die Parzelle voll ist.
<notification name="CMOParcelFull">
Objekt „[O]“ kann nicht nach
[P] in Region [R] verschoben werden, da die Parzelle voll ist.
</notification>
<notification name="CantMoveObjectParcelPerms">
Objekt „[OBJECT_NAME]“ kann nicht nach
[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Ihre Objekte auf dieser Parzelle nicht gestattet sind.
<notification name="CMOParcelPerms">
Objekt „[O]“ kann nicht nach
[P] in Region [R] verschoben werden, da Ihre Objekte auf dieser Parzelle nicht gestattet sind.
</notification>
<notification name="CantMoveObjectParcelResources">
Objekt „[OBJECT_NAME]“ kann nicht nach
[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da nicht genügend Ressourcen für dieses Objekt auf dieser Parzelle vorhanden sind.
<notification name="CMOParcelResources">
Objekt „[O]“ kann nicht nach
[P] in Region [R] verschoben werden, da nicht genügend Ressourcen für dieses Objekt auf dieser Parzelle vorhanden sind.
</notification>
<notification name="NoParcelPermsNoObject">
Kopiervorgang fehlgeschlagen, da Sie keinen Zugriff auf diese Parzelle haben.
</notification>
<notification name="CantMoveObjectRegionVersion">
Objekt „[OBJECT_NAME]“ kann nicht nach
[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die andere Region eine ältere Version verwendet, die das Empfangen dieses Objekts per Regionswechsel nicht unterstützt.
<notification name="CMORegionVersion">
Objekt „[O]“ kann nicht nach
[P] in Region [R] verschoben werden, da die andere Region eine ältere Version verwendet, die das Empfangen dieses Objekts per Regionswechsel nicht unterstützt.
</notification>
<notification name="CantMoveObjectNavMesh">
Objekt „[OBJECT_NAME]“ kann nicht nach
[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Sie das Navmesh nicht regionsübergreifend modifizieren können.
<notification name="CMONavMesh">
Objekt „[O]“ kann nicht nach
[P] in Region [R] verschoben werden, da Sie das Navmesh nicht regionsübergreifend modifizieren können.
</notification>
<notification name="CantMoveObjectWTF">
Objekt „[OBJECT_NAME]“ kann nicht nach
[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da ein unbekannter Fehler vorliegt. ([FAILURE_TYPE])
<notification name="CMOWTF">
Objekt „[O]“ kann nicht nach
[P] in Region [R] verschoben werden, da ein unbekannter Fehler vorliegt. ([FAILURE_TYPE])
</notification>
<notification name="NoPermModifyObject">
Ihnen fehlt die Berechtigung zum Modifizieren dieses Objekts.

1
indra/newview/skins/default/xui/de/panel_preferences_UI.xml
View File

@ -50,7 +50,6 @@
Skriptdialog-Position:
</text>
<combo_box name="ScriptDialogsPositionDropdown" tool_tip="Auswählen, wo Skriptdialoge (Menüs) auf dem Bildschirm erscheinen sollen.">
<combo_box.item label="Import alter Wert" name="ScriptDialogPositionOption_0"/>
<combo_box.item label="Am Chiclet angedockt" name="ScriptDialogPositionOption_1"/>
<combo_box.item label="Oben links" name="ScriptDialogPositionOption_2"/>
<combo_box.item label="Oben rechts" name="ScriptDialogPositionOption_3"/>

25
indra/newview/skins/default/xui/de/panel_preferences_firestorm.xml
View File

@ -209,7 +209,7 @@
</text>
<button label="Durchsuchen" label_selected="Durchsuchen" name="SetPreprocInclude"/>
</panel>
<!--Build 2-->
<panel label="Bauen 2" name="BuildTab2">
<check_box label="Ausgewählte Primitive hervorheben" tool_tip="Deaktivieren, um die gelben und blauen Grundrisse nicht anzuzeigen. Verbessert die Performanz, wenn eine Vielzahl an Primitiven ausgewählt wird." name="FSBuildPrefsRenderHighlight_toggle"/>
@ -237,5 +237,28 @@
<check_box label="Texturen standardmäßig im PNG-Format anstelle von TGA speichern" tool_tip="Falls aktiviert, werden Texturen in der Vorschau standardmäßig im PNG-Format gespeichert" name="FSTextureDefaultSaveAsFormat"/>
<check_box label="Vorschau von Animation beim Upload am eigenen Avatar" tool_tip="Falls aktiviert, werden Animationen in der Vorschau am eigenen Avatar abgespielt" name="FSUploadAnimationOnOwnAvatar"/>
</panel>
<!--Uploads-->
<panel label="Uploads" name="UploadsTab">
<text name="title">
Aktuelle Zielordner für Uploads:
</text>
<text name="title_images">
Bilder
</text>
<text name="title_sounds">
Sounds
</text>
<text name="title_animations">
Animationen
</text>
<text name="title_models">
Models
</text>
<text name="upload_help">
Um einen Zielordner zu ändern, im Inventar auf den gewünschten Ordner rechts-klicken und
„Als Standard nutzen für“ auswählen.
</text>
</panel>
</tab_container>
</panel>

2
indra/newview/skins/default/xui/de/panel_preferences_move.xml
View File

@ -56,7 +56,7 @@
<check_box label="Fliegen/Landen beim Drücken von auf (springen) / ab (kriechen)" name="automatic_fly" />
<check_box label="Kriech-Umschaltmodus aktivieren" name="crouch_toggle_mode"/>
<check_box label="Warten auf Vor-Sprung- und Lande-Animationen deaktivieren" name="FSIgnoreFinishAnimation"/>
<check_box label="Beim Rückwärtsgehen Drehen des Avatars zur Kamera lokal deaktivieren" name="FSDisableTurningAroundWhenWalkingBackwards" tool_tip="Deaktiviert das Drehen des Avatars mit dem Gesicht zur Kamera beim Rückwärtsgehen. Diese Option hat nur lokalen Effekt und funktioniert nicht mit geskripteten AOs."/>
<check_box label="Avataren des Rückwärtsgehen in der lokalen Ansicht erlauben (SL-Standard)" name="FSDisableTurningAroundWhenWalkingBackwards" tool_tip="Falls aktiviert, gehen Avatare auf dem eigenen Bildschirm beim Rückwärtsgehen rückwärts, anstatt sich umzudrehen und anschließend vorwärts zu gehen. Diese Option hat nur lokalen Effekt und hat keinen Einfluss auf was andere sehen. Dies ist die Standardeinstellung im Second Life Viewer und kann u.U. durch den AO des Avatars übersteuert werden."/>
<check_box label="Avatar zum ausgewählten Objekt drehen" name="FSTurnAvatarToSelectedObject" tool_tip="Dreht den Avatar mit dem Gesicht zum aktuell ausgewählten Objekt."/>
<text name="movelock_lbl">
Falls Movelock in der LSL-Brücke aktiviert ist...

4
indra/newview/skins/default/xui/de/strings.xml
View File

@ -6745,10 +6745,10 @@ Setzen Sie den Editorpfad in Anführungszeichen
Die Region, in der Sie sich gerade befinden, ist dabei neu zu starten. Falls Sie in dieser Region bleiben, werden Sie ausgeloggt.
</string>
<string name="Mute_Add">
„[NAME]“ has been added to the blocklist.
„[NAME]“ wurde zur Blockierliste hinzugefügt.
</string>
<string name="Mute_Remove">
„[NAME]“ has been removed from the blocklist.
„[NAME]“ wurde von der Blockierliste entfernt.
</string>
<string name="Reqsysinfo_Chat_NoReason">
Ich frage Informationen über Ihr System ab.

4
indra/newview/skins/default/xui/en/floater_about_land.xml
View File

@ -2123,7 +2123,7 @@ Only large parcels can be listed in search.
name="AllowedText"
top="0"
width="230">
Allowed Residents ([LISTED]/[MAX])
Allowed Residents ([COUNT]/[MAX])
</text>
<name_list
column_padding="0"
@ -2172,7 +2172,7 @@ Only large parcels can be listed in search.
name="BanCheck"
top="0"
width="200">
Banned Residents ([LISTED]/[MAX])
Banned Residents ([COUNT]/[MAX])
</text>
<name_list
column_padding="0"

15
indra/newview/skins/default/xui/en/floater_fs_avatar_render_settings.xml
View File

@ -29,6 +29,21 @@
max_length_chars="300"
name="filter_input"
top="4"
right="-35" />
<menu_button
follows="top|right"
height="23"
image_hover_unselected="Toolbar_Middle_Over"
image_overlay="AddItem_Off"
image_selected="Toolbar_Middle_Selected"
image_unselected="Toolbar_Middle_Off"
layout="topleft"
left_pad="2"
menu_filename="menu_avatar_rendering_settings_add.xml"
menu_position="bottomleft"
name="plus_btn"
tool_tip="Add new person to the list"
top="4"
right="-4" />
<name_list
column_padding="0"

49
indra/newview/skins/default/xui/en/floater_phototools.xml
View File

@ -1881,55 +1881,6 @@
function="ResetControl"
parameter="CameraDoFResScale"/>
</button>
<text
name="T_Aspect_Ratio"
follows="top|left"
layout="topleft"
left="5"
top_pad="5"
tool_tip="This is supposed to be aspect ratio of the camera you're modelling. For example, a 35mm camera has an aspect ratio of 3:2 (1.5). The viewer will use this as a frame of reference for how field of view and focal length must be adjusted depending on window size. IT SEEMS TO HAVE NO EFFECT!"
width="80">
Aspect Ratio
</text>
<slider_bar
name="SB_Aspect_Ratio"
control_name="CameraAspectRatio"
follows="left|right"
height="16"
increment="0.01"
layout="topleft"
left_pad="-20"
min_val="0"
max_val="5"
top_delta="-2"
width="127"/>
<spinner
name="S_Aspect_Ratio"
control_name="CameraAspectRatio"
top_delta="-3"
label_width="0"
left_pad="3"
decimal_digits="2"
follows="top|left"
max_val="5"
min_val="0"
width="53"
increment="0.01"/>
<button
follows="left|top"
name="Reset_Aspect_Ratio"
height="22"
label="D"
layout="topleft"
left_pad="0"
top_delta="0"
width="20"
tool_tip="Reset to the default value.">
<button.commit_callback
function="ResetControl"
parameter="CameraAspectRatio"/>
</button>
</panel>
<panel

1
indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
View File

@ -7,6 +7,7 @@
save_rect="true"
save_visibility="true"
title="Scene Load Statistics"
min_width="250"
width="400">
<scroll_container follows="top|left|bottom|right"
bottom="400"

Some files were not shown because too many files have changed in this diff Show More