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

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source 
Conflicts:
	indra/newview/skins/default/xui/en-us/panel_friends.xml
This commit is contained in:
Beeks
2010-10-26 23:08:41 -04:00
parent d3cb5edf2c 38374d3876
commit 7eca5b9fcc
7 changed files with 85 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/llversionviewer.h
View File

@@ -35,8 +35,8 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 4;
const S32 LL_VERSION_PATCH = 2;
const S32 LL_VERSION_BUILD = 9;
const S32 LL_VERSION_PATCH = 3;
const S32 LL_VERSION_BUILD = 0;
const char * const LL_CHANNEL = "Ascent Viewer Release";

1
indra/newview/ascentfloatercontactgroups.cpp
View File

@@ -21,7 +21,6 @@
#include "llscrolllistctrl.h" //List box for filenames
#include "lluictrlfactory.h" //Loads the XUI
#include "llresmgr.h"
// project includes
#include "llviewercontrol.h"
#include "llviewerwindow.h"
#include "llsdserialize.h"

18
indra/newview/llimpanel.cpp
View File

@@ -59,6 +59,7 @@
#include "llfloaterchat.h"
#include "llkeyboard.h"
#include "lllineeditor.h"
#include "llcheckboxctrl.h"
#include "llnotify.h"
#include "llresmgr.h"
#include "lltabcontainer.h"
@@ -1279,6 +1280,8 @@ BOOL LLFloaterIMPanel::postBuild()
if (checkRequirements())
{
mRPMode = false;
mInputEditor = getChild<LLLineEditor>("chat_editor");
mInputEditor->setFocusReceivedCallback( onInputEditorFocusReceived, this );
mInputEditor->setFocusLostCallback( onInputEditorFocusLost, this );
@@ -1293,6 +1296,7 @@ BOOL LLFloaterIMPanel::postBuild()
childSetAction("profile_tele_btn", onClickTeleport, this);
childSetAction("group_info_btn", onClickGroupInfo, this);
childSetAction("history_btn", onClickHistory, this);
childSetCommitCallback("rp_mode", onRPMode, this);
childSetAction("start_call_btn", onClickStartCall, this);
childSetAction("end_call_btn", onClickEndCall, this);
@@ -1792,6 +1796,13 @@ void LLFloaterIMPanel::onClickTeleport( void* userdata )
}
}
// static
void LLFloaterIMPanel::onRPMode(LLUICtrl* source, void* user_data)
{
LLFloaterIMPanel* self = (LLFloaterIMPanel*) user_data;
self->mRPMode = source->getValue().asBoolean();
}
// static
void LLFloaterIMPanel::onClickHistory( void* userdata )
{
@@ -2018,7 +2029,7 @@ void LLFloaterIMPanel::sendMsg()
if (mInputEditor) mInputEditor->updateHistory();
// Truncate and convert to UTF8 for transport
std::string utf8text = wstring_to_utf8str(text);
if (gSavedSettings.getBOOL("AscentAutoCloseOOC") && (utf8text.length() > 1))
if (gSavedSettings.getBOOL("AscentAutoCloseOOC") && (utf8text.length() > 1) && !mRPMode)
{
// Chalice - OOC autoclosing patch based on code by Henri Beauchamp
int needsClosingType=0;
@@ -2062,7 +2073,12 @@ void LLFloaterIMPanel::sendMsg()
utf8text.replace(0, 1, "/me ");
}
}
utf8text = utf8str_truncate(utf8text, MAX_MSG_BUF_SIZE - 1);
std::string prefix = utf8text.substr(0, 4);
if (prefix != "/me " && prefix != "/me'")
if (mRPMode) utf8text = "[[" + utf8text + "]]";
if ( mSessionInitialized )
{

2
indra/newview/llimpanel.h
View File

@@ -215,6 +215,7 @@ public:
void selectAll();
void selectNone();
void setVisible(BOOL b);
BOOL mRPMode;
S32 getNumUnreadMessages() { return mNumUnreadMessages; }
@@ -232,6 +233,7 @@ public:
static void onClickProfile( void* userdata );
static void onClickHistory( void* userdata );
static void onRPMode(LLUICtrl* source, void* user_data);
static void onClickTeleport( void* userdata );
static void onClickGroupInfo( void* userdata );
static void onClickClose( void* userdata );

67
indra/newview/llinventorybridge.cpp
View File

@@ -101,6 +101,13 @@
#include "hgfloatertexteditor.h"
// </edit>
// Editing wearables from inventory is an include-hungry feature -.- -SG
#include "llviewerparcelmgr.h"
#include "llfloatertools.h"
#include "lltoolcomp.h"
#include "llviewerjoystick.h"
#include "lltoolmgr.h"
// Helpers
// bug in busy count inc/dec right now, logic is complex... do we really need it?
void inc_busy_count()
@@ -4033,14 +4040,6 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
{
LLInventoryItem* item = gInventory.getItem(mUUID);
if( item )
{
gMessageSystem->newMessageFast(_PREHASH_DetachAttachmentIntoInv);
@@ -4062,6 +4061,55 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
llwarns << "object not found - ignoring" << llendl;
}
}
else if ("edit" == action)
{
//if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
// return;
LLVOAvatar* avatarp = gAgent.getAvatarObject();
if (!avatarp)
return;
LLViewerObject* objectp = avatarp->getWornAttachment(mUUID);
if (!objectp)
return;
// [Selective copy/paste from LLObjectEdit::handleEvent()]
LLViewerParcelMgr::getInstance()->deselectLand();
LLSelectMgr::getInstance()->deselectAll();
if (gAgent.getFocusOnAvatar() && !LLToolMgr::getInstance()->inEdit())
{
if (objectp->isHUDAttachment() || !gSavedSettings.getBOOL("EditCameraMovement"))
{
// always freeze camera in space, even if camera doesn't move
// so, for example, follow cam scripts can't affect you when in build mode
gAgent.setFocusGlobal(gAgent.calcFocusPositionTargetGlobal(), LLUUID::null);
gAgent.setFocusOnAvatar(FALSE, ANIMATE);
}
else
{
gAgent.setFocusOnAvatar(FALSE, ANIMATE);
// zoom in on object center instead of where we clicked, as we need to see the manipulator handles
gAgent.setFocusGlobal(objectp->getPositionGlobal(), objectp->getID());
gAgent.cameraZoomIn(0.666f);
gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
gViewerWindow->moveCursorToCenter();
}
}
gFloaterTools->open();
LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
gFloaterTools->setEditTool( LLToolCompTranslate::getInstance() );
LLViewerJoystick::getInstance()->moveObjects(true);
LLViewerJoystick::getInstance()->setNeedsReset(true);
LLSelectMgr::getInstance()->selectObjectAndFamily(objectp);
// Could be first use
LLFirstUse::useBuild();
}
else LLItemBridge::performAction(folder, model, action);
}
@@ -4251,6 +4299,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
items.push_back(std::string("Attach Separator"));
items.push_back(std::string("Detach From Yourself"));
items.push_back(std::string("Wearable Edit"));
}
else
// <edit> testzone attachpt
@@ -5914,4 +5963,4 @@ const LLUUID &LLLinkFolderBridge::getFolderID() const
}
}
return LLUUID::null;
}
}

