From 0f2a4707a3a99b3187bf69f174307f5e0499dbb1 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 17 May 2013 03:02:57 -0400 Subject: [PATCH 1/4] Add top level build directory to gitignore, and mode change on files that certainly shouldn't be executable. --- .gitignore | 1 + indra/llwindow/glh/glh_linear.h | 0 .../installers/windows/install_icon_singularity.BMP | Bin .../windows/uninstall_icon_singularity.BMP | Bin .../windows/uninstall_icon_singularity.ico | Bin indra/newview/res/singularity_icon.ico | Bin indra/newview/skins/silver/textures/preview.png | Bin indra/plugins/base_basic/basic_plugin_base.cpp | 0 indra/plugins/base_basic/basic_plugin_base.h | 0 indra/plugins/base_media/media_plugin_base.cpp | 0 indra/plugins/base_media/media_plugin_base.exp | 0 indra/plugins/base_media/media_plugin_base.h | 0 .../plugins/example_media/media_plugin_example.cpp | 0 indra/plugins/gstreamer010/llmediaimplgstreamer.h | 0 .../llmediaimplgstreamertriviallogging.h | 0 .../gstreamer010/llmediaimplgstreamervidplug.cpp | 0 .../gstreamer010/llmediaimplgstreamervidplug.h | 0 .../gstreamer010/media_plugin_gstreamer010.cpp | 0 indra/plugins/quicktime/CMakeLists.txt | 0 indra/plugins/quicktime/media_plugin_quicktime.cpp | 0 20 files changed, 1 insertion(+) mode change 100755 => 100644 indra/llwindow/glh/glh_linear.h mode change 100755 => 100644 indra/newview/installers/windows/install_icon_singularity.BMP mode change 100755 => 100644 indra/newview/installers/windows/uninstall_icon_singularity.BMP mode change 100755 => 100644 indra/newview/installers/windows/uninstall_icon_singularity.ico mode change 100755 => 100644 indra/newview/res/singularity_icon.ico mode change 100755 => 100644 indra/newview/skins/silver/textures/preview.png mode change 100755 => 100644 indra/plugins/base_basic/basic_plugin_base.cpp mode change 100755 => 100644 indra/plugins/base_basic/basic_plugin_base.h mode change 100755 => 100644 indra/plugins/base_media/media_plugin_base.cpp mode change 100755 => 100644 indra/plugins/base_media/media_plugin_base.exp mode change 100755 => 100644 indra/plugins/base_media/media_plugin_base.h mode change 100755 => 100644 indra/plugins/example_media/media_plugin_example.cpp mode change 100755 => 100644 indra/plugins/gstreamer010/llmediaimplgstreamer.h mode change 100755 => 100644 indra/plugins/gstreamer010/llmediaimplgstreamertriviallogging.h mode change 100755 => 100644 indra/plugins/gstreamer010/llmediaimplgstreamervidplug.cpp mode change 100755 => 100644 indra/plugins/gstreamer010/llmediaimplgstreamervidplug.h mode change 100755 => 100644 indra/plugins/gstreamer010/media_plugin_gstreamer010.cpp mode change 100755 => 100644 indra/plugins/quicktime/CMakeLists.txt mode change 100755 => 100644 indra/plugins/quicktime/media_plugin_quicktime.cpp diff --git a/.gitignore b/.gitignore index f30ca2cc4..d77af9878 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /edited-files.txt qtcreator-build/ /.pc +/build-* diff --git a/indra/llwindow/glh/glh_linear.h b/indra/llwindow/glh/glh_linear.h old mode 100755 new mode 100644 diff --git a/indra/newview/installers/windows/install_icon_singularity.BMP b/indra/newview/installers/windows/install_icon_singularity.BMP old mode 100755 new mode 100644 diff --git a/indra/newview/installers/windows/uninstall_icon_singularity.BMP b/indra/newview/installers/windows/uninstall_icon_singularity.BMP old mode 100755 new mode 100644 diff --git a/indra/newview/installers/windows/uninstall_icon_singularity.ico b/indra/newview/installers/windows/uninstall_icon_singularity.ico old mode 100755 new mode 100644 diff --git a/indra/newview/res/singularity_icon.ico b/indra/newview/res/singularity_icon.ico old mode 100755 new mode 100644 diff --git a/indra/newview/skins/silver/textures/preview.png b/indra/newview/skins/silver/textures/preview.png old mode 100755 new mode 100644 diff --git a/indra/plugins/base_basic/basic_plugin_base.cpp b/indra/plugins/base_basic/basic_plugin_base.cpp old mode 100755 new mode 100644 diff --git a/indra/plugins/base_basic/basic_plugin_base.h b/indra/plugins/base_basic/basic_plugin_base.h old mode 100755 new mode 100644 diff --git a/indra/plugins/base_media/media_plugin_base.cpp b/indra/plugins/base_media/media_plugin_base.cpp old mode 100755 new mode 100644 diff --git a/indra/plugins/base_media/media_plugin_base.exp b/indra/plugins/base_media/media_plugin_base.exp old mode 100755 new mode 100644 diff --git a/indra/plugins/base_media/media_plugin_base.h b/indra/plugins/base_media/media_plugin_base.h old mode 100755 new mode 100644 diff --git a/indra/plugins/example_media/media_plugin_example.cpp b/indra/plugins/example_media/media_plugin_example.cpp old mode 100755 new mode 100644 diff --git a/indra/plugins/gstreamer010/llmediaimplgstreamer.h b/indra/plugins/gstreamer010/llmediaimplgstreamer.h old mode 100755 new mode 100644 diff --git a/indra/plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/indra/plugins/gstreamer010/llmediaimplgstreamertriviallogging.h old mode 100755 new mode 100644 diff --git a/indra/plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/indra/plugins/gstreamer010/llmediaimplgstreamervidplug.cpp old mode 100755 new mode 100644 diff --git a/indra/plugins/gstreamer010/llmediaimplgstreamervidplug.h b/indra/plugins/gstreamer010/llmediaimplgstreamervidplug.h old mode 100755 new mode 100644 diff --git a/indra/plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/plugins/gstreamer010/media_plugin_gstreamer010.cpp old mode 100755 new mode 100644 diff --git a/indra/plugins/quicktime/CMakeLists.txt b/indra/plugins/quicktime/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/indra/plugins/quicktime/media_plugin_quicktime.cpp b/indra/plugins/quicktime/media_plugin_quicktime.cpp old mode 100755 new mode 100644 From 9742794d08e432fc32b564bc1562a74d86b4941c Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 17 May 2013 03:12:10 -0400 Subject: [PATCH 2/4] If possible, figure out the typing person's name according to the name system before showing that they are typing. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (IE: "Aur'a Færs (inusaito.kanya)is typing..." instead of "Inusaito Kanya is typing...") This adds consistency between chat and messages, and should Resident strip in most cases. --- indra/newview/llimpanel.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 7f6bf3a62..ae5dcdc45 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -2430,7 +2430,9 @@ void LLFloaterIMPanel::processIMTyping(const LLIMInfo* im_info, BOOL typing) if (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 { From 36e218cf19b3090e2a5d968b3ac35a2d265ac36c Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 17 May 2013 04:03:42 -0400 Subject: [PATCH 3/4] One more git ignore needed, thanks Latif! --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d77af9878..4f9405a16 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ qtcreator-build/ /.pc /build-* +/viewer-* From 00bbbe70a7f15aadaeaa2e2c143276f66b275acd Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 17 May 2013 10:06:08 -0400 Subject: [PATCH 4/4] Fix a bug pointed out by LaMont Zuzu in which a texture dragged and dropped to one's profile image would be sent back to the user Removes the unnecessary drop target and give item text in these cases. On someone else's profile, you may drag and drop a replacement texture On your profile, you have no reason to drag and drop an item, in fact this can cause bad inventory issues (yes, I've tested it) --- indra/newview/llpanelavatar.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 92c71d8bb..80bb82a65 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -360,6 +360,13 @@ void LLPanelAvatarSecondLife::enableControls(BOOL self) { childSetEnabled("img", self); childSetEnabled("about", self); + if (self) // We can't give inventory to self + { + if (LLDropTarget* drop_target = findChild("drop_target_rect")) + removeChild(drop_target); + if (LLTextBox* text_box = findChild("Give item:")) + removeChild(text_box); + } childSetVisible("allow_publish", self); childSetEnabled("allow_publish", self); childSetVisible("?", self);