diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/PKGBUILD.in | 4 | ||||
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_about.xml | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/indra/newview/PKGBUILD.in b/indra/newview/PKGBUILD.in index b2a02318f2..d917f216b6 100644 --- a/indra/newview/PKGBUILD.in +++ b/indra/newview/PKGBUILD.in @@ -1,7 +1,7 @@ # Maintainer: $ENV{USER}@${VIEWER_PACKAGE_DOMAIN_NAME} pkgname=${VIEWER_BINARY_NAME} -pkgver=${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION} -pkgrel=1 +pkgver=${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH} +pkgrel=${VIEWER_VERSION_REVISION} pkgdesc="${VIEWER_PACKAGE_COMMENT}" arch=('${CMAKE_SYSTEM_PROCESSOR}') url="https://${VIEWER_PACKAGE_DOMAIN_NAME}" diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 4cd85ac756..bd29dba6bc 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -727,7 +727,7 @@ bool LLConversationSort::operator()(const LLConversationItem* const& a, const LL if ((type_a == LLConversationItem::CONV_SESSION_NEARBY) || (type_b == LLConversationItem::CONV_SESSION_NEARBY)) { // If one is the nearby session, put nearby session *always* last - return (type_b == LLConversationItem::CONV_SESSION_NEARBY); + return (!(type_b == LLConversationItem::CONV_SESSION_NEARBY)); } else if (sort_order == LLConversationFilter::SO_SESSION_TYPE) { diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 8d088e277c..ec2d1471cc 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -70,7 +70,7 @@ follows="all" left="10" name="megapahit_credits_panel" - height="370" + height="390" top="10"> <text follows="top|left|right" @@ -86,7 +86,7 @@ Megapahit is brought to you by (in order of appearance): <text_editor enabled="false" follows="top|left" - height="210" + height="230" bg_readonly_color="Transparent" left="5" text_color="LtGray" @@ -95,6 +95,7 @@ Megapahit is brought to you by (in order of appearance): width="545" word_wrap="true"> Erik Kundiman +LinneNoir milo (observeur) Fritigern Gothly Hadet Sonnenkern @@ -108,6 +109,7 @@ Melodey Hiroo Ono Keysin (scoutkeysin) gwigz +Yikes Lopez </text_editor> <text follows="top|left" @@ -133,7 +135,7 @@ with special thanks to (in order of appearance): width="450" word_wrap="true"> Chorazin Allen and Nicky Perian for involving Erik Kundiman in viewer developments; -LinneNoir for the moral support and initial testing; +JenniWindrider for the pre-MP donation that was used to help build the website; Vir Linden for making it possible for the project to have a place (in every sense of the word) in SL; nutsobvious for the early testing and video proof; Soft Linden for the security testing; and |