From b9c55ff11c030f7670b4e756a681a49ecdafed55 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 3 Aug 2010 02:04:04 -0500
Subject: Use the correct setting name for LightShare.
---
linden/indra/newview/lightshare.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index b422236..78d27b5 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -101,7 +101,7 @@ WindlightMessage::~WindlightMessage()
// static
void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
{
- if( gSavedSettings.getU32("UseLightShare") <= LIGHTSHARE_NEVER )
+ if( gSavedSettings.getU32("LightShareAllowed") <= LIGHTSHARE_NEVER )
return;
WindlightMessage* wl = new WindlightMessage(msg);
@@ -114,7 +114,7 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
// If they are using region settings already, or LightShare is
// always allowed, just apply the new settings, don't bother asking.
- if( gSavedSettings.getU32("UseLightShare") == LIGHTSHARE_ALWAYS ||
+ if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ALWAYS ||
(sky == sSkyPresetName && water == sWaterPresetName) )
{
wl->apply();
@@ -138,7 +138,7 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
return;
}
- if( gSavedSettings.getU32("UseLightShare") == LIGHTSHARE_ASK &&
+ if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ASK &&
sMostRecent == NULL )
{
// No most recent, so store this and create notification
--
cgit v1.1
From a8378eec3801b524b5f90ce4f00af1c8bdca6cd1 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 3 Aug 2010 09:56:02 -0700
Subject: Avatar sounds now don't disable when from a region above current
maturity
---
linden/indra/newview/llviewermessage.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index bc1aedb..140b517 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3931,8 +3931,10 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
msg->getF32Fast(_PREHASH_SoundData, _PREHASH_Gain, gain);
//If we have sounds muted, don't even try to load or trigger the sound.
- if(gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+ if (gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+ {
return;
+ }
// adjust sound location to true global coords
LLVector3d pos_global = from_region_handle(region_handle);
@@ -3940,9 +3942,6 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
pos_global.mdV[VY] += pos_local.mV[VY];
pos_global.mdV[VZ] += pos_local.mV[VZ];
- // Don't play sounds if sound settings are muted.
- if (gSavedSettings.getBOOL("MuteSounds")) return;
-
// Don't play a trigger sound if you can't hear it due
// to parcel "local audio only" settings.
if (!LLViewerParcelMgr::getInstance()->canHearSound(pos_global)) return;
@@ -3961,10 +3960,11 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
}
// Don't play sounds from a region with maturity above current agent maturity
- if( !gAgent.canAccessMaturityInRegion( region_handle ) )
+ // Actually, let's -- MC
+ /*if( !gAgent.canAccessMaturityInRegion( region_handle ) )
{
return;
- }
+ }*/
gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
}
--
cgit v1.1
From 9336f3666cdb3269d143d151a113d583c4cfab9c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 3 Aug 2010 11:48:16 -0700
Subject: Scratching an ooooold itch: added 'Gestures' slider and mute button
to the audio controls
---
linden/indra/llaudio/audioengine.h | 3 ++-
linden/indra/newview/app_settings/settings.xml | 22 +++++++++++++++++++++
linden/indra/newview/llvieweraudio.cpp | 2 ++
linden/indra/newview/llviewercontrol.cpp | 2 ++
linden/indra/newview/llviewermessage.cpp | 23 ++++++++++++++++++----
.../skins/default/xui/en-us/panel_audio.xml | 8 ++++++++
.../xui/en-us/panel_media_remote_expanded.xml | 4 ++--
.../default/xui/en-us/panel_preferences_audio.xml | 8 ++++----
8 files changed, 61 insertions(+), 11 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index e990eb7..e46091c 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -93,7 +93,8 @@ public:
AUDIO_TYPE_SFX = 1,
AUDIO_TYPE_UI = 2,
AUDIO_TYPE_AMBIENT = 3,
- AUDIO_TYPE_COUNT = 4 // last
+ AUDIO_TYPE_GESTURE = 4,
+ AUDIO_TYPE_COUNT = 5 // last
};
LLAudioEngine();
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index aae182c..d71cf09 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -15,6 +15,17 @@
Value
0
+ AudioLevelGestures
+
AutoCloseOOC
+ MuteGestures
+
MuteWind
ToolboxAutoMove
PersistShowLookAt
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.1
From 51c0f61c3a6d92d67a3df20f58b220d1ca11bb6d Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 21 Aug 2010 11:59:57 -0700
Subject: Changed version to Weekly: 2010-08-21
---
linden/indra/newview/app_settings/viewerversion.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index 4d6f1a3..37cfe0a 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -20,6 +20,6 @@ need to be changed manually - MC
-
+
--
cgit v1.1
From 7364049359bd554f1f0d20335b7d14b31f35e7a8 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 21 Aug 2010 14:07:40 -0700
Subject: Added info about outfit changing to derender notification
---
linden/indra/newview/skins/default/xui/en-us/notifications.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 108728d..d830e7e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6807,7 +6807,7 @@ Are you sure you want to move here?
type="alert">
Are you sure you want to derender [NAME]?
-[NAME] will be hidden until you exit the region.
+[NAME] will be hidden until you exit the region or they change outfits.
+
+
+
@@ -2150,11 +2155,6 @@
userdata="ShowCrosshairs" />
-
-
-
--
cgit v1.1
From 260ec5d581f964ba01d2422f7ca96ad20c0baf92 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 8 Jun 2010 18:56:16 -0700
Subject: WIP: show all avatars the viewer can find if you have EM privelges on
the sim
---
linden/indra/newview/panelradar.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index b323a77..ce91da2 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -175,6 +175,11 @@ void PanelRadar::updateRadarInfo()
}
else // avatar_ids empty
{
+ // Just in case
+ if (!mAvatars.empty())
+ {
+ mAvatars.clear();
+ }
mRadarList->deleteAllItems();
mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
LLUIString av_count_string = getString("avatars_in_plural");
@@ -211,6 +216,8 @@ void PanelRadar::updateRadarDisplay()
F32 range = gSavedSettings.getF32("NearMeRange");
bool notify_chat = gSavedSettings.getBOOL("MiniMapNotifyChatRange");
bool notify_sim = gSavedSettings.getBOOL("MiniMapNotifySimRange");
+ // We show avatars outside the estate even if you can't manage it in case griefers are lying on the border
+ bool is_manager = gAgent.getRegion()->canManageEstate();
// [RLVa:KB] - Alternate: Imprudence-1.2.0
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
{
@@ -279,7 +286,7 @@ void PanelRadar::updateRadarDisplay()
}
// Only display avatars in range
- if (entry->getDistance() <= range)
+ if (is_manager || entry->getDistance() <= range)
{
// Append typing string
std::string typing = "";
--
cgit v1.1
From 26972e4f12900a2662d74b7d95da3f693ba48c28 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 22 Aug 2010 21:30:15 -0700
Subject: Changed 'main console' to 'main chat' for showing IMs
---
linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index 0904815..b0dd026 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -34,7 +34,7 @@
getHoverObjects()->getObjectCount();
+ line.append(llformat("Prims: %d", prim_count));
+ mText.push_back(line);
+
+ line.clear();
+ line.append("Position: ");
+
+ LLViewerRegion *region = gAgent.getRegion();
+ LLVector3 position = region->getPosRegionFromGlobal(hit_object->getPositionGlobal());//regionp->getOriginAgent();
+ LLVector3 mypos = region->getPosRegionFromGlobal(gAgent.getPositionGlobal());
+
+
+ LLVector3 delta = position - mypos;
+ F32 distance = (F32)delta.magVec();
+
+ line.append(llformat("<%.02f,%.02f,%.02f>",position.mV[0],position.mV[1],position.mV[2]));
+ mText.push_back(line);
+ line.clear();
+ line.append(llformat("Distance: %.02fm",distance));
+ mText.push_back(line);
// If the hover tip shouldn't be shown, delete all the object text
if (suppressObjectHoverDisplay)
--
cgit v1.1
From a71cbc6917a6ab0c24c3a71f98db0c762571c35e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 23 Aug 2010 01:25:21 -0700
Subject: Updated the about window to include the Cool VL Viewer and mention
Kitty as the author of RLVa
---
linden/indra/newview/skins/default/xui/en-us/floater_about.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index d9c1798..557c1d7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -17,7 +17,7 @@
For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
- Thanks also to the developers of the Green Life Emerald Viewer, Hippo Viewer, and Meerkat Viewer for viewer enhancements we have incorporated. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+ Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
For a complete list of who did what, read the release notes!
--
cgit v1.1
From bc1263e920eb673f3c93edb8757b97b9a8a7125a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 23 Aug 2010 01:29:47 -0700
Subject: Toggle between limited and sim-wide range for radar
---
linden/indra/newview/app_settings/settings.xml | 11 ++++++++
linden/indra/newview/panelradar.cpp | 33 ++++++++++++++++++++--
linden/indra/newview/panelradar.h | 3 ++
.../skins/default/xui/en-us/panel_radar.xml | 14 ++++++---
4 files changed, 54 insertions(+), 7 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index f0d6376..c8a247f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -524,6 +524,17 @@
Value
0
+ RadarSimWide
+
SavedRenderFarClip
+ VivoxLicenseAccepted
+
WarnFirstAO
+ WarnFirstVoiceLicense
+
DefaultGrid
EnergyFromTop
+ ShowcaseURLDefault
+
ShowAOSitPopup
+ FloaterLocalbitmapbrowserRect
+
FloaterPrimImport
- InventorySearchType
-
IgnoreSimulatorCameraConstraints
+ WornItemsSortOrder
+
DefaultGrid
+ UseLegacyChatLogsFolder
+
UseUTCTime
+ TranslateLanguage
+
+ TranslateChat
+
LastFeatureVersion
+ EmeraldAutoCorrectCount
+
EmeraldTranslateReplace
-
+
RestrainedLife
diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index 3e1d817..61e4ef4 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -72,7 +72,7 @@
#include "audioengine.h"
#include "llviewerparcelmediaautoplay.h"
#include "lloverlaybar.h"
-//KOW #include "lggautocorrectfloater.h"
+#include "lggautocorrectfloater.h"
#include "lggautocorrect.h"
//#define JC_PROFILE_GSAVED
@@ -623,13 +623,13 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
cmdline_tp2name(name);
}
return false;
- } /*
+ }
else if(revised_text == "/ac")
{
lggAutoCorrectFloaterStart::show(TRUE,NULL);
cmdline_printchat("Displaying AutoCorrection Floater.");
return false;
- } */
+ }
else if(command == *sEmeraldCmdLineAutocorrect)
{
if (revised_text.length() <= command.length() + 1) //KOW: verify that we have params
diff --git a/linden/indra/newview/lggautocorrectfloater.cpp b/linden/indra/newview/lggautocorrectfloater.cpp
new file mode 100644
index 0000000..9d68b25
--- /dev/null
+++ b/linden/indra/newview/lggautocorrectfloater.cpp
@@ -0,0 +1,444 @@
+/* Copyright (c) 2009
+*
+* Greg Hendrickson (LordGregGreg Back). All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or
+* without modification, are permitted provided that the following
+* conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above
+* copyright notice, this list of conditions and the following
+* disclaimer in the documentation and/or other materials provided
+* with the distribution.
+* 3. Neither the name Modular Systems nor the names of its contributors
+* may be used to endorse or promote products derived from this
+* software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+* THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "lggautocorrectfloater.h"
+
+#include "llagentdata.h"
+#include "llcommandhandler.h"
+#include "llfloater.h"
+#include "lluictrlfactory.h"
+#include "llagent.h"
+#include "llpanel.h"
+#include "llbutton.h"
+#include "llcolorswatch.h"
+#include "llcombobox.h"
+#include "llview.h"
+#include "llprefsadvanced.h"
+#include "llhttpclient.h"
+#include "llbufferstream.h"
+#include "llcheckboxctrl.h"
+#include "llviewercontrol.h"
+
+#include "llui.h"
+#include "llcontrol.h"
+#include "llscrolllistctrl.h"
+#include "llscrollingpanellist.h"
+#include "lggautocorrect.h"
+#include "llfilepicker.h"
+#include "llfile.h"
+#include "llsdserialize.h"
+#include "llfloaterchat.h"
+#include "llchat.h"
+#include "llviewerinventory.h"
+#include "llinventorymodel.h"
+#include "llhost.h"
+#include "llassetstorage.h"
+#include "roles_constants.h"
+#include "llviewertexteditor.h"
+#include
+
+#include
+
+class lggAutoCorrectFloater;
+class lggAutoCorrectFloater : public LLFloater, public LLFloaterSingleton
+{
+public:
+ lggAutoCorrectFloater(const LLSD& seed);
+ virtual ~lggAutoCorrectFloater();
+ BOOL postBuild(void);
+ void setData(void * data);
+ void updateEnabledStuff();
+ void updateNamesList();
+ void updateListControlsEnabled(BOOL selected);
+ void updateItemsList();
+
+
+ LLScrollListCtrl *namesList;
+
+ LLScrollListCtrl *entryList;
+ LLPrefsAdvanced * empanel;
+private:
+ static lggAutoCorrectFloater* sInstance;
+ static JCInvDropTarget* mNotecardDropTarget;
+ static void onBoxCommitEnabled(LLUICtrl* caller, void* user_data);
+ static void onEntrySettingChange(LLUICtrl* caller, void* user_data);
+ static void onSelectName(LLUICtrl* caller, void* user_data);
+ static void ResponseItemDrop(LLViewerInventoryItem* item);
+ static void onNotecardLoadComplete(LLVFS *vfs,const LLUUID& asset_uuid,LLAssetType::EType type,void* user_data, S32 status, LLExtStat ext_status);
+
+
+ static void deleteEntry(void* data);
+ static void addEntry(void* data);
+ static void exportList(void* data);
+ static void removeList(void* data);
+ static void loadList(void* data);
+
+};
+
+
+
+JCInvDropTarget * lggAutoCorrectFloater::mNotecardDropTarget;
+lggAutoCorrectFloater* lggAutoCorrectFloater::sInstance;
+
+lggAutoCorrectFloater::~lggAutoCorrectFloater()
+{
+ sInstance = NULL;
+ delete mNotecardDropTarget;
+ mNotecardDropTarget = NULL;
+}
+lggAutoCorrectFloater::lggAutoCorrectFloater(const LLSD& seed)
+{
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_autocorrect.xml");
+
+ if (getRect().mLeft == 0
+ && getRect().mBottom == 0)
+ {
+ center();
+ }
+ if(sInstance)delete sInstance;
+ sInstance = this;
+
+}
+
+BOOL lggAutoCorrectFloater::postBuild(void)
+{
+
+ namesList = getChild("em_ac_list_name");
+ entryList = getChild("em_ac_list_entry");
+
+ childSetCommitCallback("em_ac_enable",onBoxCommitEnabled);
+
+ childSetCommitCallback("em_ac_list_enabled",onEntrySettingChange);
+ childSetCommitCallback("em_ac_list_show",onEntrySettingChange);
+ childSetCommitCallback("em_ac_list_style",onEntrySettingChange);
+ childSetCommitCallback("em_ac_priority",onEntrySettingChange);
+
+
+
+ updateEnabledStuff();
+ updateNamesList();
+
+
+ namesList->setCommitOnSelectionChange(TRUE);
+ childSetCommitCallback("em_ac_list_name", onSelectName, this);
+
+ childSetAction("em_ac_deletelist",removeList,this);
+ childSetAction("em_ac_rementry",deleteEntry,this);
+ childSetAction("em_ac_exportlist",exportList,this);
+ childSetAction("em_ac_addentry",addEntry,this);
+ childSetAction("em_ac_loadlist",loadList,this);
+
+ LLView *target_view = getChild("em_ac_notecard_target");
+ if(target_view)
+ {
+ if (mNotecardDropTarget)//shouldn't happen
+ {
+ delete mNotecardDropTarget;
+ }
+ mNotecardDropTarget = new JCInvDropTarget("drop target", target_view->getRect(), ResponseItemDrop);//, mAvatarID);
+ addChild(mNotecardDropTarget);
+ }
+ return true;
+}
+void lggAutoCorrectFloater::ResponseItemDrop(LLViewerInventoryItem* item)
+{
+ if(item)
+ {
+ if (gAgent.allowOperation(PERM_COPY, item->getPermissions(),GP_OBJECT_MANIPULATE) || gAgent.isGodlike())
+ {
+ if(!item->getAssetUUID().isNull())
+ gAssetStorage->getInvItemAsset(LLHost::invalid,
+ gAgent.getID(),
+ gAgent.getSessionID(),
+ item->getPermissions().getOwner(),
+ LLUUID::null,
+ item->getUUID(),
+ item->getAssetUUID(),
+ item->getType(),
+ &onNotecardLoadComplete,
+ (void*)item,
+ TRUE);
+ gSavedSettings.setBOOL("EmeraldEnableAutoCorrect",true);
+
+ }
+ }
+}
+void lggAutoCorrectFloater::onNotecardLoadComplete(LLVFS *vfs,const LLUUID& asset_uuid,LLAssetType::EType type,void* user_data, S32 status, LLExtStat ext_status)
+{
+ if(status == LL_ERR_NOERR)
+ {
+ S32 size = vfs->getSize(asset_uuid, type);
+ U8* buffer = new U8[size];
+ vfs->getData(asset_uuid, type, buffer, 0, size);
+
+ if(type == LLAssetType::AT_NOTECARD)
+ {
+ LLViewerTextEditor* edit = new LLViewerTextEditor("",LLRect(0,0,0,0),S32_MAX,"");
+ if(edit->importBuffer((char*)buffer, (S32)size))
+ {
+ llinfos << "decode success" << llendl;
+ std::string card = edit->getText();
+ edit->die();
+ LLSD info;
+ std::istringstream ins; // Declare an input string stream.
+ ins.str(card); // Specify string to read.
+
+ LLSDSerialize::fromXML(info,ins);
+
+ LGGAutoCorrect::getInstance()->addCorrectionList(info);
+ llinfos << "read success" << llendl;
+ sInstance->updateEnabledStuff();
+ }
+ else
+ {
+ llinfos << "decode error" << llendl;
+ }
+ }
+ }
+ else
+ {
+ llinfos << "read error" << llendl;
+ }
+}
+
+
+void lggAutoCorrectFloater::onSelectName(LLUICtrl* ctrl, void* user_data)
+{
+ sInstance->updateItemsList();
+}
+void lggAutoCorrectFloater::updateItemsList()
+{
+ entryList->deleteAllItems();
+ if((namesList->getAllSelected().size())<=0)
+ {
+
+ updateListControlsEnabled(FALSE);
+ return;
+ }
+
+ updateListControlsEnabled(TRUE);
+ std::string listName= namesList->getFirstSelected()->getColumn(0)->getValue().asString();
+
+ LLSD listData = LGGAutoCorrect::getInstance()->getAutoCorrectEntries(listName);
+ childSetValue("em_ac_list_enabled",listData["enabled"].asBoolean());
+ childSetValue("em_ac_list_style",listData["wordStyle"].asBoolean());
+ childSetValue("em_ac_list_show",listData["announce"].asBoolean());
+ childSetValue("em_ac_text_name",listName);
+ childSetValue("em_ac_text_author",listData["author"]);
+ childSetValue("em_ac_priority",listData["priority"]);
+ static S32 *countAuto= rebind_llcontrol("EmeraldAutoCorrectCount", &gSavedSettings, true);
+ childSetValue("em_ac_stats",*countAuto);
+
+ LLSD autoCorrects = listData["data"];
+ LLSD::map_const_iterator loc_it = autoCorrects.beginMap();
+ LLSD::map_const_iterator loc_end = autoCorrects.endMap();
+ for ( ; loc_it != loc_end; ++loc_it)
+ {
+ const std::string& wrong = (*loc_it).first;
+ const std::string& right = (*loc_it).second;
+
+ //std::string lentry(wrong+"=>"+right);
+
+ LLSD element;
+ element["id"] = wrong;
+ LLSD& s_column = element["columns"][0];
+ s_column["column"] = "Search";
+ s_column["value"] = wrong;
+ s_column["font"] = "SANSSERIF";
+ LLSD& r_column = element["columns"][1];
+ r_column["column"] = "Replace";
+ r_column["value"] = right;
+ r_column["font"] = "SANSSERIF";
+
+ entryList->addElement(element, ADD_BOTTOM);
+ }
+
+}
+void lggAutoCorrectFloater::updateNamesList()
+{
+ namesList->deleteAllItems();
+ static BOOL *enabledd = rebind_llcontrol("EmeraldEnableAutoCorrect", &gSavedSettings, true);
+ if(!(*enabledd))
+ {
+ updateItemsList();
+ return;
+ }
+ static S32 *countAuto= rebind_llcontrol("EmeraldAutoCorrectCount", &gSavedSettings, true);
+ childSetValue("em_ac_stats",*countAuto);
+ LLSD autoCorrects = LGGAutoCorrect::getInstance()->getAutoCorrects();
+ LLSD::map_const_iterator loc_it = autoCorrects.beginMap();
+ LLSD::map_const_iterator loc_end = autoCorrects.endMap();
+ for ( ; loc_it != loc_end; ++loc_it)
+ {
+ const std::string& listName = (*loc_it).first;
+
+ LLSD element;
+ element["id"] = listName;
+ LLSD& friend_column = element["columns"][0];
+ friend_column["column"] = "Entries";
+ friend_column["value"] = listName;
+ friend_column["font"] = "SANSSERIF";
+ const LLSD& loc_map = (*loc_it).second;
+ if(loc_map["enabled"].asBoolean())
+ friend_column["font-style"] = "BOLD";
+ else
+ friend_column["font-style"] = "NORMAL";
+ if(namesList)
+ namesList->addElement(element, ADD_BOTTOM);
+ }
+ updateItemsList();
+}
+void lggAutoCorrectFloater::updateListControlsEnabled(BOOL selected)
+{
+
+ childSetEnabled("em_ac_text1",selected);
+ childSetEnabled("em_ac_text2",selected);
+ childSetEnabled("em_ac_text_name",selected);
+ childSetEnabled("em_ac_text_author",selected);
+ childSetEnabled("em_ac_list_enabled",selected);
+ childSetEnabled("em_ac_list_show",selected);
+ childSetEnabled("em_ac_list_style",selected);
+ childSetEnabled("em_ac_deletelist",selected);
+ childSetEnabled("em_ac_exportlist",selected);
+ childSetEnabled("em_ac_addentry",selected);
+ childSetEnabled("em_ac_rementry",selected);
+ childSetEnabled("em_ac_priority",selected);
+
+}
+void lggAutoCorrectFloater::updateEnabledStuff()
+{
+ static BOOL *enabledd = rebind_llcontrol("EmeraldEnableAutoCorrect", &gSavedSettings, true);
+ if(!(*enabledd))
+ {
+ getChild("em_ac_enable")->setEnabledColor(LLColor4(1.0f,0.0f,0.0f,1.0f));
+ }else
+ {
+ getChild("em_ac_enable")->setEnabledColor(LLUI::sColorsGroup->getColor( "LabelTextColor" ));
+ }
+
+ childSetEnabled("em_ac_list_name",*enabledd);
+ childSetEnabled("em_ac_list_entry",*enabledd);
+ updateListControlsEnabled(*enabledd);
+ updateNamesList();
+ LGGAutoCorrect::getInstance()->save();
+
+}
+void lggAutoCorrectFloater::setData(void * data)
+{
+ empanel = (LLPrefsAdvanced*)data;
+}
+void lggAutoCorrectFloater::onBoxCommitEnabled(LLUICtrl* caller, void* user_data)
+{
+ sInstance->updateEnabledStuff();
+}
+void lggAutoCorrectFloater::onEntrySettingChange(LLUICtrl* caller, void* user_data)
+{
+ std::string listName= sInstance->namesList->getFirstSelected()->getColumn(0)->getValue().asString();
+ LGGAutoCorrect::getInstance()->setListEnabled(listName,sInstance->childGetValue("em_ac_list_enabled").asBoolean());
+ LGGAutoCorrect::getInstance()->setListAnnounceeState(listName,sInstance->childGetValue("em_ac_list_show").asBoolean());
+ LGGAutoCorrect::getInstance()->setListStyle(listName,sInstance->childGetValue("em_ac_list_style").asBoolean());
+ LGGAutoCorrect::getInstance()->setListPriority(listName,sInstance->childGetValue("em_ac_priority").asInteger());
+
+ //sInstance->updateEnabledStuff();
+ sInstance->updateItemsList();
+ LGGAutoCorrect::getInstance()->save();
+}
+void lggAutoCorrectFloater::deleteEntry(void* data)
+{
+ std::string listName= sInstance->namesList->getFirstSelected()->getColumn(0)->getValue().asString();
+
+ if((sInstance->entryList->getAllSelected().size())>0)
+ {
+ std::string wrong= sInstance->entryList->getFirstSelected()->getColumn(0)->getValue().asString();
+ LGGAutoCorrect::getInstance()->removeEntryFromList(wrong,listName);
+ sInstance->updateItemsList();
+ LGGAutoCorrect::getInstance()->save();
+ }
+}
+void lggAutoCorrectFloater::loadList(void* data)
+{
+ LLFilePicker& picker = LLFilePicker::instance();
+
+ if(!picker.getOpenFile( LLFilePicker::FFLOAD_XML) )
+ {return;
+ }
+ llifstream file;
+ file.open(picker.getFirstFile().c_str());
+ LLSD blankllsd;
+ if (file.is_open())
+ {
+ LLSDSerialize::fromXMLDocument(blankllsd, file);
+ }
+ file.close();
+ gSavedSettings.setBOOL("EmeraldEnableAutoCorrect",true);
+ LGGAutoCorrect::getInstance()->addCorrectionList(blankllsd);
+ sInstance->updateEnabledStuff();
+}
+void lggAutoCorrectFloater::removeList(void* data)
+{
+ std::string listName= sInstance->namesList->getFirstSelected()->getColumn(0)->getValue().asString();
+ LGGAutoCorrect::getInstance()->removeCorrectionList(listName);
+ sInstance->updateEnabledStuff();
+
+}
+void lggAutoCorrectFloater::exportList(void *data)
+{
+ std::string listName= sInstance->namesList->getFirstSelected()->getColumn(0)->getValue().asString();
+
+ LLFilePicker& picker = LLFilePicker::instance();
+
+ if(!picker.getSaveFile( LLFilePicker::FFSAVE_XML) )
+ {return;
+ }
+ llofstream file;
+ file.open(picker.getFirstFile().c_str());
+ LLSDSerialize::toPrettyXML(LGGAutoCorrect::getInstance()->exportList(listName), file);
+ file.close();
+}
+void lggAutoCorrectFloater::addEntry(void* data)
+{
+ std::string listName= sInstance->namesList->getFirstSelected()->getColumn(0)->getValue().asString();
+ LLChat chat;
+ chat.mText = "To add an entry, please type in chat \""+gSavedSettings.getString("EmeraldCmdLineAutocorrect")+" "+listName+"|wrongWord|rightWord\"";
+ chat.mSourceType = CHAT_SOURCE_SYSTEM;
+ LLFloaterChat::addChat(chat, FALSE, FALSE);
+}
+
+void lggAutoCorrectFloaterStart::show(BOOL showin,void * data)
+{
+ if(showin)
+ {
+ lggAutoCorrectFloater* dic_floater = lggAutoCorrectFloater::showInstance();
+ dic_floater->setData(data);
+ }
+}
diff --git a/linden/indra/newview/lggautocorrectfloater.h b/linden/indra/newview/lggautocorrectfloater.h
new file mode 100644
index 0000000..fbb7abb
--- /dev/null
+++ b/linden/indra/newview/lggautocorrectfloater.h
@@ -0,0 +1,40 @@
+/* Copyright (c) 2009
+*
+* Greg Hendrickson (LordGregGreg Back). All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or
+* without modification, are permitted provided that the following
+* conditions are met:
+*
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above
+* copyright notice, this list of conditions and the following
+* disclaimer in the documentation and/or other materials provided
+* with the distribution.
+* 3. Neither the name Modular Systems nor the names of its contributors
+* may be used to endorse or promote products derived from this
+* software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+* THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#include "llview.h"
+#include "llviewerinventory.h"
+
+
+class lggAutoCorrectFloaterStart
+{
+ public:
+ static void show( BOOL showw , void * data);
+};
+
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 3c4af02..a3efa38 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -38,10 +38,81 @@
#include "llviewermenu.h"
#include "llvoavatar.h"
#include "lgghunspell_wrapper.h"
+#include "lggautocorrectfloater.h"
#include "llcombobox.h"
#include "lluictrlfactory.h"
+////////begin drop utility/////////////
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class JCInvDropTarget
+//
+// This handy class is a simple way to drop something on another
+// view. It handles drop events, always setting itself to the size of
+// its parent.
+//
+// altered to support a callback so i can slap it in things and it just return the item to a func of my choice
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
+
+JCInvDropTarget::JCInvDropTarget(const std::string& name, const LLRect& rect,
+ void (*callback)(LLViewerInventoryItem*)) :
+LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL),
+mDownCallback(callback)
+{
+}
+
+JCInvDropTarget::~JCInvDropTarget()
+{
+}
+
+void JCInvDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
+{
+ llinfos << "JCInvDropTarget::doDrop()" << llendl;
+}
+
+BOOL JCInvDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg)
+{
+ BOOL handled = FALSE;
+ if(getParent())
+ {
+ handled = TRUE;
+ // check the type
+ //switch(cargo_type)
+ //{
+ //case DAD_ANIMATION:
+ //{
+ LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
+ if(gInventory.getItem(inv_item->getUUID()))
+ {
+ *accept = ACCEPT_YES_COPY_SINGLE;
+ if(drop)
+ {
+ //printchat("accepted");
+ mDownCallback(inv_item);
+ }
+ }
+ else
+ {
+ *accept = ACCEPT_NO;
+ }
+ // break;
+ //}
+ //default:
+ // *accept = ACCEPT_NO;
+ // break;
+ //}
+ }
+ return handled;
+}
+////////end drop utility///////////////
+
LLPrefsAdvanced* LLPrefsAdvanced::sInstance;
LLPrefsAdvanced::LLPrefsAdvanced()
@@ -118,6 +189,7 @@ BOOL LLPrefsAdvanced::postBuild()
getChild("EmSpell_Add")->setClickedCallback(onSpellAdd, this);
getChild("EmSpell_Remove")->setClickedCallback(onSpellRemove, this);
+ getChild("ac_button")->setClickedCallback(onAutoCorrectButton,this);
initHelpBtn("EmeraldHelp_SpellCheck", "EmeraldHelp_SpellCheck");
@@ -338,4 +410,9 @@ void LLPrefsAdvanced::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
}
//LLPanelEmerald* panel = (LLPanelEmerald*)userdata;
//if(panel)panel->refresh();
+}
+
+void LLPrefsAdvanced::onAutoCorrectButton(void * data)
+{
+ lggAutoCorrectFloaterStart::show(TRUE,data);
}
\ No newline at end of file
diff --git a/linden/indra/newview/llprefsadvanced.h b/linden/indra/newview/llprefsadvanced.h
index f5fba10..6a15fba 100644
--- a/linden/indra/newview/llprefsadvanced.h
+++ b/linden/indra/newview/llprefsadvanced.h
@@ -32,6 +32,26 @@
#define LLPREFSADVANCED_H
#include "llpanel.h"
+#include "llviewerinventory.h"
+
+class JCInvDropTarget : public LLView
+{
+public:
+ JCInvDropTarget(const std::string& name, const LLRect& rect, void (*callback)(LLViewerInventoryItem*));
+ ~JCInvDropTarget();
+
+ void doDrop(EDragAndDropType cargo_type, void* cargo_data);
+
+ //
+ // LLView functionality
+ virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg);
+protected:
+ void (*mDownCallback)(LLViewerInventoryItem*);
+};
class LLPrefsAdvanced : public LLPanel
{
@@ -60,6 +80,7 @@ private:
static void onSpellGetMore(void* data);
static void onSpellEditCustom(void* data);
static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
+ static void onAutoCorrectButton(void * data);
protected:
void initHelpBtn(const std::string& name, const std::string& xml_alert);
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index a514e53..b76c5be 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -204,6 +204,8 @@
#include "hippoGridManager.h"
#include "hippoLimits.h"
+
+#include "lggautocorrect.h"
//
// exported globals
//
@@ -403,6 +405,8 @@ bool idle_startup()
glggHunSpell->initSettings();
+ LGGAutoCorrect::getInstance()->loadFromDisk();
+
// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.1d
if ( (gSavedSettings.controlExists(RLV_SETTING_MAIN)) && (gSavedSettings.getBOOL(RLV_SETTING_MAIN)) )
rlv_handler_t::setEnabled(TRUE);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_autocorrect.xml b/linden/indra/newview/skins/default/xui/en-us/floater_autocorrect.xml
new file mode 100644
index 0000000..d11b5ed
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_autocorrect.xml
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+ Drop a Notecard here
+ to load from it.
+
+
+ List Name List Entries
+
+
+
+
+
+ List Name
+ Author:
+
+ Author Name
+
+
+
+
+
+
+
+
+
+
+ Words automatically corrected:
+
+ Count
+
+
+
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index d0a0c21..bf261c6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -270,6 +270,8 @@
To spellcheck, right click a misspelled word
(red or not) and click on its replacement
+
--
cgit v1.1
From 179461237035e443f80bacf1f3c58dac41b9f089 Mon Sep 17 00:00:00 2001
From: Patrick Sapinski
Date: Tue, 24 Aug 2010 21:20:22 -0400
Subject: added missing help notification for chatbar_as_cmdline
---
.../newview/skins/default/xui/en-us/notifications.xml | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 40b05c2..4bb2274 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7053,10 +7053,19 @@ Note: To comply with the Second Life Terms of Service, Imprudence did not downlo
+ icon="alertmodal.tga"
+ label="Emerald Help"
+ name="EmeraldHelp_CmdLine"
+ type="alertmodal">
+Various Options For Command Line features.
+To use a command, type it in your chat bar (Local chat) and press enter.
+
+
+
To Spell Check a word, right click on it and choose its replacement.
You may choose a base dictionary which stores the language style and basic words
You may also choose to install other word lists by choosing them from the list and "Install"
--
cgit v1.1
From fa642f9a3806a0c6e69bf27e37a4d3d4d99009ca Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 30 Aug 2010 19:27:49 -0700
Subject: Added missing chatbar_as_cmdline.h file
---
linden/indra/newview/chatbar_as_cmdline.h | 36 +++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 linden/indra/newview/chatbar_as_cmdline.h
(limited to 'linden/indra')
diff --git a/linden/indra/newview/chatbar_as_cmdline.h b/linden/indra/newview/chatbar_as_cmdline.h
new file mode 100644
index 0000000..01abfd0
--- /dev/null
+++ b/linden/indra/newview/chatbar_as_cmdline.h
@@ -0,0 +1,36 @@
+/* Copyright (c) 2009
+ *
+ * Modular Systems All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * 3. Neither the name Modular Systems Ltd nor the names of its contributors
+ * may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS “AS IS”
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llchatbar.h"
+
+bool cmd_line_chat(std::string revised_text, EChatType type);
--
cgit v1.1
From e0e982b0f96ea5a3e8e7bff00ea1004f9c349ccc Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 30 Aug 2010 19:55:44 -0700
Subject: Fixed bad merge in lltexteditor.cpp
---
linden/indra/llui/lltexteditor.cpp | 77 +++++++++++---------------------------
1 file changed, 21 insertions(+), 56 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index be6d3ef..51f7ad6 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -5007,69 +5007,35 @@ BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end, std::
{
S32 strpos, strpos2;
- url = line.substr(*begin,*end - *begin);
- std::string slurlID = "slurl.com/secondlife/";
- strpos = url.find(slurlID);
-
- if (strpos < 0)
- {
- slurlID="maps.secondlife.com/secondlife/";
- strpos = url.find(slurlID);
- }
-
- if (strpos < 0)
+ // Is this try here still needed considering the changes to LLTextEditor::findHTMLToken? - MC
+ try
{
- slurlID="secondlife://";
+ url = line.substr(*begin,*end - *begin);
+ std::string slurlID = "slurl.com/secondlife/";
strpos = url.find(slurlID);
- }
-
- if (strpos < 0)
- {
- slurlID="sl://";
- strpos = url.find(slurlID);
- }
-
- if (strpos >= 0)
- {
- strpos+=slurlID.length();
- while ( ( strpos2=url.find("/",strpos) ) == -1 )
- {
- if ((*end+2) >= (S32)line.length() || line.substr(*end,1) != " " )
- {
- matched=FALSE;
- break;
- }
-
- strpos = (*end + 1) - *begin;
-
- *end = findHTMLToken(line,(*begin + strpos),FALSE);
- url = line.substr(*begin,*end - *begin);
- }
- }
-
if (strpos < 0)
- {
+ {
slurlID="maps.secondlife.com/secondlife/";
strpos = url.find(slurlID);
}
-
- if (strpos < 0)
- {
+
+ if (strpos < 0)
+ {
slurlID="secondlife://";
strpos = url.find(slurlID);
- }
-
- if (strpos < 0)
- {
+ }
+
+ if (strpos < 0)
+ {
slurlID="sl://";
strpos = url.find(slurlID);
- }
-
- if (strpos >= 0)
- {
+ }
+
+ if (strpos >= 0)
+ {
strpos+=slurlID.length();
-
+
while ( ( strpos2=url.find("/",strpos) ) == -1 )
{
if ((*end+2) >= (S32)line.length() || line.substr(*end,1) != " " )
@@ -5077,19 +5043,18 @@ BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end, std::
matched=FALSE;
break;
}
-
+
strpos = (*end + 1) - *begin;
-
+
*end = findHTMLToken(line,(*begin + strpos),FALSE);
url = line.substr(*begin,*end - *begin);
}
- }
-
+ }
}
catch ( std::out_of_range outOfRange )
{
- LL_WARNS("TextEditor") << "got std::out_of_range exception \"" << line << "\"" << LL_ENDL;
+ llwarns << "got std::out_of_range exception \"" << line << "\"" << llendl;
}
}
--
cgit v1.1
From 128a12f22fb053ebfa21fb7366a84543db1342ca Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 30 Aug 2010 21:14:50 -0700
Subject: Fixed linking error with chat as command line
---
linden/indra/newview/floaterao.cpp | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/floaterao.cpp b/linden/indra/newview/floaterao.cpp
index 4214e21..cfad0fb 100644
--- a/linden/indra/newview/floaterao.cpp
+++ b/linden/indra/newview/floaterao.cpp
@@ -19,8 +19,7 @@
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "llspinctrl.h"
-// Uncomment and use instead if we ever add the chatbar as a command line - MC
-//#include "chatbar_as_cmdline.h"
+#include "chatbar_as_cmdline.h"
#include "llfloaterchat.h"
#include "llfirstuse.h"
@@ -35,15 +34,7 @@
#include "llboost.h"
#include
-// Uncomment and use instead if we ever add the chatbar as a command line - MC
-//void cmdline_printchat(std::string message);
-void cmdline_printchat(std::string message)
-{
- LLChat chat;
- chat.mText = message;
- chat.mSourceType = CHAT_SOURCE_SYSTEM;
- LLFloaterChat::addChat(chat, FALSE, FALSE);
-}
+void cmdline_printchat(std::string message);
AOInvTimer* gAOInvTimer = NULL;
--
cgit v1.1
From 8b4047234b884929b0db9941023b2b642d16053a Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 31 Aug 2010 12:39:58 -0700
Subject: Changed dictionary links from modularsystems.sl to
imprudenceviewer.org
---
linden/indra/newview/lggdicdownload.cpp | 4 ++--
linden/indra/newview/lgghunspell_wrapper.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/lggdicdownload.cpp b/linden/indra/newview/lggdicdownload.cpp
index 7011312..bd383e2 100644
--- a/linden/indra/newview/lggdicdownload.cpp
+++ b/linden/indra/newview/lggdicdownload.cpp
@@ -128,8 +128,8 @@ void lggDicDownloadFloater::onClickDownload(void* data)
{
index--;
std::string newDict(self->sNames[index]);
- LLHTTPClient::get("http://www.modularsystems.sl/app/dics/"+newDict+".aff", new EmeraldDicDownloader(self,newDict+".aff"));
- LLHTTPClient::get("http://www.modularsystems.sl/app/dics/"+newDict+".dic", new EmeraldDicDownloader(NULL,newDict+".dic"));
+ LLHTTPClient::get("http://www.imprudenceviewer.org/app/dics/"+newDict+".aff", new EmeraldDicDownloader(self,newDict+".aff"));
+ LLHTTPClient::get("http://www.imprudenceviewer.org/app/dics/"+newDict+".dic", new EmeraldDicDownloader(NULL,newDict+".dic"));
LLButton* butt = self->getChild("Emerald_dic_download");
if(butt)
diff --git a/linden/indra/newview/lgghunspell_wrapper.cpp b/linden/indra/newview/lgghunspell_wrapper.cpp
index 36ad94a..ff5a3d0 100644
--- a/linden/indra/newview/lgghunspell_wrapper.cpp
+++ b/linden/indra/newview/lgghunspell_wrapper.cpp
@@ -847,7 +847,7 @@ void lggHunSpell_Wrapper::getMoreButton(void * data)
{
std::vector shortNames;
std::vector longNames;
- LLSD response = LLHTTPClient::blockingGet("http://www.modularsystems.sl/app/dics/dic_list.xml");
+ LLSD response = LLHTTPClient::blockingGet("http://www.imprudenceviewer.org/app/dics/dic_list.xml");
if(response.has("body"))
{
const LLSD &dict_list = response["body"];
--
cgit v1.1
From 3e1f8f058a32f00320e560480dc93b62a3ce7619 Mon Sep 17 00:00:00 2001
From: Patrick Sapinski
Date: Wed, 1 Sep 2010 00:52:51 -0400
Subject: automatic translation feature
---
linden/indra/newview/llfloaterchat.cpp | 22 +++++++
linden/indra/newview/llfloaterchat.h | 2 +
linden/indra/newview/llprefschat.cpp | 11 ++++
linden/indra/newview/llviewercontrol.cpp | 31 ++++++++-
.../default/xui/en-us/floater_chat_history.xml | 15 +++--
.../default/xui/en-us/panel_preferences_chat.xml | 75 ++++++++++++++++++++++
6 files changed, 148 insertions(+), 8 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index b14930b..f7ff3f9 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -108,6 +108,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_chat_history.xml",&getFactoryMap(),no_open);
childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
+ childSetCommitCallback("translate chat",onClickToggleTranslateChat,this);
+ childSetValue("translate chat", gSavedSettings.getBOOL("TranslateChat"));
childSetVisible("Chat History Editor with mute",FALSE);
childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
setDefaultBtn("Chat");
@@ -429,6 +431,26 @@ void LLFloaterChat::onClickToggleShowMute(LLUICtrl* caller, void *data)
}
}
+// Update the "TranslateChat" pref after "translate chat" checkbox is toggled in
+// the "Local Chat" floater.
+//static
+void LLFloaterChat::onClickToggleTranslateChat(LLUICtrl* caller, void *data)
+{
+ LLFloaterChat* floater = (LLFloaterChat*)data;
+
+ BOOL translate_chat = floater->getChild("translate chat")->get();
+ gSavedSettings.setBOOL("TranslateChat", translate_chat);
+}
+
+// Update the "translate chat" checkbox after the "TranslateChat" pref is set in
+// some other place (e.g. prefs dialog).
+//static
+void LLFloaterChat::updateSettings()
+{
+ BOOL translate_chat = gSavedSettings.getBOOL("TranslateChat");
+ LLFloaterChat::getInstance(LLSD())->getChild("translate chat")->set(translate_chat);
+}
+
// Put a line of chat in all the right places
void LLFloaterChat::addChat(const LLChat& chat,
BOOL from_instant_message,
diff --git a/linden/indra/newview/llfloaterchat.h b/linden/indra/newview/llfloaterchat.h
index e2bb54c..f894675 100644
--- a/linden/indra/newview/llfloaterchat.h
+++ b/linden/indra/newview/llfloaterchat.h
@@ -65,6 +65,7 @@ public:
virtual void onVisibilityChange(BOOL cur_visibility);
virtual void setMinimized(BOOL);
void updateConsoleVisibility();
+ void updateSettings();
static void setHistoryCursorAndScrollToEnd();
@@ -77,6 +78,7 @@ public:
static void onClickMute(void *data);
static void onClickToggleShowMute(LLUICtrl* caller, void *data);
+ static void onClickToggleTranslateChat(LLUICtrl* caller, void *data);
static void onClickToggleActiveSpeakers(void* userdata);
static void chatFromLogFile(LLLogChat::ELogLineType type,std::string line, void* userdata);
static void loadHistory();
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 2e08cac..b4614b8 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -76,6 +76,8 @@ private:
BOOL mChatChannel;
F32 mConsoleOpacity;
F32 mBubbleOpacity;
+ std::string mTranslateLanguage;
+ BOOL mTranslateChat;
};
LLPrefsChatImpl::LLPrefsChatImpl()
@@ -110,6 +112,8 @@ LLPrefsChatImpl::LLPrefsChatImpl()
childSetValue("toggle_channel_control", gSavedSettings.getBOOL("ChatChannelSelect"));
childSetValue("console_opacity", gSavedSettings.getF32("ConsoleBackgroundOpacity"));
childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
+ childSetValue("translate_language_combobox", gSavedSettings.getString("TranslateLanguage"));
+ childSetValue("translate_chat", gSavedSettings.getBOOL("TranslateChat"));
}
void LLPrefsChatImpl::refreshValues()
@@ -137,6 +141,8 @@ void LLPrefsChatImpl::refreshValues()
mChatChannel = gSavedSettings.getBOOL("ChatChannelSelect");
mConsoleOpacity = gSavedSettings.getF32("ConsoleBackgroundOpacity");
mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
+ mTranslateLanguage = gSavedSettings.getString("TranslateLanguage");
+ mTranslateChat = gSavedSettings.getBOOL("TranslateChat");
}
void LLPrefsChatImpl::cancel()
@@ -163,6 +169,8 @@ void LLPrefsChatImpl::cancel()
gSavedSettings.setBOOL("ChatChannelSelect", mChatChannel);
gSavedSettings.setF32("ConsoleBackgroundOpacity", mConsoleOpacity);
gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);
+ gSavedSettings.setString("TranslateLanguage", mTranslateLanguage);
+ gSavedSettings.setBOOL("TranslateChat", mTranslateChat);
}
void LLPrefsChatImpl::apply()
@@ -194,6 +202,9 @@ void LLPrefsChatImpl::apply()
gSavedSettings.setF32("ConsoleBackgroundOpacity", childGetValue("console_opacity").asReal());
gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal());
+ gSavedSettings.setString("TranslateLanguage", childGetValue("translate_language_combobox"));
+ gSavedSettings.setBOOL("TranslateChat", childGetValue("translate_chat"));
+
BOOL chan_check = childGetValue("toggle_channel_control");
gSavedSettings.setBOOL("ChatChannelSelect", chan_check);
if (mChatChannel != chan_check)
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index e1507d4..a73d0ab 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -71,6 +71,7 @@
#include "llrender.h"
#include "llmediamanager.h"
#include "llslider.h"
+#include "llfloaterchat.h"
#ifdef TOGGLE_HACKED_GODLIKE_VIEWER
@@ -485,6 +486,32 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
return true;
}
+bool handleTranslateChatPrefsChanged(const LLSD& newvalue)
+{
+ LLFloaterChat* floaterp = LLFloaterChat::getInstance();
+
+ if(floaterp)
+ {
+ // update "translate chat" pref in "Local Chat" floater
+ floaterp->updateSettings();
+ }
+ return true;
+}
+
+// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
+bool rlvHandleEnableLegacyNamingChanged(const LLSD& newvalue)
+{
+ rlv_handler_t::fLegacyNaming = newvalue.asBoolean();
+ return true;
+}
+
+bool rlvHandleShowNameTagsChanged(const LLSD& newvalue)
+{
+ RlvSettings::fShowNameTags = newvalue.asBoolean();
+ return true;
+}
+// [/RLVa:KB]
+
bool handleMediaDebugLevelChanged(const LLSD& newvalue)
{
LLMediaManager *mgr = LLMediaManager::getInstance();
@@ -663,7 +690,8 @@ void settings_setup_listeners()
gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));
gSavedSettings.getControl("SliderScrollWheelMultiplier")->getSignal()->connect(boost::bind(&handleSliderScrollWheelMultiplierChanged, _1));
-
+ gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _1));
+
// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
gSavedSettings.getControl(RLV_SETTING_ENABLELEGACYNAMING)->getSignal()->connect(boost::bind(&rlvHandleEnableLegacyNamingChanged, _1));
@@ -751,7 +779,6 @@ template <> eControlType get_control_type(const LLSD& in, LLSD& out)
return TYPE_LLSD;
}
-
#if TEST_CACHED_CONTROL
#define DECL_LLCC(T, V) static LLCachedControl mySetting_##T("TestCachedControl"#T, V)
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 54c146d..2e6fee4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -65,9 +65,9 @@
Control your camera
-
-
@@ -75,10 +75,13 @@
Gestures
-
-
+
+
+
+ Translate Chat:
+
+
+
+ Translate into this language:
+
+
+
+ System Default
+
+
+ English
+
+
+
+
+
+ Dansk (Danish)
+
+
+ Deutsch (German)
+
+
+ Español (Spanish)
+
+
+ Français (French)
+
+
+ Italiano (Italian)
+
+
+ Magyar (Hungarian)
+
+
+ Nederlands (Dutch)
+
+
+ Polski (Polish)
+
+
+ Portugués (Portuguese)
+
+
+ Đ ÑƒÑÑĐºĐ¸Đ¹ (Russian)
+
+
+ TĂ¼rkçe (Turkish)
+
+
+ Đ£ĐºÑ€Đ°Ñ—Đ½ÑÑŒĐºĐ° (Ukrainian)
+
+
+ ä¸æ–‡ (简体) (Chinese)
+
+
+ æ—¥æœ¬èª (Japanese)
+
+
+ í•œêµ́–´ (Korean)
+
+
--
cgit v1.1
From 588e1e67092db54ec813ddf6383b7d4a95459a29 Mon Sep 17 00:00:00 2001
From: Patrick Sapinski
Date: Wed, 1 Sep 2010 00:53:27 -0400
Subject: enabled help button for cmdline
---
linden/indra/newview/llprefsadvanced.cpp | 1 +
1 file changed, 1 insertion(+)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index a3efa38..4a4b299 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -191,6 +191,7 @@ BOOL LLPrefsAdvanced::postBuild()
getChild("ac_button")->setClickedCallback(onAutoCorrectButton,this);
+ initHelpBtn("EmeraldHelp_CmdLine", "EmeraldHelp_CmdLine");
initHelpBtn("EmeraldHelp_SpellCheck", "EmeraldHelp_SpellCheck");
refresh();
--
cgit v1.1
From 3ae1fe5627c48d7136aea5b7b882e493a97ed90c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 1 Sep 2010 07:57:04 -0700
Subject: Fixed function duplication after merge
---
linden/indra/newview/llviewercontrol.cpp | 14 --------------
1 file changed, 14 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index a73d0ab..50224ad 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -498,20 +498,6 @@ bool handleTranslateChatPrefsChanged(const LLSD& newvalue)
return true;
}
-// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
-bool rlvHandleEnableLegacyNamingChanged(const LLSD& newvalue)
-{
- rlv_handler_t::fLegacyNaming = newvalue.asBoolean();
- return true;
-}
-
-bool rlvHandleShowNameTagsChanged(const LLSD& newvalue)
-{
- RlvSettings::fShowNameTags = newvalue.asBoolean();
- return true;
-}
-// [/RLVa:KB]
-
bool handleMediaDebugLevelChanged(const LLSD& newvalue)
{
LLMediaManager *mgr = LLMediaManager::getInstance();
--
cgit v1.1
From 7c0ec207f7095df176ccf34d7ea03bcf52d34899 Mon Sep 17 00:00:00 2001
From: Patrick Sapinski
Date: Wed, 1 Sep 2010 00:54:00 -0400
Subject: increased preference panel size
---
.../newview/skins/default/xui/en-us/floater_preferences.xml | 12 ++++++------
.../skins/default/xui/en-us/panel_preferences_advanced.xml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
index 214db25..5b42e9f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
@@ -1,25 +1,25 @@
-
-
-
-
-
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index bf261c6..b86d1c2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -3,7 +3,7 @@
height="408" label="Advanced" left="102" mouse_opaque="true"
name="advanced_panel" width="517">
-
Rect
Value
- 0
- 85
- 300
- 0
+ 11
+ 459
+ 311
+ 173
PreviewClassifiedRect
@@ -8307,9 +8307,9 @@
Rect
Value
- 0
- 85
- 300
+ 0
+ 530
+ 420
0
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index a7d880e..ce7737d 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -326,6 +326,7 @@ BOOL LLFloaterAnimPreview::postBuild()
seconds_string = llformat(" - %.2f seconds", motionp->getDuration());
setTitle(mFilename + std::string(seconds_string));
+
}
else
{
@@ -371,6 +372,13 @@ BOOL LLFloaterAnimPreview::postBuild()
//-----------------------------------------------------------------------------
LLFloaterAnimPreview::~LLFloaterAnimPreview()
{
+ if (mMotionID.notNull() && mAnimPreview)
+ {
+ mAnimPreview->getDummyAvatar()->deactivateAllMotions();
+ mAnimPreview->getDummyAvatar()->removeMotion(mMotionID);
+ LLKeyframeDataCache::removeKeyframeData(mMotionID);
+ }
+
delete mAnimPreview;
mAnimPreview = NULL;
@@ -389,7 +397,7 @@ void LLFloaterAnimPreview::draw()
if (mMotionID.notNull() && mAnimPreview)
{
- gGL.color3f(1.f, 1.f, 1.f);
+/* gGL.color3f(1.f, 1.f, 1.f);
gGL.getTexUnit(0)->bind(mAnimPreview->getTexture());
@@ -407,7 +415,7 @@ void LLFloaterAnimPreview::draw()
gGL.end();
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-
+*/
LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
if (!avatarp->areAnimationsPaused())
{
@@ -451,7 +459,7 @@ void LLFloaterAnimPreview::resetMotion()
mPauseRequest = NULL;
}
}
-
+/*
//-----------------------------------------------------------------------------
// handleMouseDown()
//-----------------------------------------------------------------------------
@@ -553,7 +561,7 @@ void LLFloaterAnimPreview::onMouseCaptureLost()
{
gViewerWindow->showCursor();
}
-
+*/
//-----------------------------------------------------------------------------
// onBtnPlay()
//-----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llfloateranimpreview.h b/linden/indra/newview/llfloateranimpreview.h
index 639c927..eaab186 100644
--- a/linden/indra/newview/llfloateranimpreview.h
+++ b/linden/indra/newview/llfloateranimpreview.h
@@ -32,7 +32,7 @@
#ifndef LL_LLFLOATERANIMPREVIEW_H
#define LL_LLFLOATERANIMPREVIEW_H
-
+#include "llagent.h"
#include "llfloaternamedesc.h"
#include "lldynamictexture.h"
#include "llcharacter.h"
@@ -55,7 +55,10 @@ public:
void pan(F32 right, F32 up);
virtual BOOL needsUpdate() { return mNeedsUpdate; }
- LLVOAvatar* getDummyAvatar() { return mDummyAvatar; }
+// LLVOAvatar* getDummyAvatar() { return mDummyAvatar; }
+// HACK:don't get a dummy...
+ LLVOAvatar* getDummyAvatar() { return gAgent.getAvatarObject();}
+
protected:
BOOL mNeedsUpdate;
@@ -75,13 +78,13 @@ public:
virtual ~LLFloaterAnimPreview();
BOOL postBuild();
-
+/*
BOOL handleMouseDown(S32 x, S32 y, MASK mask);
BOOL handleMouseUp(S32 x, S32 y, MASK mask);
BOOL handleHover(S32 x, S32 y, MASK mask);
BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
void onMouseCaptureLost();
-
+*/
void refresh();
static void onBtnPlay(void*);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
index 1a7bdb0..e710d41 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
@@ -1,7 +1,7 @@
+ can_resize="false" height="286" min_height="286" min_width="300"
+ name="Animation Preview" rect_control="PreviewAnimRect" title="" width="300">
Name:
--
cgit v1.1
From f15b542c19437670f7f0b6303ec7c259f778c43b Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 30 Aug 2010 14:21:00 +0200
Subject: Henri Beauchamp: polish up of the animation preview when uploading
---
linden/indra/newview/app_settings/settings.xml | 25 +-
linden/indra/newview/llfloateranimpreview.cpp | 459 +++++++++++++++++----
linden/indra/newview/llfloateranimpreview.h | 12 +-
.../xui/en-us/floater_animation_preview.xml | 9 +-
4 files changed, 406 insertions(+), 99 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index b1917ec..7071de2 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -518,6 +518,17 @@
Value
0
+ PreviewAnimInWorld
+
PrivateLookAtTarget
PreviewClassifiedRect
@@ -8307,9 +8318,9 @@
Rect
Value
- 0
- 530
- 420
+ 0
+ 85
+ 300
0
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index ce7737d..da1d5fc 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -162,12 +162,27 @@ BOOL LLFloaterAnimPreview::postBuild()
return FALSE;
}
+ mInWorld = gSavedSettings.getBOOL("PreviewAnimInWorld");
+
childSetCommitCallback("name_form", onCommitName, this);
childSetLabelArg("ok_btn", "[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee());
childSetAction("ok_btn", onBtnOK, this);
setDefaultBtn();
+ if (mInWorld)
+ {
+ r = getRect();
+ translate(0, 230);
+ reshape(r.getWidth(), r.getHeight() - 230);
+ childSetValue("bad_animation_text", getString("in_world"));
+ childShow("bad_animation_text");
+ }
+ else
+ {
+ childHide("bad_animation_text");
+ }
+
mPreviewRect.set(PREVIEW_HPAD,
PREVIEW_TEXTURE_HEIGHT,
getRect().getWidth() - PREVIEW_HPAD,
@@ -209,8 +224,6 @@ BOOL LLFloaterAnimPreview::postBuild()
r.set(r.mRight + PREVIEW_HPAD, y, getRect().getWidth() - PREVIEW_HPAD, y - BTN_HEIGHT);
//childSetCommitCallback("playback_slider", onSliderMove, this);
- childHide("bad_animation_text");
-
//childSetCommitCallback("preview_base_anim", onCommitBaseAnim, this);
//childSetValue("preview_base_anim", "Standing");
@@ -275,7 +288,14 @@ BOOL LLFloaterAnimPreview::postBuild()
// motion will be returned, but it will be in a load-pending state, as this is a new motion
// this motion will not request an asset transfer until next update, so we have a chance to
// load the keyframe data locally
- motionp = (LLKeyframeMotion*)mAnimPreview->getDummyAvatar()->createMotion(mMotionID);
+ if (mInWorld)
+ {
+ motionp = (LLKeyframeMotion*)gAgent.getAvatarObject()->createMotion(mMotionID);
+ }
+ else
+ {
+ motionp = (LLKeyframeMotion*)mAnimPreview->getDummyAvatar()->createMotion(mMotionID);
+ }
// create data buffer for keyframe initialization
S32 buffer_size = loaderp->getOutputSize();
@@ -293,24 +313,30 @@ BOOL LLFloaterAnimPreview::postBuild()
if (success)
{
setAnimCallbacks() ;
-
- const LLBBoxLocal &pelvis_bbox = motionp->getPelvisBBox();
- LLVector3 temp = pelvis_bbox.getCenter();
- // only consider XY?
- //temp.mV[VZ] = 0.f;
- F32 pelvis_offset = temp.magVec();
+ if (!mInWorld)
+ {
+ const LLBBoxLocal &pelvis_bbox = motionp->getPelvisBBox();
- temp = pelvis_bbox.getExtent();
- //temp.mV[VZ] = 0.f;
- F32 pelvis_max_displacement = pelvis_offset + (temp.magVec() * 0.5f) + 1.f;
-
- F32 camera_zoom = LLViewerCamera::getInstance()->getDefaultFOV() / (2.f * atan(pelvis_max_displacement / PREVIEW_CAMERA_DISTANCE));
-
- mAnimPreview->setZoom(camera_zoom);
+ LLVector3 temp = pelvis_bbox.getCenter();
+ // only consider XY?
+ //temp.mV[VZ] = 0.f;
+ F32 pelvis_offset = temp.magVec();
+
+ temp = pelvis_bbox.getExtent();
+ //temp.mV[VZ] = 0.f;
+ F32 pelvis_max_displacement = pelvis_offset + (temp.magVec() * 0.5f) + 1.f;
+
+ F32 camera_zoom = LLViewerCamera::getInstance()->getDefaultFOV() / (2.f * atan(pelvis_max_displacement / PREVIEW_CAMERA_DISTANCE));
+
+ mAnimPreview->setZoom(camera_zoom);
+ }
motionp->setName(childGetValue("name_form").asString());
- mAnimPreview->getDummyAvatar()->startMotion(mMotionID);
+ if (!mInWorld)
+ {
+ mAnimPreview->getDummyAvatar()->startMotion(mMotionID);
+ }
childSetMinValue("playback_slider", 0.0);
childSetMaxValue("playback_slider", 1.0);
@@ -326,7 +352,6 @@ BOOL LLFloaterAnimPreview::postBuild()
seconds_string = llformat(" - %.2f seconds", motionp->getDuration());
setTitle(mFilename + std::string(seconds_string));
-
}
else
{
@@ -372,13 +397,26 @@ BOOL LLFloaterAnimPreview::postBuild()
//-----------------------------------------------------------------------------
LLFloaterAnimPreview::~LLFloaterAnimPreview()
{
- if (mMotionID.notNull() && mAnimPreview)
+ if (mInWorld)
{
- mAnimPreview->getDummyAvatar()->deactivateAllMotions();
- mAnimPreview->getDummyAvatar()->removeMotion(mMotionID);
- LLKeyframeDataCache::removeKeyframeData(mMotionID);
+ LLVOAvatar* avatarp = gAgent.getAvatarObject();
+ if (avatarp)
+ {
+ if (mMotionID.notNull())
+ {
+ avatarp->stopMotion(mMotionID, TRUE);
+ avatarp->removeMotion(mMotionID);
+ }
+ avatarp->deactivateAllMotions();
+ avatarp->startMotion(ANIM_AGENT_HEAD_ROT);
+ avatarp->startMotion(ANIM_AGENT_EYE);
+ avatarp->startMotion(ANIM_AGENT_BODY_NOISE);
+ avatarp->startMotion(ANIM_AGENT_BREATHE_ROT);
+ avatarp->startMotion(ANIM_AGENT_HAND_MOTION);
+ avatarp->startMotion(ANIM_AGENT_PELVIS_FIX);
+ avatarp->startMotion(ANIM_AGENT_STAND, BASE_ANIM_TIME_OFFSET);
+ }
}
-
delete mAnimPreview;
mAnimPreview = NULL;
@@ -395,9 +433,9 @@ void LLFloaterAnimPreview::draw()
refresh();
- if (mMotionID.notNull() && mAnimPreview)
+ if (mMotionID.notNull() && mAnimPreview && !mInWorld)
{
-/* gGL.color3f(1.f, 1.f, 1.f);
+ gGL.color3f(1.f, 1.f, 1.f);
gGL.getTexUnit(0)->bind(mAnimPreview->getTexture());
@@ -415,7 +453,7 @@ void LLFloaterAnimPreview::draw()
gGL.end();
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-*/
+
LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
if (!avatarp->areAnimationsPaused())
{
@@ -429,7 +467,20 @@ void LLFloaterAnimPreview::draw()
//-----------------------------------------------------------------------------
void LLFloaterAnimPreview::resetMotion()
{
- LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (mInWorld)
+ {
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ avatarp = mAnimPreview->getDummyAvatar();
+ }
+ if (!avatarp)
+ {
+ return;
+ }
+
BOOL paused = avatarp->areAnimationsPaused();
// *TODO: Fix awful casting hack
@@ -459,13 +510,13 @@ void LLFloaterAnimPreview::resetMotion()
mPauseRequest = NULL;
}
}
-/*
+
//-----------------------------------------------------------------------------
// handleMouseDown()
//-----------------------------------------------------------------------------
BOOL LLFloaterAnimPreview::handleMouseDown(S32 x, S32 y, MASK mask)
{
- if (mPreviewRect.pointInRect(x, y))
+ if (!mInWorld && mPreviewRect.pointInRect(x, y))
{
bringToFront( x, y );
gFocusMgr.setMouseCapture(this);
@@ -483,8 +534,11 @@ BOOL LLFloaterAnimPreview::handleMouseDown(S32 x, S32 y, MASK mask)
//-----------------------------------------------------------------------------
BOOL LLFloaterAnimPreview::handleMouseUp(S32 x, S32 y, MASK mask)
{
- gFocusMgr.setMouseCapture(FALSE);
- gViewerWindow->showCursor();
+ if (!mInWorld)
+ {
+ gFocusMgr.setMouseCapture(FALSE);
+ gViewerWindow->showCursor();
+ }
return LLFloater::handleMouseUp(x, y, mask);
}
@@ -493,6 +547,11 @@ BOOL LLFloaterAnimPreview::handleMouseUp(S32 x, S32 y, MASK mask)
//-----------------------------------------------------------------------------
BOOL LLFloaterAnimPreview::handleHover(S32 x, S32 y, MASK mask)
{
+ if (mInWorld)
+ {
+ return TRUE;
+ }
+
MASK local_mask = mask & ~MASK_ALT;
if (mAnimPreview && hasMouseCapture())
@@ -548,9 +607,11 @@ BOOL LLFloaterAnimPreview::handleHover(S32 x, S32 y, MASK mask)
//-----------------------------------------------------------------------------
BOOL LLFloaterAnimPreview::handleScrollWheel(S32 x, S32 y, S32 clicks)
{
- mAnimPreview->zoom((F32)clicks * -0.2f);
- mAnimPreview->requestUpdate();
-
+ if (!mInWorld)
+ {
+ mAnimPreview->zoom((F32)clicks * -0.2f);
+ mAnimPreview->requestUpdate();
+ }
return TRUE;
}
@@ -559,9 +620,12 @@ BOOL LLFloaterAnimPreview::handleScrollWheel(S32 x, S32 y, S32 clicks)
//-----------------------------------------------------------------------------
void LLFloaterAnimPreview::onMouseCaptureLost()
{
- gViewerWindow->showCursor();
+ if (!mInWorld)
+ {
+ gViewerWindow->showCursor();
+ }
}
-*/
+
//-----------------------------------------------------------------------------
// onBtnPlay()
//-----------------------------------------------------------------------------
@@ -571,9 +635,25 @@ void LLFloaterAnimPreview::onBtnPlay(void* user_data)
if (!previewp->getEnabled())
return;
- if (previewp->mMotionID.notNull() && previewp->mAnimPreview)
+ if (previewp->mMotionID.notNull())
{
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
if(!avatarp->isMotionActive(previewp->mMotionID))
{
@@ -603,9 +683,25 @@ void LLFloaterAnimPreview::onBtnStop(void* user_data)
if (!previewp->getEnabled())
return;
- if (previewp->mMotionID.notNull() && previewp->mAnimPreview)
+ if (previewp->mMotionID.notNull())
{
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
previewp->resetMotion();
previewp->mPauseRequest = avatarp->requestPause();
}
@@ -620,21 +716,33 @@ void LLFloaterAnimPreview::onSliderMove(LLUICtrl* ctrl, void*user_data)
if (!previewp->getEnabled())
return;
- if (previewp->mAnimPreview)
- {
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
- F32 slider_value = (F32)previewp->childGetValue("playback_slider").asReal();
- LLUUID base_id = previewp->mIDList[previewp->childGetValue("preview_base_anim").asString()];
- LLMotion* motionp = avatarp->findMotion(previewp->mMotionID);
- F32 duration = motionp->getDuration();// + motionp->getEaseOutDuration();
- F32 delta_time = duration * slider_value;
- avatarp->deactivateAllMotions();
- avatarp->startMotion(base_id, delta_time + BASE_ANIM_TIME_OFFSET);
- avatarp->startMotion(previewp->mMotionID, delta_time);
- previewp->mPauseRequest = avatarp->requestPause();
- previewp->refresh();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
}
-
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
+ F32 slider_value = (F32)previewp->childGetValue("playback_slider").asReal();
+ LLUUID base_id = previewp->mIDList[previewp->childGetValue("preview_base_anim").asString()];
+ LLMotion* motionp = avatarp->findMotion(previewp->mMotionID);
+ F32 duration = motionp->getDuration();// + motionp->getEaseOutDuration();
+ F32 delta_time = duration * slider_value;
+ avatarp->deactivateAllMotions();
+ avatarp->startMotion(base_id, delta_time + BASE_ANIM_TIME_OFFSET);
+ avatarp->startMotion(previewp->mMotionID, delta_time);
+ previewp->mPauseRequest = avatarp->requestPause();
+ previewp->refresh();
}
//-----------------------------------------------------------------------------
@@ -646,24 +754,37 @@ void LLFloaterAnimPreview::onCommitBaseAnim(LLUICtrl* ctrl, void* data)
if (!previewp->getEnabled())
return;
- if (previewp->mAnimPreview)
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
{
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
- BOOL paused = avatarp->areAnimationsPaused();
+ BOOL paused = avatarp->areAnimationsPaused();
- // stop all other possible base motions
- avatarp->stopMotion(ANIM_AGENT_STAND, TRUE);
- avatarp->stopMotion(ANIM_AGENT_WALK, TRUE);
- avatarp->stopMotion(ANIM_AGENT_SIT, TRUE);
- avatarp->stopMotion(ANIM_AGENT_HOVER, TRUE);
+ // stop all other possible base motions
+ avatarp->stopMotion(ANIM_AGENT_STAND, TRUE);
+ avatarp->stopMotion(ANIM_AGENT_WALK, TRUE);
+ avatarp->stopMotion(ANIM_AGENT_SIT, TRUE);
+ avatarp->stopMotion(ANIM_AGENT_HOVER, TRUE);
- previewp->resetMotion();
+ previewp->resetMotion();
- if (!paused)
- {
- previewp->mPauseRequest = NULL;
- }
+ if (!paused)
+ {
+ previewp->mPauseRequest = NULL;
}
}
@@ -676,7 +797,23 @@ void LLFloaterAnimPreview::onCommitLoop(LLUICtrl* ctrl, void* data)
if (!previewp->getEnabled())
return;
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
if (motionp)
@@ -696,7 +833,23 @@ void LLFloaterAnimPreview::onCommitLoopIn(LLUICtrl* ctrl, void* data)
if (!previewp->getEnabled())
return;
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
if (motionp)
@@ -717,7 +870,23 @@ void LLFloaterAnimPreview::onCommitLoopOut(LLUICtrl* ctrl, void* data)
if (!previewp->getEnabled())
return;
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
if (motionp)
@@ -738,7 +907,23 @@ void LLFloaterAnimPreview::onCommitName(LLUICtrl* ctrl, void* data)
if (!previewp->getEnabled())
return;
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
if (motionp)
@@ -782,7 +967,23 @@ void LLFloaterAnimPreview::onCommitPriority(LLUICtrl* ctrl, void* data)
if (!previewp->getEnabled())
return;
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
motionp->setPriority(llfloor((F32)previewp->childGetValue("priority").asReal()));
@@ -797,7 +998,23 @@ void LLFloaterAnimPreview::onCommitEaseIn(LLUICtrl* ctrl, void* data)
if (!previewp->getEnabled())
return;
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
motionp->setEaseIn((F32)previewp->childGetValue("ease_in_time").asReal());
@@ -813,7 +1030,23 @@ void LLFloaterAnimPreview::onCommitEaseOut(LLUICtrl* ctrl, void* data)
if (!previewp->getEnabled())
return;
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
motionp->setEaseOut((F32)previewp->childGetValue("ease_out_time").asReal());
@@ -829,7 +1062,23 @@ BOOL LLFloaterAnimPreview::validateEaseIn(LLUICtrl* spin, void* data)
if (!previewp->getEnabled())
return FALSE;
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return FALSE;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return FALSE;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
if (!motionp->getLoop())
@@ -851,7 +1100,23 @@ BOOL LLFloaterAnimPreview::validateEaseOut(LLUICtrl* spin, void* data)
if (!previewp->getEnabled())
return FALSE;
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (previewp->mInWorld)
+ {
+ if (!gAgent.getAvatarObject())
+ {
+ return FALSE;
+ }
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ if (!previewp->mAnimPreview)
+ {
+ return FALSE;
+ }
+ avatarp = previewp->mAnimPreview->getDummyAvatar();
+ }
LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
if (!motionp->getLoop())
@@ -936,9 +1201,20 @@ void LLFloaterAnimPreview::refresh()
}
else
{
- childHide("bad_animation_text");
+ if (!mInWorld)
+ {
+ childHide("bad_animation_text");
+ }
mPlayButton->setEnabled(TRUE);
- LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+ LLVOAvatar* avatarp;
+ if (mInWorld)
+ {
+ avatarp = gAgent.getAvatarObject();
+ }
+ else
+ {
+ avatarp = mAnimPreview->getDummyAvatar();
+ }
if (avatarp->isMotionActive(mMotionID))
{
mStopButton->setEnabled(TRUE);
@@ -971,7 +1247,10 @@ void LLFloaterAnimPreview::refresh()
mStopButton->setEnabled(TRUE); // stop also resets, leave enabled.
}
childEnable("ok_btn");
- mAnimPreview->requestUpdate();
+ if (!mInWorld)
+ {
+ mAnimPreview->requestUpdate();
+ }
}
}
@@ -983,9 +1262,17 @@ void LLFloaterAnimPreview::onBtnOK(void* userdata)
LLFloaterAnimPreview* floaterp = (LLFloaterAnimPreview*)userdata;
if (!floaterp->getEnabled()) return;
- if (floaterp->mAnimPreview)
+ if ((!floaterp->mInWorld && floaterp->mAnimPreview) || (floaterp->mInWorld && gAgent.getAvatarObject()))
{
- LLKeyframeMotion* motionp = (LLKeyframeMotion*)floaterp->mAnimPreview->getDummyAvatar()->findMotion(floaterp->mMotionID);
+ LLKeyframeMotion* motionp;
+ if (floaterp->mInWorld)
+ {
+ motionp = (LLKeyframeMotion*)gAgent.getAvatarObject()->findMotion(floaterp->mMotionID);
+ }
+ else
+ {
+ motionp = (LLKeyframeMotion*)floaterp->mAnimPreview->getDummyAvatar()->findMotion(floaterp->mMotionID);
+ }
S32 file_size = motionp->getFileSize();
U8* buffer = new U8[file_size];
@@ -1024,7 +1311,15 @@ void LLFloaterAnimPreview::onBtnOK(void* userdata)
delete [] buffer;
// clear out cache for motion data
- floaterp->mAnimPreview->getDummyAvatar()->removeMotion(floaterp->mMotionID);
+ if (floaterp->mInWorld)
+ {
+ gAgent.getAvatarObject()->removeMotion(floaterp->mMotionID);
+ gAgent.getAvatarObject()->deactivateAllMotions();
+ }
+ else
+ {
+ floaterp->mAnimPreview->getDummyAvatar()->removeMotion(floaterp->mMotionID);
+ }
LLKeyframeDataCache::removeKeyframeData(floaterp->mMotionID);
}
diff --git a/linden/indra/newview/llfloateranimpreview.h b/linden/indra/newview/llfloateranimpreview.h
index eaab186..e8f79e2 100644
--- a/linden/indra/newview/llfloateranimpreview.h
+++ b/linden/indra/newview/llfloateranimpreview.h
@@ -32,7 +32,7 @@
#ifndef LL_LLFLOATERANIMPREVIEW_H
#define LL_LLFLOATERANIMPREVIEW_H
-#include "llagent.h"
+
#include "llfloaternamedesc.h"
#include "lldynamictexture.h"
#include "llcharacter.h"
@@ -55,10 +55,7 @@ public:
void pan(F32 right, F32 up);
virtual BOOL needsUpdate() { return mNeedsUpdate; }
-// LLVOAvatar* getDummyAvatar() { return mDummyAvatar; }
-// HACK:don't get a dummy...
- LLVOAvatar* getDummyAvatar() { return gAgent.getAvatarObject();}
-
+ LLVOAvatar* getDummyAvatar() { return mDummyAvatar; }
protected:
BOOL mNeedsUpdate;
@@ -78,13 +75,13 @@ public:
virtual ~LLFloaterAnimPreview();
BOOL postBuild();
-/*
+
BOOL handleMouseDown(S32 x, S32 y, MASK mask);
BOOL handleMouseUp(S32 x, S32 y, MASK mask);
BOOL handleHover(S32 x, S32 y, MASK mask);
BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
void onMouseCaptureLost();
-*/
+
void refresh();
static void onBtnPlay(void*);
@@ -127,6 +124,7 @@ protected:
LLAssetID mMotionID;
LLTransactionID mTransactionID;
BOOL mEnabled;
+ BOOL mInWorld;
LLAnimPauseRequest mPauseRequest;
std::map mIDList;
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
index e710d41..f2c5d34 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
@@ -1,7 +1,7 @@
+ can_resize="false" height="556" min_height="256" min_width="300"
+ name="Animation Preview" title="" width="300">
Name:
@@ -180,7 +180,7 @@
-
+
Unable to read animation file.
We recommend BVH files exported from Poser 4.
@@ -202,4 +202,7 @@ Maximum animation length is [MAX_LENGTH] seconds.
[STATUS]
+
+ The animation preview is played on your avatar.
+
--
cgit v1.1
From 5b53beea343018111fa40d56c08c46fd2b48966d Mon Sep 17 00:00:00 2001
From: Patrick Sapinski
Date: Wed, 1 Sep 2010 13:06:35 -0400
Subject: fixed button position on preferences floater
---
linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index b0dd026..c2b8c2b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -101,8 +101,8 @@
font="SansSerifSmall" height="16" initial_value="false"
label="Include date with timestamps" left="148" mouse_opaque="true"
name="log_date_timestamp" radio_style="false" width="237" />
-
face_list;
- bool local_sculptmap;
-
-};
-
-/* texture picker defines */
-
-#define LOCAL_TEXTURE_PICKER_NAME "texture picker"
-#define LOCAL_TEXTURE_PICKER_LIST_NAME "local_name_list"
-#define LOCAL_TEXTURE_PICKER_RECURSE true
-#define LOCAL_TEXTURE_PICKER_CREATEIFMISSING true
-
-
-/*=======================================*/
-/* LocalBitmap: unit class */
-/*=======================================*/
-/*
- The basic unit class responsible for
- containing one loaded local texture.
-*/
-
-class LocalBitmap
-{
- public:
- LocalBitmap(std::string filename);
- virtual ~LocalBitmap(void);
- friend class LocalAssetBrowser;
-
- public: /* [enums, typedefs, etc] */
- enum link_status
- {
- LINK_UNKNOWN, /* default fallback */
- LINK_ON,
- LINK_OFF,
- LINK_BROKEN,
- LINK_UPDATING /* currently redundant, but left in case necessary later. */
- };
-
- enum extension_type
- {
- IMG_EXTEN_BMP,
- IMG_EXTEN_TGA,
- IMG_EXTEN_JPG,
- IMG_EXTEN_PNG
- };
-
- enum bitmap_type
- {
- TYPE_TEXTURE = 0,
- TYPE_SCULPT = 1,
- TYPE_LAYER = 2
- };
-
- public: /* [information query functions] */
- std::string getShortName(void);
- std::string getFileName(void);
- LLUUID getID(void);
- LLSD getLastModified(void);
- std::string getLinkStatus(void);
- bool getUpdateBool(void);
- void setType( S32 );
- bool getIfValidBool(void);
- S32 getType(void);
- void getDebugInfo(void);
-
- private: /* [maintenence functions] */
- void updateSelf(void);
- bool decodeSelf(LLImageRaw* rawimg);
- void setUpdateBool(void);
-
- LocalBitmap* getThis(void);
- std::vector getFaceUsesThis(LLDrawable*);
- std::vector getUsingObjects(bool seek_by_type = true,
- bool seek_textures = false, bool seek_sculptmaps = false);
-
- protected: /* [basic properties] */
- std::string shortname;
- std::string filename;
- extension_type extension;
- LLUUID id;
- LLSD last_modified;
- link_status linkstatus;
- bool keep_updating;
- bool valid;
- S32 bitmap_type;
- bool sculpt_dirty;
- bool volume_dirty;
-};
-
-/*=======================================*/
-/* LocalAssetBrowser: main class */
-/*=======================================*/
-/*
- Responsible for internal workings.
- Instantiated at the top of the source file.
- Sits in memory until the viewer is closed.
-
-*/
-
-
-class LocalAssetBrowser
-{
- public:
- LocalAssetBrowser();
- virtual ~LocalAssetBrowser();
- friend class FloaterLocalAssetBrowser;
- friend class LocalAssetBrowserTimer;
- static void UpdateTextureCtrlList(LLScrollListCtrl*);
- static void setLayerUpdated(bool toggle) { mLayerUpdated = toggle; }
- static void setSculptUpdated(bool toggle) { mSculptUpdated = toggle; }
- static void AddBitmap(void);
- static void DelBitmap( std::vector, S32 column = BITMAPLIST_COL_ID );
-
- /* UpdateTextureCtrlList was made public cause texturectrl requests it once on spawn
- ( added: when it's own add/remove funcs are used. )
- i've made it update on spawn instead of on pressing 'local' because the former does it once,
- the latter - each time the button's pressed. */
-
- private:
- static void onChangeHappened(void);
- static void onUpdateBool(LLUUID);
- static void onSetType(LLUUID, S32);
- static LocalBitmap* GetBitmapUnit(LLUUID);
- static bool IsDoingUpdates(void);
- static void PingTimer(void);
- static void PerformTimedActions(void);
- static void PerformSculptUpdates(LocalBitmap*);
-
- protected:
- static std::vector loaded_bitmaps;
- typedef std::vector::iterator local_list_iter;
- static bool mLayerUpdated;
- static bool mSculptUpdated;
-};
-
-/*==================================================*/
-/* FloaterLocalAssetBrowser : interface class */
-/*==================================================*/
-/*
- Responsible for talking to the user.
- Instantiated by user request.
- Destroyed when the floater is closed.
-
-*/
-class FloaterLocalAssetBrowser : public LLFloater
-{
-public:
- FloaterLocalAssetBrowser();
- virtual ~FloaterLocalAssetBrowser();
- static void show(void*);
-
-
-
-private:
- /* Widget related callbacks */
- // Button callback declarations
- static void onClickAdd(void* userdata);
- static void onClickDel(void* userdata);
- static void onClickMore(void* userdata);
- static void onClickLess(void* userdata);
- static void onClickUpload(void* userdata);
-
- // ScrollList callback declarations
- static void onChooseBitmapList(LLUICtrl* ctrl, void* userdata);
-
- // Checkbox callback declarations
- static void onClickUpdateChkbox(LLUICtrl* ctrl, void* userdata);
-
- // Combobox type select
- static void onCommitTypeCombo(LLUICtrl* ctrl, void* userdata);
-
- // Widgets
- LLButton* mAddBtn;
- LLButton* mDelBtn;
- LLButton* mUploadBtn;
-
- LLScrollListCtrl* mBitmapList;
- LLScrollListCtrl* mUsedList;
- LLTextureCtrl* mTextureView;
- LLCheckBoxCtrl* mUpdateChkBox;
-
- LLLineEditor* mPathTxt;
- LLLineEditor* mUUIDTxt;
- LLLineEditor* mNameTxt;
-
- LLTextBox* mLinkTxt;
- LLTextBox* mTimeTxt;
- LLComboBox* mTypeComboBox;
-
- LLTextBox* mCaptionPathTxt;
- LLTextBox* mCaptionUUIDTxt;
- LLTextBox* mCaptionLinkTxt;
- LLTextBox* mCaptionNameTxt;
- LLTextBox* mCaptionTimeTxt;
-
- /* static pointer to self, wai? oh well. */
- static FloaterLocalAssetBrowser* sLFInstance;
-
- // non-widget functions
- static void UpdateRightSide(void);
-
-public:
- static void UpdateBitmapScrollList(void);
-
-
-};
-
-/*==================================================*/
-/* LocalAssetBrowserTimer : timer class */
-/*==================================================*/
-/*
- A small, simple timer class inheriting from
- LLEventTimer, responsible for pinging the
- LocalAssetBrowser class to perform it's
- updates / checks / etc.
-
-*/
-class LocalAssetBrowserTimer : public LLEventTimer
-{
- public:
- LocalAssetBrowserTimer();
- ~LocalAssetBrowserTimer();
- virtual BOOL tick();
- void start();
- void stop();
- bool isRunning();
-};
-
-#endif
-
--
cgit v1.1
From 7552a5c396edd41ea77b17b109abd38b187c9a18 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 1 Sep 2010 10:26:37 -0700
Subject: Fixing bad file extension capital, part 2: revenge of the file
---
linden/indra/newview/floaterlocalassetbrowse.h | 302 +++++++++++++++++++++++++
1 file changed, 302 insertions(+)
create mode 100644 linden/indra/newview/floaterlocalassetbrowse.h
(limited to 'linden/indra')
diff --git a/linden/indra/newview/floaterlocalassetbrowse.h b/linden/indra/newview/floaterlocalassetbrowse.h
new file mode 100644
index 0000000..e02a7d3
--- /dev/null
+++ b/linden/indra/newview/floaterlocalassetbrowse.h
@@ -0,0 +1,302 @@
+/**
+* @file floaterlocalassetbrowse.h
+* @brief Local texture support
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* 2010, original author Vaalith Jinn
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+/* Local Asset Browser: header
+
+tag: vaa emerald local_asset_browser
+
+*/
+
+
+#ifndef VAA_LOCALBROWSER
+#define VAA_LOCALBROWSER
+
+#include "llfloater.h"
+#include "llscrolllistctrl.h"
+#include "lltexturectrl.h"
+#include "lldrawable.h"
+
+
+/*=======================================*/
+/* Global structs / enums / defines */
+/*=======================================*/
+
+#define LF_FLOATER_EXPAND_WIDTH 735
+#define LF_FLOATER_CONTRACT_WIDTH 415
+#define LF_FLOATER_HEIGHT 260
+
+#define LOCAL_USE_MIPMAPS true
+#define LOCAL_DISCARD_LEVEL 0
+#define NO_IMAGE LLUUID::null
+
+#define TIMER_HEARTBEAT 3.0
+
+#define SLAM_FOR_DEBUG true
+
+enum bitmaplist_cols
+{
+ BITMAPLIST_COL_NAME,
+ BITMAPLIST_COL_ID
+};
+
+/* upload & sculpt update related */
+struct affected_object
+{
+ LLViewerObject* object;
+ std::vector face_list;
+ bool local_sculptmap;
+
+};
+
+/* texture picker defines */
+
+#define LOCAL_TEXTURE_PICKER_NAME "texture picker"
+#define LOCAL_TEXTURE_PICKER_LIST_NAME "local_name_list"
+#define LOCAL_TEXTURE_PICKER_RECURSE true
+#define LOCAL_TEXTURE_PICKER_CREATEIFMISSING true
+
+
+/*=======================================*/
+/* LocalBitmap: unit class */
+/*=======================================*/
+/*
+ The basic unit class responsible for
+ containing one loaded local texture.
+*/
+
+class LocalBitmap
+{
+ public:
+ LocalBitmap(std::string filename);
+ virtual ~LocalBitmap(void);
+ friend class LocalAssetBrowser;
+
+ public: /* [enums, typedefs, etc] */
+ enum link_status
+ {
+ LINK_UNKNOWN, /* default fallback */
+ LINK_ON,
+ LINK_OFF,
+ LINK_BROKEN,
+ LINK_UPDATING /* currently redundant, but left in case necessary later. */
+ };
+
+ enum extension_type
+ {
+ IMG_EXTEN_BMP,
+ IMG_EXTEN_TGA,
+ IMG_EXTEN_JPG,
+ IMG_EXTEN_PNG
+ };
+
+ enum bitmap_type
+ {
+ TYPE_TEXTURE = 0,
+ TYPE_SCULPT = 1,
+ TYPE_LAYER = 2
+ };
+
+ public: /* [information query functions] */
+ std::string getShortName(void);
+ std::string getFileName(void);
+ LLUUID getID(void);
+ LLSD getLastModified(void);
+ std::string getLinkStatus(void);
+ bool getUpdateBool(void);
+ void setType( S32 );
+ bool getIfValidBool(void);
+ S32 getType(void);
+ void getDebugInfo(void);
+
+ private: /* [maintenence functions] */
+ void updateSelf(void);
+ bool decodeSelf(LLImageRaw* rawimg);
+ void setUpdateBool(void);
+
+ LocalBitmap* getThis(void);
+ std::vector getFaceUsesThis(LLDrawable*);
+ std::vector getUsingObjects(bool seek_by_type = true,
+ bool seek_textures = false, bool seek_sculptmaps = false);
+
+ protected: /* [basic properties] */
+ std::string shortname;
+ std::string filename;
+ extension_type extension;
+ LLUUID id;
+ LLSD last_modified;
+ link_status linkstatus;
+ bool keep_updating;
+ bool valid;
+ S32 bitmap_type;
+ bool sculpt_dirty;
+ bool volume_dirty;
+};
+
+/*=======================================*/
+/* LocalAssetBrowser: main class */
+/*=======================================*/
+/*
+ Responsible for internal workings.
+ Instantiated at the top of the source file.
+ Sits in memory until the viewer is closed.
+
+*/
+
+
+class LocalAssetBrowser
+{
+ public:
+ LocalAssetBrowser();
+ virtual ~LocalAssetBrowser();
+ friend class FloaterLocalAssetBrowser;
+ friend class LocalAssetBrowserTimer;
+ static void UpdateTextureCtrlList(LLScrollListCtrl*);
+ static void setLayerUpdated(bool toggle) { mLayerUpdated = toggle; }
+ static void setSculptUpdated(bool toggle) { mSculptUpdated = toggle; }
+ static void AddBitmap(void);
+ static void DelBitmap( std::vector, S32 column = BITMAPLIST_COL_ID );
+
+ /* UpdateTextureCtrlList was made public cause texturectrl requests it once on spawn
+ ( added: when it's own add/remove funcs are used. )
+ i've made it update on spawn instead of on pressing 'local' because the former does it once,
+ the latter - each time the button's pressed. */
+
+ private:
+ static void onChangeHappened(void);
+ static void onUpdateBool(LLUUID);
+ static void onSetType(LLUUID, S32);
+ static LocalBitmap* GetBitmapUnit(LLUUID);
+ static bool IsDoingUpdates(void);
+ static void PingTimer(void);
+ static void PerformTimedActions(void);
+ static void PerformSculptUpdates(LocalBitmap*);
+
+ protected:
+ static std::vector loaded_bitmaps;
+ typedef std::vector::iterator local_list_iter;
+ static bool mLayerUpdated;
+ static bool mSculptUpdated;
+};
+
+/*==================================================*/
+/* FloaterLocalAssetBrowser : interface class */
+/*==================================================*/
+/*
+ Responsible for talking to the user.
+ Instantiated by user request.
+ Destroyed when the floater is closed.
+
+*/
+class FloaterLocalAssetBrowser : public LLFloater
+{
+public:
+ FloaterLocalAssetBrowser();
+ virtual ~FloaterLocalAssetBrowser();
+ static void show(void*);
+
+
+
+private:
+ /* Widget related callbacks */
+ // Button callback declarations
+ static void onClickAdd(void* userdata);
+ static void onClickDel(void* userdata);
+ static void onClickMore(void* userdata);
+ static void onClickLess(void* userdata);
+ static void onClickUpload(void* userdata);
+
+ // ScrollList callback declarations
+ static void onChooseBitmapList(LLUICtrl* ctrl, void* userdata);
+
+ // Checkbox callback declarations
+ static void onClickUpdateChkbox(LLUICtrl* ctrl, void* userdata);
+
+ // Combobox type select
+ static void onCommitTypeCombo(LLUICtrl* ctrl, void* userdata);
+
+ // Widgets
+ LLButton* mAddBtn;
+ LLButton* mDelBtn;
+ LLButton* mUploadBtn;
+
+ LLScrollListCtrl* mBitmapList;
+ LLScrollListCtrl* mUsedList;
+ LLTextureCtrl* mTextureView;
+ LLCheckBoxCtrl* mUpdateChkBox;
+
+ LLLineEditor* mPathTxt;
+ LLLineEditor* mUUIDTxt;
+ LLLineEditor* mNameTxt;
+
+ LLTextBox* mLinkTxt;
+ LLTextBox* mTimeTxt;
+ LLComboBox* mTypeComboBox;
+
+ LLTextBox* mCaptionPathTxt;
+ LLTextBox* mCaptionUUIDTxt;
+ LLTextBox* mCaptionLinkTxt;
+ LLTextBox* mCaptionNameTxt;
+ LLTextBox* mCaptionTimeTxt;
+
+ /* static pointer to self, wai? oh well. */
+ static FloaterLocalAssetBrowser* sLFInstance;
+
+ // non-widget functions
+ static void UpdateRightSide(void);
+
+public:
+ static void UpdateBitmapScrollList(void);
+
+
+};
+
+/*==================================================*/
+/* LocalAssetBrowserTimer : timer class */
+/*==================================================*/
+/*
+ A small, simple timer class inheriting from
+ LLEventTimer, responsible for pinging the
+ LocalAssetBrowser class to perform it's
+ updates / checks / etc.
+
+*/
+class LocalAssetBrowserTimer : public LLEventTimer
+{
+ public:
+ LocalAssetBrowserTimer();
+ ~LocalAssetBrowserTimer();
+ virtual BOOL tick();
+ void start();
+ void stop();
+ bool isRunning();
+};
+
+#endif
+
--
cgit v1.1
From b2b8a6b924a93794821a1a20f4dd965400e53688 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 1 Sep 2010 17:34:49 -0700
Subject: Moved chatbar commandline options into their own window, cleaned up
more stuff
---
linden/indra/newview/CMakeLists.txt | 2 +
linden/indra/newview/app_settings/settings.xml | 40 +++----
linden/indra/newview/chatbar_as_cmdline.cpp | 129 ++++++++++-----------
linden/indra/newview/floatercommandline.cpp | 84 ++++++++++++++
linden/indra/newview/floatercommandline.h | 55 +++++++++
linden/indra/newview/lggautocorrectfloater.cpp | 9 +-
linden/indra/newview/llprefsadvanced.cpp | 111 ++----------------
linden/indra/newview/llprefsadvanced.h | 22 +---
.../default/xui/en-us/floater_command_line.xml | 108 +++++++++++++++++
.../skins/default/xui/en-us/notifications.xml | 12 +-
.../xui/en-us/panel_preferences_advanced.xml | 117 ++-----------------
11 files changed, 364 insertions(+), 325 deletions(-)
create mode 100644 linden/indra/newview/floatercommandline.cpp
create mode 100644 linden/indra/newview/floatercommandline.h
create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_command_line.xml
(limited to 'linden/indra')
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1a900c4..c047a0f 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -78,6 +78,7 @@ set(viewer_SOURCE_FILES
emeraldboobutils.cpp
floaterao.cpp
floaterbusy.cpp
+ floatercommandline.cpp
floatergriddefault.cpp
floatergridmanager.cpp
floaterlocalassetbrowse.cpp
@@ -514,6 +515,7 @@ set(viewer_HEADER_FILES
emeraldboobutils.h
floaterao.h
floaterbusy.h
+ floatercommandline.h
floatergriddefault.h
floatergridmanager.h
floaterlocalassetbrowse.h
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 7071de2..f096811 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1312,7 +1312,7 @@
- EmeraldCmdLine
+ CmdLineChatbarEnabled
- EmeraldCmdLineMapToKeepPos
+ CmdLineChatbarMapToKeepPos
- EmeraldCmdLineAO
+ CmdLineChatbarAO
- EmeraldCmdLineAutocorrect
+ CmdLineChatbarAutocorrect
- EmeraldCmdLineMedia
+ CmdLineChatbarMedia
- EmeraldCmdLineMusic
+ CmdLineChatbarMusic
- EmeraldCmdLineClearChat
+ CmdLineChatbarClearChat
- EmeraldCmdLineHeight
+ CmdLineChatbarHeight
- EmeraldCmdLinePos
+ CmdLineChatbarPos
- EmeraldCmdLineGround
+ CmdLineChatbarGround
- EmeraldCmdLineTeleportHome
+ CmdLineChatbarTeleportHome
- EmeraldCmdLineRezPlatform
+ CmdLineChatbarRezPlatform
- EmeraldCmdLinePlatformSize
+ CmdLineChatbarPlatformSize
- EmeraldCmdLineMapTo
+ CmdLineChatbarMapTo
- EmeraldCmdLineDrawDistance
+ CmdLineChatbarDrawDistance
- EmeraldCmdTeleportToCam
+ CmdLineChatbarTeleportToCam
- EmeraldCmdLineKeyToName
+ CmdLineChatbarKeyToName
- EmeraldCmdLineOfferTp
+ CmdLineChatbarOfferTp
- EmeraldCmdLineCalc
+ CmdLineChatbarCalc
- EmeraldCmdLineTP2
+ CmdLineChatbarTP2
-Various Options For Command Line features.
-To use a command, type it in your chat bar (Local chat) and press enter.
+ icon="alert.tga"
+ name="Help_CmdLine"
+ type="alert">
+Various options for command line features.
+
+To use a command, type it in your chat bar (Local Chat) and press enter.
+
+
-
-
-
-
-
- Teleport within sim (usage: cmd x y z)
-
- Teleport to ground (usage: cmd)
-
- Teleport to altitude (usage: cmd z)
-
- Teleport home (usage: cmd)
-
- Rez a platform (usage: cmd 0 - 30)
-
-
- Teleport to sim x (usage: cmd simname)
-
-
- Calc. expressions (usage: cmd SIN(2+2))
-
- Add autocorrect word(cmd list|bad|good)
-
-
- Change Draw Distance (usage: cmd meters)
-
- Teleport to cam position (usage: cmd)
-
- Get avatar name from key (usage: cmd key)
-
- Offer teleport to avatar (usage: cmd key)
-
- Teleport to avatar (usage: cmd name)
-
- Turn AO on/off (usage: cmd on/off)
-
- Clear the chat history (usage: cmd)
-
- Set the media url (usage: cmd url type)
-
- Set the music stream url (usage: cmd url)
-
-
--
cgit v1.1
From 56708c7c1182708814558493c47de9a421e78fe1 Mon Sep 17 00:00:00 2001
From: Patrick Sapinski
Date: Wed, 1 Sep 2010 13:39:52 -0400
Subject: useful batch files
---
linden/indra/develop.py clean.bat | 2 ++
linden/indra/develop.py.bat | 2 ++
2 files changed, 4 insertions(+)
create mode 100644 linden/indra/develop.py clean.bat
create mode 100644 linden/indra/develop.py.bat
(limited to 'linden/indra')
diff --git a/linden/indra/develop.py clean.bat b/linden/indra/develop.py clean.bat
new file mode 100644
index 0000000..24c6822
--- /dev/null
+++ b/linden/indra/develop.py clean.bat
@@ -0,0 +1,2 @@
+develop.py clean
+pause
\ No newline at end of file
diff --git a/linden/indra/develop.py.bat b/linden/indra/develop.py.bat
new file mode 100644
index 0000000..753ef25
--- /dev/null
+++ b/linden/indra/develop.py.bat
@@ -0,0 +1,2 @@
+develop.py
+pause
\ No newline at end of file
--
cgit v1.1
From 7c284acc13f41fd135c5f379a642b1442c273063 Mon Sep 17 00:00:00 2001
From: Patrick Sapinski
Date: Wed, 1 Sep 2010 13:40:51 -0400
Subject: autocorrect defaults for spellchecker
---
.../newview/app_settings/settings_autocorrect.xml | 8331 ++++++++++++++++++++
1 file changed, 8331 insertions(+)
create mode 100644 linden/indra/newview/app_settings/settings_autocorrect.xml
(limited to 'linden/indra')
diff --git a/linden/indra/newview/app_settings/settings_autocorrect.xml b/linden/indra/newview/app_settings/settings_autocorrect.xml
new file mode 100644
index 0000000..be89d02
--- /dev/null
+++ b/linden/indra/newview/app_settings/settings_autocorrect.xml
@@ -0,0 +1,8331 @@
+
+
+
--
cgit v1.1
From bec5f7ceb211144a48b7ad33c8b6f3c5ed80c16b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 1 Sep 2010 17:47:00 -0700
Subject: Fixed more messiness from merging in preferences > advanced
---
.../xui/en-us/panel_preferences_advanced.xml | 90 +++++++++++-----------
1 file changed, 46 insertions(+), 44 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index a164f78..726fd26 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -19,22 +19,43 @@
label="Disable teleport screen" left="12" mouse_opaque="true"
name="disable_tp_screen_check" radio_style="false" width="217" />
+
+
+ label="Show client names in hovertip" left_delta="0" mouse_opaque="true"
+ name="client_name_hover_check" radio_style="false" width="160" />
+
+ Allow region WindLight settings (LightShare):
+
+
+
+ Never
+
+
+ Ask me every time
+
+
+ Always
+
+
-
@@ -67,43 +88,24 @@
mouse_opaque="true" name="language_is_public"
radio_style="false" tool_tip="This lets in-world objects know your preferred language."
width="256" />
-
-
- Allow region WindLight settings (LightShare):
-
-
-
- Never
-
-
- Ask me every time
-
-
- Always
-
-
-
-
-
-
-
+
+
+
+
-
-
@@ -128,7 +128,7 @@
-->
-
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 1357eb5..7b4b809 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -4,7 +4,7 @@
name="general_panel" width="517">
My Home
@@ -18,7 +18,7 @@
System Default
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 4df33e2..55af056 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -141,16 +141,16 @@
name="QualityText2" v_pad="0" width="95">
Quality
-
-
-
-
-
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index 1ec3fcd..fc9b6cd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -55,7 +55,7 @@
-
Browser Cache:
-
-
-
--
cgit v1.1
From 2e2c0f3ce7a9c1781530734ee38c6b3f7ba4cc79 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 2 Sep 2010 00:37:07 -0700
Subject: Fixed layout of Local Chat window
---
.../newview/skins/default/xui/en-us/floater_chat_history.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'linden/indra')
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 2e6fee4..87e1dae 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -65,7 +65,7 @@
Control your camera
-
@@ -76,10 +76,10 @@
+ DicDownloadBaseURL
+
EmeraldEnableAutoCorrect
- RadarSimWide
-
SavedRenderFarClip
SpeedRezInterval
EmeraldEnableAutoCorrect
BrowserLastVisited
FontSansSerifBundledFallback
FontSansSerifFallback
UISndAlert
- FloaterViewBottom
+ FloaterTeleportHistoryRect
+
+ FloaterViewBottom
+ MapServerURL
+
+ UseWebMapTiles
+
MapOverlayIndex
+
+ MapServerURL
+
MapShowAgentCount
+ UseWebMapTiles
+
VerticalIMTabs
- MapServerURL
-
- UseWebMapTiles
-
MapOverlayIndex
+
+ Inventar hier hereinziehen (Drag & Drop), um es zu senden
+
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
index 9407e94..a3ad922 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml
@@ -1,57 +1,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Rumpelstilzchen Megakrass
-
-
- Stummschalten:
-
-
-
-
-
-
-
- Voice-Chat wird beigetreten...
-
-
- Verbunden. Klicken Sie auf Anruf beenden, um die Verbindung zu trennen
-
-
- Voice-Chat verlassen
-
-
- icn_voice-groupfocus.tga
-
-
- FĂ¼r Instant Message hier klicken.
-
-
- *** Willkommen bei Help Request ***
-Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. DrĂ¼cken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf.
-Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis ein verfĂ¼gbarer Helfer antwortet.
--=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-
-
-
- Instant Message an [NAME]
-
-
- [NAME] tippt...
-
-
- Beginne Sitzung mit [NAME], bitte warten.
-
-
+
+
+
+ Voice-Chat wird beigetreten...
+
+
+ Verbunden. Klicken Sie auf Anruf beenden, um die Verbindung zu trennen
+
+
+ Voice-Chat verlassen
+
+
+ icn_voice-groupfocus.tga
+
+
+ Instant Message an [NAME]
+
+
+ [NAME] tippt...
+
+
+ Beginne Sitzung mit [NAME], bitte warten.
+
+
+ FĂ¼r Instant Message hier klicken.
+
+
+
+
+
+
+
+
+
+
+
+
+ *** Willkommen bei Help Request ***
+Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. DrĂ¼cken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf.
+Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis ein verfĂ¼gbarer Helfer antwortet.
+-=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-
+
+
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
index c7e5542..04a8b08 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
@@ -1,79 +1,68 @@
-
-
-
-
-
-
-
-
-
-
-
- *** Willkommen bei Help Request ***
- Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. DrĂ¼cken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf.
- Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis ein verfĂ¼gbarer Helfer antwortet.
- -=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-
-
-
- Instant Message an [NAME]
-
-
- [NAME] tippt...
-
-
- Beginne Sitzung mit [NAME], bitte warten.
-
-
-
-
-
-
-
-
- Rumpelstilzchen Megakrass
-
-
- Stummschalten:
-
-
-
-
-
-
-
- Voice-Chat wird beigetreten...
-
-
- Verbunden. Klicken Sie auf â€Anruf beenden“, um die Verbindung zu trennen
-
-
- Voice-Chat verlassen
-
-
- icn_voice-groupfocus.tga
-
-
- *** Willkommen bei Help Request ***
- Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. DrĂ¼cken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf.
- Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis die verfĂ¼gbaren Helfer antworten.
- -=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-
-
-
- Instant Message an [NAME]
-
-
- [NAME] tippt...
-
-
- Beginne Sitzung mit [NAME], bitte warten.
-
-
- (Moderiert: Voice-Chat standardmĂ¤ĂŸig abschaltet)
-
-
- FĂ¼r Instant Message hier klicken.
-
-
- Ihr Text-Chat wurde von einem Gruppenmoderator deaktiviert.
-
-
+
+
+
+ Voice-Chat wird beigetreten...
+
+
+ Verbunden. Klicken Sie auf â€Anruf beenden“, um die Verbindung zu trennen
+
+
+ Voice-Chat verlassen
+
+
+ icn_voice-groupfocus.tga
+
+
+ *** Willkommen bei Help Request ***
+ Bitte werfen Sie zuerst einen Blick auf unsere SL-Hilfeseiten. DrĂ¼cken Sie dazu F1. Oder rufen Sie unter http://secondlife.com/knowledgebase/ die Knowledge Base auf.
+ Falls Sie die gesuchte Antwort dort nicht finden, geben Sie Ihre Frage ein. Warten Sie dann einen Moment, bis die verfĂ¼gbaren Helfer antworten.
+ -=-=- Die Antwortzeiten variieren. Insbesondere zur Hauptbetriebszeit kann die Antwort etwas länger dauern. -=-=-
+
+
+ Instant Message an [NAME]
+
+
+ [NAME] tippt...
+
+
+ Beginne Sitzung mit [NAME], bitte warten.
+
+
+ (Moderiert: Voice-Chat standardmĂ¤ĂŸig abschaltet)
+
+
+ FĂ¼r Instant Message hier klicken.
+
+
+ Ihr Text-Chat wurde von einem Gruppenmoderator deaktiviert.
+
+
+
+
+
+ Verlauf anzeigen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Rumpelstilzchen Megakrass
+
+
+ Stummschalten:
+
+
+
+
+
+
+
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
index c8c6724..50d6f13 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
@@ -1,10 +1,52 @@
-
+
+
+
+ Schnellfilter:
+
+
+
+ Alle Arten
+ Animationen
+ Körperteile
+ Visitenkarten
+ Kleidung
+ Gesten
+ Landmarken
+ Notizkarten
+ Objekte
+ Skripte
+ Klänge
+ Texturen
+ Fotos
+ Anpassen...
+
+
+ Alle Arten
+
+ Animationen
+ Körperteile
+ Visitenkarten
+ Kleidung
+ Gesten
+ Landmarken
+ Notizkarten
+ Objekte
+ Skripte
+ Klänge
+ Texturen
+ Fotos
+
+ Anpassen...
+
+
-
-
+
+
+
+
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index 0028f1d..7219ce6 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
@@ -56,7 +56,7 @@
- Objekt markieren:
+ Artikel markieren:
@@ -64,11 +64,11 @@
Original
- Kopieren
+ Kopie
- Preis: L$
+ Preis: [CURRENCY]
(unbekannt)
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
index aa24231..6ec5a08 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
@@ -1,16 +1,18 @@
-
+
+
-
-
+
+
+
@@ -18,7 +20,9 @@
- ODER -
+
+
diff --git a/linden/indra/newview/skins/default/xui/de/floater_joystick.xml b/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
index 2759115..cd1a465 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_joystick.xml
@@ -1,86 +1,92 @@
-
-
-
- Joystick aktivieren:
-
-
-
-
-
-
-
-
-
-
-
-
-
- Steuermodi:
-
-
- Avatar
-
-
- Bauen
-
-
- Flycam
-
-
- X-Skala
-
-
- Y-Skala
-
-
- Z-Skala
-
-
- Neigungsskala
-
-
- Gierskala
-
-
- Rollskala
-
-
- X-Totzone
-
-
- Y-Totzone
-
-
- Z-Totzone
-
-
- Neigen-Totzone
-
-
- Gieren-Totzone
-
-
- Rollen-Totzone
-
-
- Auslaufen
-
-
- Zoom-Skala
-
-
- Zoom-Totzone
-
-
-
-
-
- Joystick-Monitor
-
-
- Achse [NUM]
-
-
- Kein Gerät erkannt
-
-
+
+
+
+ Joystick aktivieren:
+
+
+
+ Joystick Autom. aktivieren
+
+
+
+
+
+
+
+
+
+
+
+
+ Steuermodi:
+
+
+
+ Avatar
+
+
+ Bauen
+
+
+ Flycam
+
+
+
+ X-Skala
+
+
+ Y-Skala
+
+
+ Z-Skala
+
+
+ Neigungsskala
+
+
+ Gierskala
+
+
+ Rollskala
+
+
+ X-Totzone
+
+
+ Y-Totzone
+
+
+ Z-Totzone
+
+
+ Neigen-Totzone
+
+
+ Gieren-Totzone
+
+
+ Rollen-Totzone
+
+
+ Auslaufen
+
+
+ Zoom-Skala
+
+
+ Zoom-Totzone
+
+
+
+
+
+
+ Joystick-Monitor
+
+
+ Achse [NUM]
+
+
+ Kein Gerät erkannt
+
+
--
cgit v1.1
From 3329e607a6d20fcccd3a23258610e729376f5e6b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 17 Sep 2010 01:25:49 -0700
Subject: Fixed missing [CURRENCY] in god tools and deleted an unused xml file
(thanks Eryn)
---
linden/indra/newview/llfloatergodtools.cpp | 4 +
.../skins/default/xui/en-us/floater_god_tools.xml | 2 +-
.../skins/default/xui/en-us/floater_group_info.xml | 657 ---------------------
3 files changed, 5 insertions(+), 658 deletions(-)
delete mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml
(limited to 'linden/indra')
diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp
index 4959a29..2bbbc65 100644
--- a/linden/indra/newview/llfloatergodtools.cpp
+++ b/linden/indra/newview/llfloatergodtools.cpp
@@ -77,6 +77,8 @@
#include "lltransfertargetfile.h"
#include "lltransfersourcefile.h"
+#include "hippoGridManager.h"
+
const F32 SECONDS_BETWEEN_UPDATE_REQUESTS = 5.0f;
static LLFloaterGodTools* sGodTools = NULL;
@@ -135,6 +137,8 @@ LLFloaterGodTools::LLFloaterGodTools()
sendRegionInfoRequest();
childShowTab("GodTools Tabs", "region");
+
+ childSetTextArg("land cost text", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
}
// static
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
index ee70387..9ce4b54 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml
@@ -133,7 +133,7 @@
bottom="-146" drop_shadow_visible="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
mouse_opaque="true" name="land cost text" v_pad="0" width="110">
- L$ per sq. meter:
+ [CURRENCY] per sq. meter: