From cc6b4fd23f32db5c7e66083043cc3ff5f03c2f52 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 21 Nov 2008 17:01:01 -0700 Subject: Applied patch to show friends dots as yellow (VWR-3336) --- linden/indra/newview/llviewerregion.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'linden/indra') diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp index 08dc979..2944d9d 100644 --- a/linden/indra/newview/llviewerregion.cpp +++ b/linden/indra/newview/llviewerregion.cpp @@ -1022,6 +1022,8 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg) U8 z_pos = 0; U32 pos = 0x0; + + LLUUID agent_id = LLUUID::null; S16 agent_index; S16 target_index; @@ -1034,6 +1036,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg) msg->getU8Fast(_PREHASH_Location, _PREHASH_X, x_pos, i); msg->getU8Fast(_PREHASH_Location, _PREHASH_Y, y_pos, i); msg->getU8Fast(_PREHASH_Location, _PREHASH_Z, z_pos, i); + msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id, i); //llinfos << " object X: " << (S32)x_pos << " Y: " << (S32)y_pos // << " Z: " << (S32)(z_pos * 4) @@ -1059,6 +1062,7 @@ void LLViewerRegion::updateCoarseLocations(LLMessageSystem* msg) pos <<= 8; pos |= z_pos; mMapAvatars.put(pos); + mMapAvatarIDs.put(agent_id); } } } -- cgit v1.1 From 23ab8d114f3038b8425613cd0c74adb160d0bf2f Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 22 Nov 2008 13:16:39 -0700 Subject: Friends dots show as yellow and color can be set in colors.xml --- linden/indra/newview/llcolorscheme.cpp | 5 +---- linden/indra/newview/llcolorscheme.h | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llcolorscheme.cpp b/linden/indra/newview/llcolorscheme.cpp index ef8b4a8..460f1a2 100644 --- a/linden/indra/newview/llcolorscheme.cpp +++ b/linden/indra/newview/llcolorscheme.cpp @@ -37,8 +37,6 @@ LLColor4 gTrackColor; LLColor4 gSelfMapColor; -LLColor4 gAvatarMapColor; -LLColor4 gFriendMapColor; LLColor4 gLandmarkMapColor; LLColor4 gLocationMapColor; LLColor4 gTelehubMapColor; @@ -56,8 +54,7 @@ void init_colors() gDisabledTrackColor.setVec( 0.5f, 0.f, 0.f, 1.f ); gSelfMapColor = LLColor4::white; - gAvatarMapColor = LLColor4::green; - gFriendMapColor = LLColor4::yellow; + // fleshy color //gAvatarMapColor.setVec( 255.f/255.f, 223.f/255.f, 170.f/255.f, 1.f); diff --git a/linden/indra/newview/llcolorscheme.h b/linden/indra/newview/llcolorscheme.h index e772b11..bf1e053 100644 --- a/linden/indra/newview/llcolorscheme.h +++ b/linden/indra/newview/llcolorscheme.h @@ -36,8 +36,6 @@ extern LLColor4 gTrackColor; extern LLColor4 gSelfMapColor; -extern LLColor4 gAvatarMapColor; -extern LLColor4 gFriendMapColor; extern LLColor4 gLandmarkMapColor; extern LLColor4 gLocationMapColor; extern LLColor4 gTelehubMapColor; -- cgit v1.1 From c782860f23e11dc46af043ac16d4209b0853bbb6 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 22 Nov 2008 13:18:13 -0700 Subject: Friends dots show as yellow and color can be set in colors.xml --- linden/indra/newview/llnetmap.cpp | 7 +- linden/indra/newview/llnetmap.h | 3 + linden/indra/newview/llworldmapview.cpp | 8 +- linden/indra/newview/llworldmapview.h | 2 + linden/indra/newview/skins/default/colors_base.xml | 2 + linden/indra/newview/skins/silver/colors_base.xml | 378 +++++++++++---------- 6 files changed, 207 insertions(+), 193 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp index b277998..22dee9d 100644 --- a/linden/indra/newview/llnetmap.cpp +++ b/linden/indra/newview/llnetmap.cpp @@ -69,7 +69,7 @@ #include "llglheaders.h" -const F32 MAP_SCALE_MIN = 64; +const F32 MAP_SCALE_MIN = 32; const F32 MAP_SCALE_MID = 172; const F32 MAP_SCALE_MAX = 512; const F32 MAP_SCALE_INCREMENT = 16; @@ -97,6 +97,9 @@ LLNetMap::LLNetMap( mPixelsPerMeter = gMiniMapScale / REGION_WIDTH_METERS; LLNetMap::sRotateMap = gSavedSettings.getBOOL( "MiniMapRotate" ); + + glyph_color_avatar = gColors.getColor("NetMapGlyphColorAvatar"); + glyph_color_friend = gColors.getColor("NetMapGlyphColorFriend"); // Surface texture is dynamically generated/updated. // createObjectImage(); @@ -411,7 +414,7 @@ void LLNetMap::draw() } LLWorldMapView::drawAvatar( pos_map.mV[VX], pos_map.mV[VY], - show_as_friend ? gFriendMapColor : gAvatarMapColor, + show_as_friend ? glyph_color_friend : glyph_color_avatar, pos_map.mV[VZ]); } } diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h index 3fb20cc..91027c5 100644 --- a/linden/indra/newview/llnetmap.h +++ b/linden/indra/newview/llnetmap.h @@ -84,7 +84,10 @@ protected: public: LLHandle mPopupMenuHandle; + LLColor4 mBackgroundColor; + LLColor4 glyph_color_avatar; + LLColor4 glyph_color_friend; F32 mScale; // Size of a region in pixels F32 mPixelsPerMeter; // world meters to map pixels diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp index 92d9588..0d266dd 100644 --- a/linden/indra/newview/llworldmapview.cpp +++ b/linden/indra/newview/llworldmapview.cpp @@ -208,6 +208,8 @@ LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect ) mTextBoxNorthWest = new LLTextBox( std::string("NW"), minor_dir_rect ); mTextBoxNorthWest->setColor( minor_color ); addChild( mTextBoxNorthWest ); + + glyph_color_avatar = gColors.getColor("NetMapGlyphColorAvatar"); } @@ -886,8 +888,8 @@ void LLWorldMapView::drawAgents() S32 agent_count = info.mExtra; sim_agent_count += info.mExtra; // Here's how we'd choose the color if info.mID were available but it's not being sent: - //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? gFriendMapColor : gAvatarMapColor; - drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor); + //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? glyph_color_friend : glyph_color_avatar; + drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar); } LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim } @@ -902,7 +904,7 @@ void LLWorldMapView::drawAgents() region_center[VY] += REGION_WIDTH_METERS / 2; // Reduce the stack size as you zoom out - always display at lease one agent where there is one or more S32 agent_count = (S32)(((num_agents-1) * agents_scale + (num_agents-1) * 0.1f)+.1f) + 1; - drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, gAvatarMapColor); + drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar); } } } diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h index 915a196..53f0bdd 100644 --- a/linden/indra/newview/llworldmapview.h +++ b/linden/indra/newview/llworldmapview.h @@ -189,6 +189,8 @@ public: handle_list_t mVisibleRegions; // set every frame static std::map sStringsMap; + + LLColor4 glyph_color_avatar; }; #endif diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml index 3b85efa..a3e8d62 100644 --- a/linden/indra/newview/skins/default/colors_base.xml +++ b/linden/indra/newview/skins/default/colors_base.xml @@ -140,6 +140,8 @@ + + diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml index 19b6013..fb46a3f 100644 --- a/linden/indra/newview/skins/silver/colors_base.xml +++ b/linden/indra/newview/skins/silver/colors_base.xml @@ -1,188 +1,190 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1