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

Merge branch 'master' into meshupload

Browse Source
This commit is contained in:
Aleric Inglewood
2013-01-13 18:02:28 +01:00
parent db17b93156 dcc2e52c61
commit e7dea2714e
16 changed files with 98 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -760,6 +760,17 @@ Found in Advanced->Rendering->Info Displays</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>ShowLocalChatFloaterBar</key>
<map>
<key>Comment</key>
<string>Whether or not local chat should have an input bar, requires a restart.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>OtherChatsTornOff</key>
<map>
<key>Comment</key>
@@ -782,6 +793,17 @@ Found in Advanced->Rendering->Info Displays</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>CommunicateSpecificShortcut</key>
<map>
<key>Comment</key>
<string>When true, the keyboard shortcut for Communicate will not bring up the torn off Friends List.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>MarketImporterUpdateFreq</key>
<map>
<key>Comment</key>
@@ -6125,6 +6147,22 @@ This should be as low as possible, but too low may break functionality</string>
<integer>0</integer>
</array>
</map>
<key>FloaterChatBarlessRect</key>
<map>
<key>Comment</key>
<string>Rectangle for chat history without input bar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Rect</string>
<key>Value</key>
<array>
<integer>0</integer>
<integer>172</integer>
<integer>500</integer>
<integer>0</integer>
</array>
</map>
<key>FloaterClothingRect</key>
<map>
<key>Comment</key>

2
indra/newview/ascentprefschat.cpp
View File

@@ -329,6 +329,7 @@ void LLPrefsAscentChat::refreshValues()
mIMAnnounceIncoming = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming");
mHideTypingNotification = gSavedSettings.getBOOL("AscentHideTypingNotification");
mShowGroupNameInChatIM = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM");
mShowLocalChatFloaterBar = gSavedSettings.getBOOL("ShowLocalChatFloaterBar");
mPlayTypingSound = gSavedSettings.getBOOL("PlayTypingSound");
mHideNotificationsInChat = gSavedSettings.getBOOL("HideNotificationsInChat");
mEnableMUPose = gSavedSettings.getBOOL("AscentAllowMUpose");
@@ -536,6 +537,7 @@ void LLPrefsAscentChat::cancel()
gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming);
gSavedSettings.setBOOL("AscentHideTypingNotification", mHideTypingNotification);
gSavedSettings.setBOOL("OptionShowGroupNameInChatIM", mShowGroupNameInChatIM);
gSavedSettings.setBOOL("ShowLocalChatFloaterBar", mShowLocalChatFloaterBar);
gSavedSettings.setBOOL("PlayTypingSound", mPlayTypingSound);
gSavedSettings.setBOOL("HideNotificationsInChat", mHideNotificationsInChat);
gSavedSettings.setBOOL("AscentAllowMUpose", mEnableMUPose);

1
indra/newview/ascentprefschat.h
View File

@@ -66,6 +66,7 @@ protected:
BOOL mIMAnnounceIncoming;
BOOL mHideTypingNotification;
BOOL mShowGroupNameInChatIM;
bool mShowLocalChatFloaterBar;
BOOL mPlayTypingSound;
BOOL mHideNotificationsInChat;
BOOL mEnableMUPose;

8
indra/newview/llagentcamera.cpp
View File

@@ -161,7 +161,6 @@ LLAgentCamera::LLAgentCamera() :
mFocusObjectDist(0.f),
mFocusObjectOffset(),
mFocusDotRadius( 0.1f ), // meters
mTrackFocusObject(TRUE),
mUIOffset(0.f),
mAtKey(0), // Either 1, 0, or -1... indicates that movement-key is pressed
@@ -225,7 +224,6 @@ void LLAgentCamera::init()
mCurrentCameraDistance = getCameraOffsetInitial().magVec() * gSavedSettings.getF32("CameraOffsetScale");
mTargetCameraDistance = mCurrentCameraDistance;
mCameraZoomFraction = 1.f;
mTrackFocusObject = gSavedSettings.getBOOL("TrackFocusObject");
mInitialized = true;
}
@@ -1623,11 +1621,9 @@ LLVector3d LLAgentCamera::calcFocusPositionTargetGlobal()
{
LLDrawable* drawablep = mFocusObject->mDrawable;
if (mTrackFocusObject &&
drawablep &&
drawablep->isActive())
if (gSavedSettings.getBOOL("TrackFocusObject") && drawablep)
{
if (!mFocusObject->isAvatar())
if (drawablep->isActive() && !mFocusObject->isAvatar())
{
if (mFocusObject->isSelected())
{

2
indra/newview/llagentcamera.h
View File

@@ -211,7 +211,6 @@ public:
void setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id);
void clearFocusObject();
void setFocusObject(LLViewerObject* object);
void setObjectTracking(BOOL track) { mTrackFocusObject = track; }
const LLVector3d &getFocusGlobal() const { return mFocusGlobal; }
const LLVector3d &getFocusTargetGlobal() const { return mFocusTargetGlobal; }
private:
@@ -224,7 +223,6 @@ private:
F32 mFocusObjectDist;
LLVector3 mFocusObjectOffset;
F32 mFocusDotRadius; // Meters
BOOL mTrackFocusObject;
//--------------------------------------------------------------------
// Lookat / Pointat

3
indra/newview/llfloaterchat.cpp
View File

@@ -108,7 +108,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, NULL);
// do not automatically open singleton floaters (as result of getInstance())
BOOL no_open = FALSE;
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_chat_history.xml",&getFactoryMap(),no_open);
bool show_bar = gSavedSettings.getBOOL("ShowLocalChatFloaterBar");
LLUICtrlFactory::getInstance()->buildFloater(this, (show_bar ? "floater_chat_history.xml" : "floater_chat_history_barless.xml"), &getFactoryMap(), no_open);
childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
childSetCommitCallback("translate chat",onClickToggleTranslateChat,this);

4
indra/newview/llimview.cpp
View File

@@ -1140,7 +1140,7 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
static LLCachedControl<bool> minimize("OtherChatsTornOffAndMinimized");
if (focused_floater != NULL) // there was a focused floater
{
floater->setMinimized(true); // so minimize this one, for now
floater->setMinimized(minimize); // so minimize this one, for now, if desired
focused_floater->setFocus(true); // and work around focus being removed by focusing on the last
}
else if (minimize)
@@ -1185,7 +1185,7 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
static LLCachedControl<bool> minimize("OtherChatsTornOffAndMinimized");
if (focused_floater != NULL) // there was a focused floater
{
floater->setMinimized(true); // so minimize this one, for now
floater->setMinimized(minimize); // so minimize this one, for now, if desired
focused_floater->setFocus(true); // and work around focus being removed by focusing on the last
}
else if (minimize)

1
indra/newview/llmaniprotate.cpp
View File

@@ -500,7 +500,6 @@ BOOL LLManipRotate::handleMouseUp(S32 x, S32 y, MASK mask)
// Might have missed last update due to timing.
LLSelectMgr::getInstance()->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
LLSelectMgr::getInstance()->enableSilhouette(TRUE);
//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
LLSelectMgr::getInstance()->updateSelectionCenter();
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);

1
indra/newview/llmanipscale.cpp
View File

@@ -385,7 +385,6 @@ BOOL LLManipScale::handleMouseUp(S32 x, S32 y, MASK mask)
// Might have missed last update due to UPDATE_DELAY timing
LLSelectMgr::getInstance()->sendMultipleUpdate( mLastUpdateFlags );
//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
}
return LLManip::handleMouseUp(x, y, mask);

1
indra/newview/llmaniptranslate.cpp
View File

@@ -1077,7 +1077,6 @@ BOOL LLManipTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
mInSnapRegime = FALSE;
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
}
return LLManip::handleMouseUp(x, y, mask);

4
indra/newview/llprefschat.cpp
View File

@@ -66,6 +66,7 @@ private:
LLColor4 mHTMLLinkColor;
BOOL mChatFullWidth;
BOOL mCloseChatOnReturn;
bool mOnlyComm;
BOOL mArrowKeysMoveAvatar;
BOOL mShowTimestamps;
BOOL mPlayTypingAnim;
@@ -111,6 +112,7 @@ LLPrefsChatImpl::LLPrefsChatImpl()
childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
childSetValue("translate_language_combobox", gSavedSettings.getString("TranslateLanguage"));
childSetValue("translate_chat", gSavedSettings.getBOOL("TranslateChat"));
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
}
void LLPrefsChatImpl::refreshValues()
@@ -139,6 +141,7 @@ void LLPrefsChatImpl::refreshValues()
mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
mTranslateLanguage = gSavedSettings.getString("TranslateLanguage");
mTranslateChat = gSavedSettings.getBOOL("TranslateChat");
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
}
void LLPrefsChatImpl::cancel()
@@ -166,6 +169,7 @@ void LLPrefsChatImpl::cancel()
gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);
gSavedSettings.setString("TranslateLanguage", mTranslateLanguage);
gSavedSettings.setBOOL("TranslateChat", mTranslateChat);
gSavedSettings.setBOOL("CommunicateSpecificShortcut", mOnlyComm);
}
void LLPrefsChatImpl::apply()

2
indra/newview/lltoolgrab.cpp
View File

@@ -983,8 +983,6 @@ BOOL LLToolGrab::handleMouseUp(S32 x, S32 y, MASK mask)
gGrabTransientTool = NULL;
}
//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
return TRUE;
}

3
indra/newview/llviewermenu.cpp
View File

@@ -2062,7 +2062,8 @@ class LLViewCommunicate : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
static LLCachedControl<bool> only_comm("CommunicateSpecificShortcut");
if (!only_comm && LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
{
LLFloaterMyFriends::toggleInstance();
}

42
indra/newview/skins/default/xui/en-us/floater_chat_history_barless.xml Normal file
View File

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true" can_tear_off="true" enabled="true" height="275" left="15"
min_height="150" min_width="425" name="chat floater" rect_control="FloaterChatBarlessRect" title="Local Chat" width="435">
<string name="ringing">Connecting to in-world Voice Chat...</string>
<string name="connected">Connected</string>
<string name="unavailable">Voice not available at your current location</string>
<string name="hang_up">Disconnected from in-world Voice Chat</string>
<string name="voice_icon">icn_voice-localchat.tga</string>
<string name="IM_logging_string">-- Instant message logging enabled --</string>
<string name="IM_end_log_string">-- End of Log --</string>
<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
<string name="ScriptTakeMoney">Take in-world money ([CURRENCY]) from you</string>
<string name="ActOnControlInputs">Act on your control inputs</string>
<string name="RemapControlInputs">Remap your control inputs</string>
<string name="AnimateYourAvatar">Animate your avatar</string>
<string name="AttachToYourAvatar">Attach to your avatar</string>
<string name="ReleaseOwnership">Release ownership and become public</string>
<string name="LinkAndDelink">Link and delink from other objects</string>
<string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
<string name="ChangePermissions">Change its permissions</string>
<string name="TrackYourCamera">Track your camera</string>
<string name="TeleportYourAgent">Teleport you</string>
<string name="ControlYourCamera">Control your camera</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="260" left="0" orientation="horizontal" width="430" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0" min_width="275" name="im_contents_panel" width="305">
<combo_box follows="left|top" height="18" label="Gestures" left="6" name="Gesture" width="120">
<combo_item name="Gestures">Gestures</combo_item>
</combo_box>
<check_box bottom_delta="-2" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Show Muted Text" left_delta="124" name="show mutes" width="116"/>
<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100"/-->
<button bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_tip="Click here to open chat history in external editor."/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn" right="305" tool_tip="Click here to show a list of active participants in this IM session." width="80"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="5" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="104" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="5" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="104" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
<panel bottom="0" left="0" name="chat_panel" height="0" width="0" visible="false">
<string name="gesture_label">Gestures</string>
</panel>
</layout_panel>
<layout_panel auto_resize="false" bottom="0" can_resize="true" filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" name="active_speakers_panel" top_delta="0" visible="false" width="140"/>
</layout_stack>
</floater>

1
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
View File

@@ -22,6 +22,7 @@
label="Do not echo/log notifications in chat" name="hide_notifications_in_chat_check"/>
<check_box bottom_delta="-20" follows="left|top" control_name="OptionShowGroupNameInChatIM" initial_value="false"
label="Show group name in chat" tool_tip="The name of the group will also be displayed if the IM is from group chat." name="append_group_name_check"/>
<check_box bottom_delta="-20" follows="left|top" control_name="ShowLocalChatFloaterBar" label="Show local chat bar in floater (Needs restart)" tool_tip="Whether or not to display the input bar at the bottom of the local chat floater." name="show_local_chat_floater_bar"/>
<check_box bottom="-120" left="10" control_name="AscentAllowMUpose" initial_value="false"
label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
<check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"

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

@@ -24,8 +24,9 @@
<text bottom_delta="6" follows="left|top" height="10" left="405" name="text_box5">(# lines)</text>
<slider bottom_delta="-25" control_name="ConsoleBackgroundOpacity" follows="top" height="12" increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1" min_val="0" name="console_opacity" value="0.4" width="200"/>
<check_box bottom_delta="-25" control_name="ChatFullWidth" follows="top" height="16" initial_value="false" label="Use full screen width (Requires restart)" name="chat_full_width_check"/>
<text bottom_delta="-22" height="10" left="12" mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
<text bottom_delta="-12" height="10" left="12" mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
<check_box bottom_delta="-8" follows="top" height="16" initial_value="false" label="Close chat bar after hitting return" left="148" name="close_chat_on_return_check"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Disallow communicate shortcut opening detached friends list" left="148" control_name="CommunicateSpecificShortcut" name="only_comm"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Arrow keys always move avatar when chatting" name="arrow_keys_move_avatar_check"/>
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Show timestamps in Local Chat" name="show_timestamps_check"/>
<check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" follows="top" height="16" initial_value="false" label="Show script errors and warnings as regular chat" name="script_errors_as_chat"/>