Merge remote-tracking branch 'lirusaito/master'
Latif Khalifa
2
.gitignore
vendored
@@ -24,3 +24,5 @@
|
|||||||
/edited-files.txt
|
/edited-files.txt
|
||||||
qtcreator-build/
|
qtcreator-build/
|
||||||
/.pc
|
/.pc
|
||||||
|
/build-*
|
||||||
|
/viewer-*
|
||||||
|
|||||||
0
indra/llwindow/glh/glh_linear.h
Executable file → Normal file
0
indra/newview/installers/windows/install_icon_singularity.BMP
Executable file → Normal file
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 256 KiB |
0
indra/newview/installers/windows/uninstall_icon_singularity.BMP
Executable file → Normal file
|
Before Width: | Height: | Size: 254 KiB After Width: | Height: | Size: 254 KiB |
0
indra/newview/installers/windows/uninstall_icon_singularity.ico
Executable file → Normal file
|
Before Width: | Height: | Size: 359 KiB After Width: | Height: | Size: 359 KiB |
@@ -2430,7 +2430,9 @@ void LLFloaterIMPanel::processIMTyping(const LLIMInfo* im_info, BOOL typing)
|
|||||||
if (typing)
|
if (typing)
|
||||||
{
|
{
|
||||||
// other user started typing
|
// other user started typing
|
||||||
addTypingIndicator(im_info->mName);
|
std::string name;
|
||||||
|
if (!LLAvatarNameCache::getPNSName(im_info->mFromID, name)) name = im_info->mName;
|
||||||
|
addTypingIndicator(name);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -360,6 +360,13 @@ void LLPanelAvatarSecondLife::enableControls(BOOL self)
|
|||||||
{
|
{
|
||||||
childSetEnabled("img", self);
|
childSetEnabled("img", self);
|
||||||
childSetEnabled("about", self);
|
childSetEnabled("about", self);
|
||||||
|
if (self) // We can't give inventory to self
|
||||||
|
{
|
||||||
|
if (LLDropTarget* drop_target = findChild<LLDropTarget>("drop_target_rect"))
|
||||||
|
removeChild(drop_target);
|
||||||
|
if (LLTextBox* text_box = findChild<LLTextBox>("Give item:"))
|
||||||
|
removeChild(text_box);
|
||||||
|
}
|
||||||
childSetVisible("allow_publish", self);
|
childSetVisible("allow_publish", self);
|
||||||
childSetEnabled("allow_publish", self);
|
childSetEnabled("allow_publish", self);
|
||||||
childSetVisible("?", self);
|
childSetVisible("?", self);
|
||||||
|
|||||||
0
indra/newview/res/singularity_icon.ico
Executable file → Normal file
|
Before Width: | Height: | Size: 139 KiB After Width: | Height: | Size: 139 KiB |
0
indra/newview/skins/silver/textures/preview.png
Executable file → Normal file
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |