Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handle_secondlifeprotocol.sh, and sync with v-d.

Browse Source 
More translation strings~
Log inventory offers to those we're not chatting with.
"SDL deiconification state switched to " now lldebugs instead of llinfos, far too spammy..

(Pre-outbox commit, may contain pieces of outbox work.. and unmentioned harmless sync)
This commit is contained in:
Lirusaito
2012-11-06 18:50:45 -05:00
parent ad97c72821
commit d0a0aa7a65
12 changed files with 329 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llwindow/llwindowsdl.cpp
View File

@@ -1913,7 +1913,7 @@ void LLWindowSDL::gatherInput()
mIsMinimized = (!event.active.gain); mIsMinimized = (!event.active.gain);
mCallbacks->handleActivate(this, !mIsMinimized); mCallbacks->handleActivate(this, !mIsMinimized);
llinfos << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl; lldebugs << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl;
} }
else else
{ {

445
indra/newview/app_settings/cmd_line.xml
View File

@@ -1,21 +1,79 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<llsd> <llsd>
<map> <map>
<key>help</key> <!-- Please insert new keys in alphabetical order. -->
<key>agenturi</key>
<map> <map>
<key>desc</key> <key>desc</key>
<string>display this help message</string> <string>URL of agent host to connect to in Agent Domain.</string>
<key>count</key>
<key>short</key> <integer>1</integer>
<string>h</string> <key>map-to</key>
<string>CmdLineAgentURI</string>
</map> </map>
<key>port</key> <key>autologin</key>
<map>
<key>desc</key>
<string>log in as last saved user</string>
<key>map-to</key>
<string>AutoLogin</string>
</map>
<key>channel</key>
<map> <map>
<key>count</key> <key>count</key>
<integer>1</integer> <integer>1</integer>
<key>map-to</key> <key>map-to</key>
<string>UserConnectionPort</string> <string>VersionChannelName</string>
</map>
<key>console</key>
<map>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>ShowConsoleWindow</string>
</map>
<key>cooperative</key>
<map>
<key>desc</key>
<string>Yield some idle time to local host.</string>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>YieldTime</string>
</map>
<key>crashonstartup</key>
<map>
<key>desc</key>
<string>Crashes on startup. For QA use.</string>
<key>map-to</key>
<string>CrashOnStartup</string>
</map>
<key>debugsession</key>
<map>
<key>desc</key>
<string>Run as if RenderDebugGL is TRUE, but log errors until end of session.</string>
<key>map-to</key>
<string>DebugSession</string>
</map>
<key>debugviews</key>
<map>
<key>map-to</key>
<string>DebugViews</string>
</map>
<key>disablecrashlogger</key>
<map>
<key>desc</key>
<string>Disables the crash logger and lets the OS handle crashes</string>
<key>map-to</key>
<string>DisableCrashLogger</string>
</map> </map>
<key>drop</key> <key>drop</key>
@@ -26,20 +84,12 @@
<string>PacketDropPercentage</string> <string>PacketDropPercentage</string>
</map> </map>
<key>inbw</key> <key>god</key>
<map> <map>
<key>count</key> <key>desc</key>
<integer>1</integer> <string>Log in a god if you have god access.</string>
<key>map-to</key> <key>map-to</key>
<string>InBandwidth</string> <string>ConnectAsGod</string>
</map>
<key>outbw</key>
<map>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>OutBandwidth</string>
</map> </map>
<key>grid</key> <key>grid</key>
@@ -52,6 +102,69 @@
<string>CmdLineGridChoice</string> <string>CmdLineGridChoice</string>
</map> </map>
<key>help</key>
<map>
<key>desc</key>
<string>display this help message</string>
<key>short</key>
<string>h</string>
</map>
<key>helperuri</key>
<map>
<key>desc</key>
<string>helper web CGI prefix to use</string>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>CmdLineHelperURI</string>
</map>
<key>ignorepixeldepth</key>
<map>
<key>desc</key>
<string>Ignore pixel depth settings.</string>
<key>map-to</key>
<string>IgnorePixelDepth</string>
</map>
<key>inbw</key>
<map>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>InBandwidth</string>
</map>
<key>logfile</key>
<map>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>UserLogFile</string>
</map>
<key>login</key>
<map>
<key>desc</key>
<string>3 tokens: first, last and password</string>
<key>count</key>
<integer>3</integer>
<key>map-to</key>
<string>UserLoginInfo</string>
</map>
<key>loginpage</key>
<map>
<key>desc</key>
<string>Login authentication page to use.</string>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>LoginPage</string>
</map>
<key>loginuri</key> <key>loginuri</key>
<map> <map>
<key>desc</key> <key>desc</key>
@@ -64,60 +177,12 @@
<string>CmdLineLoginURI</string> <string>CmdLineLoginURI</string>
</map> </map>
<key>helperuri</key> <key>multiple</key>
<map> <map>
<key>desc</key> <key>desc</key>
<string>helper web CGI prefix to use</string> <string>Allow multiple viewers.</string>
<key>count</key>
<integer>1</integer>
<key>map-to</key> <key>map-to</key>
<string>CmdLineHelperURI</string> <string>AllowMultipleViewers</string>
</map>
<key>debugviews</key>
<map>
<key>map-to</key>
<string>DebugViews</string>
</map>
<key>skin</key>
<map>
<key>desc</key>
<string>ui/branding skin folder to use</string>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>SkinFolder</string>
</map>
<key>autologin</key>
<map>
<key>desc</key>
<string>log in as last saved user</string>
<key>map-to</key>
<string>AutoLogin</string>
</map>
<key>quitafter</key>
<map>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>QuitAfterSeconds</string>
</map>
<key>debugsession</key>
<map>
<key>desc</key>
<string>Run as if RenderDebugGL is TRUE, but log errors until end of session.</string>
<key>map-to</key>
<string>DebugSession</string>
</map>
<key>rotate</key>
<map>
<key>map-to</key>
<string>RotateRight</string>
</map> </map>
<key>noaudio</key> <key>noaudio</key>
@@ -126,10 +191,18 @@
<string>NoAudio</string> <string>NoAudio</string>
</map> </map>
<key>nosound</key> <key>noinvlib</key>
<map>
<key>desc</key>
<string>Do not request the inventory library.</string>
<key>map-to</key>
<string>NoInventoryLibrary</string>
</map>
<key>nopreload</key>
<map> <map>
<key>map-to</key> <key>map-to</key>
<string>NoAudio</string> <string>NoPreload</string>
</map> </map>
<key>noprobe</key> <key>noprobe</key>
@@ -144,10 +217,40 @@
<string>NoQuickTime</string> <string>NoQuickTime</string>
</map> </map>
<key>nopreload</key> <key>nosound</key>
<map> <map>
<key>map-to</key> <key>map-to</key>
<string>NoPreload</string> <string>NoAudio</string>
</map>
<key>no-verify-ssl-cert</key>
<map>
<key>map-to</key>
<string>NoVerifySSLCert</string>
</map>
<key>novoice</key>
<map>
<key>desc</key>
<string>Disable voice.</string>
<key>map-to</key>
<string>CmdLineDisableVoice</string>
</map>
<key>outbw</key>
<map>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>OutBandwidth</string>
</map>
<key>port</key>
<map>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>UserConnectionPort</string>
</map> </map>
<key>purge</key> <key>purge</key>
@@ -158,41 +261,50 @@
<string>PurgeCacheOnNextStartup</string> <string>PurgeCacheOnNextStartup</string>
</map> </map>
<key>noinvlib</key> <key>qa</key>
<map> <map>
<key>desc</key> <key>desc</key>
<string>Do not request the inventory library.</string> <string>Activated debugging menu in Advanced Settings.</string>
<key>map-to</key> <key>map-to</key>
<string>NoInventoryLibrary</string> <string>QAMode</string>
</map> </map>
<key>logfile</key> <key>quitafter</key>
<map> <map>
<key>count</key> <key>count</key>
<integer>1</integer> <integer>1</integer>
<key>map-to</key> <key>map-to</key>
<string>UserLogFile</string> <string>QuitAfterSeconds</string>
</map> </map>
<key>setdefault</key> <key>regionuri</key>
<map> <map>
<key>desc</key> <key>desc</key>
<string> specify the value of a particular <string>URL of region to connect to through Agent Domain.</string>
configuration variable which can be
overridden by settings.xml
</string>
<key>count</key> <key>count</key>
<integer>2</integer> <integer>1</integer>
<!-- Special case. Mapped to settings procedurally. --> <key>map-to</key>
<string>CmdLineRegionURI</string>
</map>
<key>rotate</key>
<map>
<key>map-to</key>
<string>RotateRight</string>
</map>
<key>safe</key>
<map>
<key>desc</key>
<string>Reset preferences, run in safe mode.</string>
<key>map-to</key>
<string>SafeMode</string>
</map> </map>
<key>set</key> <key>set</key>
<map> <map>
<key>desc</key> <key>desc</key>
<string> specify the value of a particular <string>specify the value of a particular configuration variable that overrides all other settings.</string>
configuration variable that
overrides all other settings
</string>
<key>count</key> <key>count</key>
<integer>2</integer> <integer>2</integer>
<key>compose</key> <key>compose</key>
@@ -200,6 +312,15 @@
<!-- Special case. Mapped to settings procedurally. --> <!-- Special case. Mapped to settings procedurally. -->
</map> </map>
<key>setdefault</key>
<map>
<key>desc</key>
<string>specify the value of a particular configuration variable which can be overridden by settings.xml.</string>
<key>count</key>
<integer>2</integer>
<!-- Special case. Mapped to settings procedurally. -->
</map>
<key>settings</key> <key>settings</key>
<map> <map>
<key>desc</key> <key>desc</key>
@@ -209,65 +330,14 @@
<!-- Special case. Mapped to settings procedurally. --> <!-- Special case. Mapped to settings procedurally. -->
</map> </map>
<key>login</key> <key>skin</key>
<map> <map>
<key>desc</key> <key>desc</key>
<string>3 tokens: first, last and password</string> <string>ui/branding skin folder to use</string>
<key>count</key>
<integer>3</integer>
<key>map-to</key>
<string>UserLoginInfo</string>
</map>
<key>god</key>
<map>
<key>desc</key>
<string>Log in a god if you have god access.</string>
<key>map-to</key>
<string>ConnectAsGod</string>
</map>
<key>console</key>
<map>
<key>count</key> <key>count</key>
<integer>1</integer> <integer>1</integer>
<key>map-to</key> <key>map-to</key>
<string>ShowConsoleWindow</string> <string>SkinFolder</string>
</map>
<key>safe</key>
<map>
<key>desc</key>
<string>Reset preferences, run in safe mode.</string>
<key>map-to</key>
<string>SafeMode</string>
</map>
<key>multiple</key>
<map>
<key>desc</key>
<string>Allow multiple viewers.</string>
<key>map-to</key>
<string>AllowMultipleViewers</string>
</map>
<key>novoice</key>
<map>
<key>desc</key>
<string>Disable voice.</string>
<key>map-to</key>
<string>CmdLineDisableVoice</string>
</map>
<key>url</key>
<map>
<key>desc</key>
<string>Startup location</string>
<key>count</key>
<integer>1</integer>
<key>last_option</key>
<boolean>true</boolean>
<!-- Special case. Not mapped to a setting. -->
</map> </map>
<key>slurl</key> <key>slurl</key>
@@ -283,92 +353,15 @@
<!-- Special case. Not mapped to a setting. --> <!-- Special case. Not mapped to a setting. -->
</map> </map>
<key>regionuri</key> <key>url</key>
<map> <map>
<key>desc</key> <key>desc</key>
<string>URL of region to connect to through Agent Domain.</string> <string>Startup location</string>
<key>count</key> <key>count</key>
<integer>1</integer> <integer>1</integer>
<key>map-to</key> <key>last_option</key>
<string>CmdLineRegionURI</string> <boolean>true</boolean>
<!-- Special case. Not mapped to a setting. -->
</map> </map>
<key>agenturi</key>
<map>
<key>desc</key>
<string>URL of agent host to connect to in Agent Domain.</string>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>CmdLineAgentURI</string>
</map>
<key>ignorepixeldepth</key>
<map>
<key>desc</key>
<string>Ignore pixel depth settings.</string>
<key>map-to</key>
<string>IgnorePixelDepth</string>
</map>
<key>cooperative</key>
<map>
<key>desc</key>
<string>Yield some idle time to local host.</string>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>YieldTime</string>
</map>
<key>no-verify-ssl-cert</key>
<map>
<key>map-to</key>
<string>NoVerifySSLCert</string>
</map>
<key>channel</key>
<map>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>VersionChannelName</string>
</map>
<key>loginpage</key>
<map>
<key>desc</key>
<string>Login authentication page to use.</string>
<key>count</key>
<integer>1</integer>
<key>map-to</key>
<string>LoginPage</string>
</map>
<key>qa</key>
<map>
<key>desc</key>
<string>Activated debugging menu in Advanced Settings.</string>
<key>map-to</key>
<string>QAMode</string>
</map>
<key>crashonstartup</key>
<map>
<key>desc</key>
<string>Crashes on startup. For QA use.</string>
<key>map-to</key>
<string>CrashOnStartup</string>
</map>
<key>disablecrashlogger</key>
<map>
<key>desc</key>
<string>Disables the crash logger and lets the OS handle crashes</string>
<key>map-to</key>
<string>DisableCrashLogger</string>
</map>
</map> </map>
</llsd> </llsd>

2
indra/newview/linux_tools/handle_secondlifeprotocol.sh
View File

@@ -13,5 +13,5 @@ fi
RUN_PATH=`dirname "$0" || echo .` RUN_PATH=`dirname "$0" || echo .`
cd "${RUN_PATH}" cd "${RUN_PATH}"
exec ./snowglobe -url \'"${URL}"\' exec ./singularity -url \'"${URL}"\'

24
indra/newview/llagent.cpp
View File

@@ -1845,13 +1845,6 @@ U8 LLAgent::getRenderState()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static const LLFloaterView::skip_list_t& get_skip_list()
{
static LLFloaterView::skip_list_t skip_list;
skip_list.insert(LLFloaterMap::getInstance());
return skip_list;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// endAnimationUpdateUI() // endAnimationUpdateUI()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -1884,8 +1877,11 @@ void LLAgent::endAnimationUpdateUI()
// Only pop if we have pushed... // Only pop if we have pushed...
if (TRUE == mViewsPushed) if (TRUE == mViewsPushed)
{ {
LLFloaterView::skip_list_t skip_list;
skip_list.insert(LLFloaterMap::getInstance());
gFloaterView->popVisibleAll(skip_list);
mViewsPushed = FALSE; mViewsPushed = FALSE;
gFloaterView->popVisibleAll(get_skip_list());
} }
gAgentCamera.setLookAt(LOOKAT_TARGET_CLEAR); gAgentCamera.setLookAt(LOOKAT_TARGET_CLEAR);
@@ -1962,6 +1958,7 @@ void LLAgent::endAnimationUpdateUI()
// hide menus // hide menus
gMenuBarView->setVisible(FALSE); gMenuBarView->setVisible(FALSE);
gStatusBar->setVisibleForMouselook(false); gStatusBar->setVisibleForMouselook(false);
LLPanelPathfindingRebakeNavmesh::getInstance()->setVisible(FALSE); LLPanelPathfindingRebakeNavmesh::getInstance()->setVisible(FALSE);
// clear out camera lag effect // clear out camera lag effect
@@ -1978,7 +1975,12 @@ void LLAgent::endAnimationUpdateUI()
{ {
(*mMouselookModeInSignal)(); (*mMouselookModeInSignal)();
} }
gFloaterView->pushVisibleAll(FALSE, get_skip_list());
// hide all floaters except the mini map
LLFloaterView::skip_list_t skip_list;
skip_list.insert(LLFloaterMap::getInstance());
gFloaterView->pushVisibleAll(FALSE, skip_list);
if( gMorphView ) if( gMorphView )
{ {
@@ -3487,9 +3489,9 @@ bool LLAgent::teleportCore(bool is_local)
// yet if the teleport will succeed. Look in // yet if the teleport will succeed. Look in
// process_teleport_location_reply // process_teleport_location_reply
// close the map and find panels so we can see our destination // close the map panel so we can see our destination.
// we don't close search floater, see EXT-5840.
LLFloaterWorldMap::hide(NULL); LLFloaterWorldMap::hide(NULL);
LLFloaterDirectory::hide(NULL);
// hide land floater too - it'll be out of date // hide land floater too - it'll be out of date
LLFloaterLand::hideInstance(); LLFloaterLand::hideInstance();

1
indra/newview/llfloateravatarinfo.h
View File

@@ -47,7 +47,6 @@
class LLAvatarName; class LLAvatarName;
class LLButton; class LLButton;
class LLCheckBoxCtrl; class LLCheckBoxCtrl;
class LLDropTarget;
class LLInventoryItem; class LLInventoryItem;
class LLLineEditor; class LLLineEditor;
class LLMessageSystem; class LLMessageSystem;

13
indra/newview/llfloaterreporter.cpp
View File

@@ -32,19 +32,19 @@
#include "llviewerprecompiledheaders.h" #include "llviewerprecompiledheaders.h"
#include <sstream>
// self include // self include
#include "llfloaterreporter.h" #include "llfloaterreporter.h"
#include <sstream>
// linden library includes // linden library includes
#include "llassetstorage.h" #include "llassetstorage.h"
#include "llcachename.h" #include "llcachename.h"
#include "llfontgl.h" #include "llfontgl.h"
#include "llgl.h" // for renderer #include "llgl.h" // for renderer
#include "llimagej2c.h"
#include "llinventory.h" #include "llinventory.h"
#include "llnotificationsutil.h" #include "llnotificationsutil.h"
#include "llimagej2c.h"
#include "llstring.h" #include "llstring.h"
#include "llsys.h" #include "llsys.h"
#include "sgversion.h" #include "sgversion.h"
@@ -86,6 +86,8 @@
#include "llassetuploadresponders.h" #include "llassetuploadresponders.h"
#include "lltrans.h"
// <edit> // <edit>
#include "llviewercontrol.h" #include "llviewercontrol.h"
// </edit> // </edit>
@@ -394,6 +396,7 @@ void LLFloaterReporter::callbackAvatarID(const std::vector<std::string>& names,
}; };
} }
// static // static
void LLFloaterReporter::onClickSend(void *userdata) void LLFloaterReporter::onClickSend(void *userdata)
{ {
@@ -440,7 +443,7 @@ void LLFloaterReporter::onClickSend(void *userdata)
} }
} }
LLUploadDialog::modalUploadDialog("Uploading...\n\nReport"); LLUploadDialog::modalUploadDialog(LLTrans::getString("uploading_abuse_report"));
// *TODO don't upload image if checkbox isn't checked // *TODO don't upload image if checkbox isn't checked
std::string url = gAgent.getRegion()->getCapability("SendUserReport"); std::string url = gAgent.getRegion()->getCapability("SendUserReport");
std::string sshot_url = gAgent.getRegion()->getCapability("SendUserReportWithScreenshot"); std::string sshot_url = gAgent.getRegion()->getCapability("SendUserReportWithScreenshot");
@@ -943,7 +946,7 @@ void LLFloaterReporter::takeScreenshot()
{ {
texture->setImageAssetID(mResourceDatap->mAssetInfo.mUuid); texture->setImageAssetID(mResourceDatap->mAssetInfo.mUuid);
texture->setDefaultImageAssetID(mResourceDatap->mAssetInfo.mUuid); texture->setDefaultImageAssetID(mResourceDatap->mAssetInfo.mUuid);
texture->setCaption(std::string("Screenshot")); texture->setCaption(getString("Screenshot"));
} }
} }

3
indra/newview/llfloatersellland.cpp
View File

@@ -46,6 +46,7 @@
#include "llviewerparcelmgr.h" #include "llviewerparcelmgr.h"
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
#include "llviewerwindow.h" #include "llviewerwindow.h"
#include "lltrans.h"
#include "hippogridmanager.h" #include "hippogridmanager.h"
@@ -471,7 +472,7 @@ void LLFloaterSellLandUI::doSellLand(void *userdata)
// Do a confirmation // Do a confirmation
S32 sale_price = self->childGetValue("price"); S32 sale_price = self->childGetValue("price");
S32 area = parcel->getArea(); S32 area = parcel->getArea();
std::string authorizedBuyerName = "Anyone"; std::string authorizedBuyerName = LLTrans::getString("Anyone");
bool sell_to_anyone = true; bool sell_to_anyone = true;
if ("user" == self->childGetValue("sell_to").asString()) if ("user" == self->childGetValue("sell_to").asString())
{ {

2
indra/newview/llfolderviewitem.cpp
View File

@@ -1053,7 +1053,7 @@ void LLFolderViewItem::draw()
&& root_is_loading && root_is_loading
&& mShowLoadStatus)) && mShowLoadStatus))
{ {
std::string load_string = " ( Loading... ) "; std::string load_string = " ( " + LLTrans::getString("LoadingData") + " ) ";
font->renderUTF8(load_string, 0, right_x, y, sSearchStatusColor, font->renderUTF8(load_string, 0, right_x, y, sSearchStatusColor,
LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
S32_MAX, S32_MAX, &right_x, FALSE); S32_MAX, S32_MAX, &right_x, FALSE);

21
indra/newview/llgiveinventory.cpp
View File

@@ -36,6 +36,7 @@
#include "llagentdata.h" #include "llagentdata.h"
#include "llagentui.h" #include "llagentui.h"
#include "llagentwearables.h" #include "llagentwearables.h"
#include "llfloaterchat.h" //for addChatHistory
#include "llfloatertools.h" // for gFloaterTool #include "llfloatertools.h" // for gFloaterTool
#include "llhudeffecttrail.h" #include "llhudeffecttrail.h"
#include "llhudmanager.h" #include "llhudmanager.h"
@@ -159,7 +160,7 @@ bool LLGiveInventory::isInventoryGiveAcceptable(const LLInventoryItem* item)
return acceptable; return acceptable;
} }
// Static // static
bool LLGiveInventory::isInventoryGroupGiveAcceptable(const LLInventoryItem* item) bool LLGiveInventory::isInventoryGroupGiveAcceptable(const LLInventoryItem* item)
{ {
if(!item) return false; if(!item) return false;
@@ -305,6 +306,8 @@ void LLGiveInventory::doGiveInventoryCategory(const LLUUID& to_agent,
//static //static
void LLGiveInventory::logInventoryOffer(const LLUUID& to_agent, const LLUUID &im_session_id) void LLGiveInventory::logInventoryOffer(const LLUUID& to_agent, const LLUUID &im_session_id)
{ {
// compute id of possible IM session with agent that has "to_agent" id
LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, to_agent);
// If this item was given by drag-and-drop into an IM panel, log this action in the IM panel chat. // If this item was given by drag-and-drop into an IM panel, log this action in the IM panel chat.
LLSD args; LLSD args;
args["user_id"] = to_agent; args["user_id"] = to_agent;
@@ -312,6 +315,22 @@ void LLGiveInventory::logInventoryOffer(const LLUUID& to_agent, const LLUUID &im
{ {
gIMMgr->addSystemMessage(im_session_id, "inventory_item_offered", args); gIMMgr->addSystemMessage(im_session_id, "inventory_item_offered", args);
} }
// If this item was given by drag-and-drop on avatar while IM panel was open, log this action in the IM panel chat.
else if (gIMMgr->isIMSessionOpen(session_id))
{
gIMMgr->addSystemMessage(session_id, "inventory_item_offered", args);
}
// If this item was given by drag-and-drop on avatar while IM panel wasn't open, log this action to IM history.
else
{
std::string full_name;
if (gCacheName->getFullName(to_agent, full_name))
{
LLChat chat(LLTrans::getString("inventory_item_offered_to") + " " + full_name);
chat.mSourceType = CHAT_SOURCE_SYSTEM;
LLFloaterChat::addChatHistory(chat);
}
}
} }
// static // static

6
indra/newview/llinventorybridge.cpp
View File

@@ -5106,6 +5106,7 @@ std::string LLObjectBridge::getLabelSuffix() const
{ {
return LLItemBridge::getLabelSuffix() + LLTrans::getString("worn"); return LLItemBridge::getLabelSuffix() + LLTrans::getString("worn");
} }
bool unsupportedPoint = false; //Unsupported points are given special names, translate them as they're named, not later.
std::string attachment_point_name = gAgentAvatarp->getAttachedPointName(mUUID); std::string attachment_point_name = gAgentAvatarp->getAttachedPointName(mUUID);
if (attachment_point_name == LLStringUtil::null) // Error condition, invalid attach point if (attachment_point_name == LLStringUtil::null) // Error condition, invalid attach point
{ {
@@ -5116,13 +5117,14 @@ std::string LLObjectBridge::getLabelSuffix() const
{ {
if((*iter).second.first == mUUID) if((*iter).second.first == mUUID)
{ {
attachment_point_name = llformat("unsupported point %d)", (*iter).first); attachment_point_name = llformat((LLTrans::getString("unsupported point")+" %d)").c_str(), (*iter).first);
} }
} }
unsupportedPoint = attachment_point_name != "Invalid Attachment";
} }
// e.g. "(worn on ...)" / "(attached to ...)" // e.g. "(worn on ...)" / "(attached to ...)"
LLStringUtil::format_map_t args; LLStringUtil::format_map_t args;
args["[ATTACHMENT_POINT]"] = attachment_point_name; args["[ATTACHMENT_POINT]"] = unsupportedPoint ? attachment_point_name : LLTrans::getString(attachment_point_name);
if(gRlvAttachmentLocks.canDetach(getItem())) if(gRlvAttachmentLocks.canDetach(getItem()))
return LLItemBridge::getLabelSuffix() + LLTrans::getString("WornOnAttachmentPoint", args); return LLItemBridge::getLabelSuffix() + LLTrans::getString("WornOnAttachmentPoint", args);

3
indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
View File

@@ -2,6 +2,9 @@
<floater can_close="true" can_drag_on_left="false" can_minimize="true" <floater can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="false" height="590" min_height="100" min_width="100" can_resize="false" height="590" min_height="100" min_width="100"
name="floater_report_abuse" title="Report Abuse" width="390"> name="floater_report_abuse" title="Report Abuse" width="390">
<string name="Screenshot">
Screenshot
</string>
<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None" <texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
follows="left|top" height="114" label="" left="238" mouse_opaque="true" follows="left|top" height="114" label="" left="238" mouse_opaque="true"
name="screenshot" width="134" /> name="screenshot" width="134" />

54
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -2917,6 +2917,52 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="Rubber">Rubber</string> <string name="Rubber">Rubber</string>
<string name="Light">Light</string> <string name="Light">Light</string>
<!-- Avatar Skeleton -->
<string name="Chest">Chest</string>
<string name="Skull">Skull</string>
<string name="Left Shoulder">Left Shoulder</string>
<string name="Right Shoulder">Right Shoulder</string>
<string name="Left Hand">Left Hand</string>
<string name="Right Hand">Right Hand</string>
<string name="Left Foot">Left Foot</string>
<string name="Right Foot">Right Foot</string>
<string name="Spine">Spine</string>
<string name="Pelvis">Pelvis</string>
<string name="Mouth">Mouth</string>
<string name="Chin">Chin</string>
<string name="Left Ear">Left Ear</string>
<string name="Right Ear">Right Ear</string>
<string name="Left Eyeball">Left Eyeball</string>
<string name="Right Eyeball">Right Eyeball</string>
<string name="Nose">Nose</string>
<string name="R Upper Arm">R Upper Arm</string>
<string name="R Forearm">R Forearm</string>
<string name="L Upper Arm">L Upper Arm</string>
<string name="L Forearm">L Forearm</string>
<string name="Right Hip">Right Hip</string>
<string name="R Upper Leg">R Upper Leg</string>
<string name="R Lower Leg">R Lower Leg</string>
<string name="Left Hip">Left Hip</string>
<string name="L Upper Leg">L Upper Leg</string>
<string name="L Lower Leg">L Lower Leg</string>
<string name="Stomach">Stomach</string>
<string name="Left Pec">Left Pec</string>
<string name="Right Pec">Right Pec</string>
<string name="Neck">Neck</string>
<string name="Root">Root</string>
<string name="unsupported point">unsupported point</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<!-- HUD Position -->
<string name="Center 2">Center 2</string>
<string name="Top Right">Top Right</string>
<string name="Top">Top</string>
<string name="Top Left">Top Left</string>
<string name="Center">Center</string>
<string name="Bottom Left">Bottom Left</string>
<string name="Bottom">Bottom</string>
<string name="Bottom Right">Bottom Right</string>
<!-- compile queue--> <!-- compile queue-->
<string name="CompileQueueDownloadedCompiling">Downloaded, now compiling</string> <string name="CompileQueueDownloadedCompiling">Downloaded, now compiling</string>
<string name="CompileQueueScriptNotFound">Script not found on server.</string> <string name="CompileQueueScriptNotFound">Script not found on server.</string>
@@ -2957,6 +3003,9 @@ Where tag = tag string to match. Removes bot's matching the tag.
<string name="IMMainland">mainland</string> <string name="IMMainland">mainland</string>
<string name="IMTeen">teen</string> <string name="IMTeen">teen</string>
<!-- floater about land -->
<string name="Anyone">Anyone</string>
<!-- floater region info --> <!-- floater region info -->
<!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* --> <!-- The following will replace variable [ALL_ESTATES] in notifications EstateAllowed*, EstateBanned*, EstateManager* -->
<string name="RegionInfoError">error</string> <string name="RegionInfoError">error</string>
@@ -3696,6 +3745,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="IM_autoresponded_to">Autoresponse sent to</string> <string name="IM_autoresponded_to">Autoresponse sent to</string>
<string name="IM_autoresponse_sent_item">was sent auto-response item</string> <string name="IM_autoresponse_sent_item">was sent auto-response item</string>
<string name="Unnamed">(Unnamed)</string> <string name="Unnamed">(Unnamed)</string>
<string name="inventory_item_offered_to">Inventory item offered to</string>
<string name="Saved_message" value="(Saved [LONG_TIMESTAMP]) "/> <string name="Saved_message" value="(Saved [LONG_TIMESTAMP]) "/>
<string name="PowerUser1">You are bestowed with powers beyond mortal comprehension.</string> <string name="PowerUser1">You are bestowed with powers beyond mortal comprehension.</string>
<string name="PowerUser2">Use your newfound abilities wisely.</string> <string name="PowerUser2">Use your newfound abilities wisely.</string>
@@ -3814,6 +3864,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="group_role_owners">Owners</string> <string name="group_role_owners">Owners</string>
<string name="group_member_status_online">Online</string> <string name="group_member_status_online">Online</string>
<string name="uploading_abuse_report">Uploading...
Abuse Report</string>
<!-- names for new inventory items--> <!-- names for new inventory items-->
<string name="New Shape">New Shape</string> <string name="New Shape">New Shape</string>
<string name="New Skin">New Skin</string> <string name="New Skin">New Skin</string>