Completed normal subtask EXT-6621 (Code cleanup: Remove unused LLFloaterActiveSpeakers and related classes from viewer)
* Removed llfloateractivespeacker.h/cpp from CMakeLists.txt and from the repo.
* Removed llmediaremotectrl.h/cpp, llvoiceremotectrl.h/cpp from the repo (were not in CMakeLists.txt).
* Unused in 2.0 setings ("ShowVoiceChannelPopup" & "ShowVolumeSettingsPopup") are moved to the end of settings.xml (to not affect 1.23 if remove).
* Removed xml files related to Active Speakers floater and old Communication floater (related cpp files have been already removed). Also removed their localized versions.
* Also removed old textures related to removed xml and unused in 2.0 anymore.
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/226/
--HG--
branch : product-engine
meow-7.2.2
Mike Antipov
parent
e2d32b9e9d
commit
3a5ae14b85
|
|
@ -145,7 +145,6 @@ set(viewer_SOURCE_FILES
|
|||
llfirstuse.cpp
|
||||
llflexibleobject.cpp
|
||||
llfloaterabout.cpp
|
||||
llfloateractivespeakers.cpp
|
||||
llfloateranimpreview.cpp
|
||||
llfloaterauction.cpp
|
||||
llfloateravatarpicker.cpp
|
||||
|
|
@ -650,7 +649,6 @@ set(viewer_HEADER_FILES
|
|||
llfirstuse.h
|
||||
llflexibleobject.h
|
||||
llfloaterabout.h
|
||||
llfloateractivespeakers.h
|
||||
llfloateranimpreview.h
|
||||
llfloaterauction.h
|
||||
llfloateravatarpicker.h
|
||||
|
|
|
|||
|
|
@ -8546,17 +8546,6 @@
|
|||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>ShowVoiceChannelPopup</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Controls visibility of the current voice channel popup above the voice tab</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>ShowVoiceVisualizersInCalls</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
@ -8568,17 +8557,6 @@
|
|||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>ShowVolumeSettingsPopup</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Show individual volume slider for voice, sound effects, etc</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>SkinCurrent</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
|
@ -10965,5 +10943,35 @@
|
|||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
|
||||
<!-- Settings below are for back compatibility only.
|
||||
They are not used in current viewer anymore. But they can't be removed to avoid
|
||||
influence on previous versions of the viewer in case of settings are not used or default value
|
||||
should be changed. See also EXT-6661. -->
|
||||
<!-- 1.23 settings -->
|
||||
<key>ShowVoiceChannelPopup</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Controls visibility of the current voice channel popup above the voice tab</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>ShowVolumeSettingsPopup</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Show individual volume slider for voice, sound effects, etc</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
|
||||
<!-- End of back compatibility settings -->
|
||||
</map>
|
||||
</llsd>
|
||||
|
|
|
|||
|
|
@ -185,24 +185,6 @@ LLBottomTray::~LLBottomTray()
|
|||
}
|
||||
}
|
||||
|
||||
void LLBottomTray::onChicletClick(LLUICtrl* ctrl)
|
||||
{
|
||||
LLIMChiclet* chiclet = dynamic_cast<LLIMChiclet*>(ctrl);
|
||||
if (chiclet)
|
||||
{
|
||||
// Until you can type into an IM Window and have a conversation,
|
||||
// still show the old communicate window
|
||||
//LLFloaterReg::showInstance("communicate", chiclet->getSessionId());
|
||||
|
||||
// Show after comm window so it is frontmost (and hence will not
|
||||
// auto-hide)
|
||||
|
||||
// this logic has been moved to LLIMChiclet::handleMouseDown
|
||||
// LLIMFloater::show(chiclet->getSessionId());
|
||||
// chiclet->setCounter(0);
|
||||
}
|
||||
}
|
||||
|
||||
// *TODO Vadim: why void* ?
|
||||
void* LLBottomTray::createNearbyChatBar(void* userdata)
|
||||
{
|
||||
|
|
@ -499,7 +481,6 @@ BOOL LLBottomTray::postBuild()
|
|||
mNearbyChatBar->getChatBox()->setContextMenu(NULL);
|
||||
|
||||
mChicletPanel = getChild<LLChicletPanel>("chiclet_list");
|
||||
mChicletPanel->setChicletClickedCallback(boost::bind(&LLBottomTray::onChicletClick,this,_1));
|
||||
|
||||
initStateProcessedObjectMap();
|
||||
|
||||
|
|
|
|||
|
|
@ -212,8 +212,6 @@ protected:
|
|||
|
||||
LLBottomTray(const LLSD& key = LLSD());
|
||||
|
||||
void onChicletClick(LLUICtrl* ctrl);
|
||||
|
||||
static void* createNearbyChatBar(void* userdata);
|
||||
|
||||
void updateContextMenu(S32 x, S32 y, MASK mask);
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
#include "llcompilequeue.h"
|
||||
#include "llcallfloater.h"
|
||||
#include "llfloaterabout.h"
|
||||
#include "llfloateractivespeakers.h"
|
||||
#include "llfloateranimpreview.h"
|
||||
#include "llfloaterauction.h"
|
||||
#include "llfloateravatarpicker.h"
|
||||
|
|
@ -135,7 +134,6 @@ void LLViewerFloaterReg::registerFloaters()
|
|||
|
||||
LLFloaterAboutUtil::registerFloater();
|
||||
LLFloaterReg::add("about_land", "floater_about_land.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLand>);
|
||||
LLFloaterReg::add("active_speakers", "floater_active_speakers.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterActiveSpeakers>);
|
||||
LLFloaterReg::add("auction", "floater_auction.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAuction>);
|
||||
LLFloaterReg::add("avatar_picker", "floater_avatar_picker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAvatarPicker>);
|
||||
LLFloaterReg::add("avatar_textures", "floater_avatar_textures.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAvatarTextures>);
|
||||
|
|
@ -151,7 +149,6 @@ void LLViewerFloaterReg::registerFloaters()
|
|||
LLFloaterReg::add("bumps", "floater_bumps.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBump>);
|
||||
|
||||
LLFloaterReg::add("camera", "floater_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCamera>);
|
||||
//LLFloaterReg::add("chat", "floater_chat_history.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterChat>);
|
||||
LLFloaterReg::add("nearby_chat", "floater_nearby_chat.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNearbyChat>);
|
||||
|
||||
LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
|
||||
|
|
|
|||
|
|
@ -5150,7 +5150,7 @@ LLVoiceClient::participantState *LLVoiceClient::sessionState::addParticipant(con
|
|||
else
|
||||
{
|
||||
// Create a UUID by hashing the URI, but do NOT set mAvatarIDValid.
|
||||
// This tells both code in LLVoiceClient and code in llfloateractivespeakers.cpp that the ID will not be in the name cache.
|
||||
// This tells code in LLVoiceClient that the ID will not be in the name cache.
|
||||
setUUIDFromStringHash(result->mAvatarID, uri);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -522,8 +522,6 @@ with the same filename but different name
|
|||
<!--WARNING OLD ART BELOW *do not use*-->
|
||||
<texture name="icn_media_web.tga" preload="true" />
|
||||
<texture name="icn_media_movie.tga" preload="true" />
|
||||
<texture name="icn_speaker-muted_dark.tga" />
|
||||
<texture name="icn_speaker_dark.tga" />
|
||||
<texture name="icn_voice-localchat.tga" />
|
||||
<texture name="icn_voice-groupfocus.tga" />
|
||||
<texture name="icn_voice-pvtfocus.tga" />
|
||||
|
|
@ -545,10 +543,6 @@ with the same filename but different name
|
|||
<texture name="tearoffbox.tga" />
|
||||
<texture name="tearoff_pressed.tga" />
|
||||
|
||||
<texture name="icn_label_music.tga" />
|
||||
<texture name="icn_label_media.tga" />
|
||||
<texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114" />
|
||||
|
||||
<texture name="color_swatch_alpha.tga" preload="true" />
|
||||
|
||||
<texture name="button_anim_pause.tga" />
|
||||
|
|
@ -582,20 +576,6 @@ with the same filename but different name
|
|||
|
||||
<texture name="notify_caution_icon.tga" />
|
||||
|
||||
<texture name="icn_active-speakers-dot-lvl0.tga" />
|
||||
<texture name="icn_active-speakers-dot-lvl1.tga" />
|
||||
<texture name="icn_active-speakers-dot-lvl2.tga" />
|
||||
|
||||
<texture name="icn_voice_ptt-off.tga" />
|
||||
<texture name="icn_voice_ptt-on.tga" />
|
||||
<texture name="icn_voice_ptt-on-lvl1.tga" />
|
||||
<texture name="icn_voice_ptt-on-lvl2.tga" />
|
||||
<texture name="icn_voice_ptt-on-lvl3.tga" />
|
||||
<texture name="icn_voice-call-end.tga" />
|
||||
<texture name="icn_voice-call-start.tga" />
|
||||
|
||||
<texture name="mute_icon.tga" />
|
||||
|
||||
<texture name="default_land_picture.j2c" />
|
||||
<texture name="default_profile_picture.j2c" />
|
||||
<texture name="locked_image.j2c" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue