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

killing terrain tab

Browse Source
This commit is contained in:
Siana Gearz
2011-03-11 03:47:13 +01:00
parent fc1fc600d9
commit ed457e3539
3 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llfloaterworldmap.cpp
View File

@@ -167,7 +167,6 @@ LLFloaterWorldMap::LLFloaterWorldMap()
{ {
LLCallbackMap::map_t factory_map; LLCallbackMap::map_t factory_map;
factory_map["objects_mapview"] = LLCallbackMap(createWorldMapView, NULL); factory_map["objects_mapview"] = LLCallbackMap(createWorldMapView, NULL);
factory_map["terrain_mapview"] = LLCallbackMap(createWorldMapView, NULL);
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_world_map.xml", &factory_map); LLUICtrlFactory::getInstance()->buildFloater(this, "floater_world_map.xml", &factory_map);
} }
@@ -184,19 +183,6 @@ BOOL LLFloaterWorldMap::postBuild()
LLPanel *panel; LLPanel *panel;
panel = mTabs->getChild<LLPanel>("objects_mapview");
if (panel)
{
mTabs->setTabChangeCallback(panel, onCommitBackground);
mTabs->setTabUserData(panel, this);
}
panel = mTabs->getChild<LLPanel>("terrain_mapview");
if (panel)
{
mTabs->setTabChangeCallback(panel, onCommitBackground);
mTabs->setTabUserData(panel, this);
}
// The following callback syncs the worlmap tabs with the images. // The following callback syncs the worlmap tabs with the images.
// Commented out since it was crashing when LLWorldMap became a singleton. // Commented out since it was crashing when LLWorldMap became a singleton.
// We should be fine without it but override the onOpen method and put it // We should be fine without it but override the onOpen method and put it
@@ -1566,17 +1552,6 @@ void LLFloaterWorldMap::flyToAvatar()
} }
} }
// static
void LLFloaterWorldMap::onCommitBackground(void* userdata, bool from_click)
{
LLFloaterWorldMap* self = (LLFloaterWorldMap*) userdata;
// Find my index
S32 index = self->mTabs->getCurrentPanelIndex();
LLWorldMap::getInstance()->setCurrentLayer(index);
}
void LLFloaterWorldMap::updateSims(bool found_null_sim) void LLFloaterWorldMap::updateSims(bool found_null_sim)
{ {
if (mCompletingRegionName == "") if (mCompletingRegionName == "")

2
indra/newview/llfloaterworldmap.h
View File

@@ -123,8 +123,6 @@ protected:
static void onAvatarComboPrearrange( LLUICtrl* ctrl, void* data ); static void onAvatarComboPrearrange( LLUICtrl* ctrl, void* data );
static void onAvatarComboCommit( LLUICtrl* ctrl, void* data ); static void onAvatarComboCommit( LLUICtrl* ctrl, void* data );
static void onCommitBackground(void* data, bool from_click);
static void onComboTextEntry( LLLineEditor* ctrl, void* data ); static void onComboTextEntry( LLLineEditor* ctrl, void* data );
static void onSearchTextEntry( LLLineEditor* ctrl, void* data ); static void onSearchTextEntry( LLLineEditor* ctrl, void* data );

9
indra/newview/skins/default/xui/en-us/floater_world_map.xml
View File

@@ -2,13 +2,8 @@
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
height="711" min_height="520" min_width="410" name="worldmap" height="711" min_height="520" min_width="410" name="worldmap"
rect_control="FloaterWorldMapRect2" title="World Map" width="1243"> rect_control="FloaterWorldMapRect2" title="World Map" width="1243">
<tab_container bottom="-701" follows="left|top|right|bottom" height="681" left="15" <panel bottom="-701" follows="left|top|right|bottom" height="681"
mouse_opaque="false" name="maptab" tab_position="top" width="995"> left="15" mouse_opaque="true" name="objects_mapview" width="995" />
<panel bottom="-680" follows="left|top|right|bottom" height="664" label="Objects"
left="1" mouse_opaque="true" name="objects_mapview" width="993" />
<panel bottom="-680" follows="left|top|right|bottom" height="664" label="Terrain"
left="1" mouse_opaque="true" name="terrain_mapview" width="993" />
</tab_container>
<icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16" <icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self" image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self"
width="16" /> width="16" />