40
indra/newview/skins/default/xui/en-us/floater_instant_message.xml
View File

@@ -37,46 +37,16 @@
<string name="unavailable_text_label">
Text chat is not available for this call.
</string>
<!--[$PLOTR$]-->
<string name="otr_empty_string"></string>
<string name="otr_gen_key_please_wait">OTR is generating keys. This will happen once for each of your avatars and should take less than 45 seconds.</string>
<string name="otr_generic_name">Your buddy</string>
<string name="otr_err_send_in_finished">[NAME] has ended the private conversation, so your message was not sent. You should restart the private conversation, or end the private conversation.</string>
<string name="otr_err_deacivated">OTR has been deactivated by preferences (edit > preferences > Extras tab > IM tab)</string>
<string name="otr_err_failed_sending">Unable to encrypt your message for some reason; it has not been sent.</string>
<string name="otr_err_failed_starting">Unable to start private conversation.</string>
<string name="otr_err_offline_start">[NAME] appears offline; OTR will not try to start a private conversation.</string>
<string name="otr_err_offline_send">[NAME] appears offline; You may "End private conversation" and send your message un-encrypted.</string>
<string name="otr_prog_I_start">Attempting to start a private conversation with [NAME].</string>
<string name="otr_prog_I_stop_unverified">You have ended the unverified conversation with [NAME].</string>
<string name="otr_prog_I_stop_private" >You have ended the private conversation with [NAME].</string>
<string name="otr_prog_I_stop" >You have ended the OTR conversation with [NAME].</string>
<string name="otr_prog_they_start">[NAME] is attempting to start a private conversation.</string>
<string name="otr_prog_they_stop_unverified">[NAME] has ended the unverified conversation.</string>
<string name="otr_prog_they_stop_private" >[NAME] has ended the private conversation.</string>
<string name="otr_prog_they_stop" >[NAME] has ended the OTR conversation.</string>
<string name="otr_log_authenticated" >[NAME] is now authenticated.</string>
<string name="otr_log_start_private" >Private conversation with [NAME] started.</string>
<string name="otr_log_start_unverified">Unverified conversation started. [NAME] has not been authenticated, you should "authenticate buddy," see http://www.cypherpunks.ca/otr/help/3.2.0/authenticate.php</string>
<string name="otr_log_gone_insecure">Private conversation ended.</string>
<string name="otr_log_still_private" >Private conversation with [NAME] resumed.</string>
<string name="otr_log_still_unverified">Unverified conversation resumed. [NAME] has not been authenticated, you should "authenticate buddy," see http://www.cypherpunks.ca/otr/help/3.2.0/authenticate.php</string>
<string name="otr_not_private">OTR: Not Private</string>
<string name="otr_unverified" >OTR: Unverified</string>
<string name="otr_private" >OTR: Private</string>
<string name="otr_finished" >OTR: Finished</string>
<string name="otr_start" >Start private conversation</string>
<string name="otr_refresh">Refresh private conversation</string>
<string name="otr_restart">Restart private conversation</string>
<string name="otr_stop" >End private conversation</string>
<string name="otr_auth" >Authenticate buddy</string>
<!--[/$PLOTR$]-->
<button bottom="-40" follows="left|top" height="20" label="Profile" left="5"
name="profile_callee_btn" width="80" />
<button bottom="-40" follows="left|top" halign="center" height="20" label="Teleport" left_delta="80"
name="profile_tele_btn" width="80" />
<button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="80"
name="history_btn" pad_right="10" visible="true" width="80" />
name="history_btn" visible="true" width="80" />
<check_box bottom="-40" follows="left|top" halign="center" height="20" left_delta="80"
name="rp_mode" pad_right="10" >
RP Mode
</check_box>
<button bottom="-40" follows="left|top" halign="right" height="20"
image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
label="Call" left_delta="80" name="start_call_btn" width="53" />

2
indra/newview/skins/default/xui/en-us/panel_friends.xml
View File

@@ -49,7 +49,7 @@
<pad bottom="-7" height="0" left="-90" width="1" />
<button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
left_delta="0" name="assign_btn" tool_tip="Assign a friend to a Contact Group"
width="80" />
width="80" />-->
<button bottom_delta="-25" follows="top|right" height="22" label="IM/Call"
left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
width="80" />