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 From a630008d05e813d1fe5ceda5f8511b7aed8b543a Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 30 Nov 2008 16:32:43 -0600 Subject: Package up README.txt, etc. on Linux. --- linden/indra/newview/viewer_manifest.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index be28809..bf2c5be 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -525,7 +525,7 @@ class DarwinManifest(ViewerManifest): class LinuxManifest(ViewerManifest): def construct(self): super(LinuxManifest, self).construct() - self.path("licenses-linux.txt","licenses.txt") + self.path("res/imprudence_icon.png","imprudence_icon.png") if self.prefix("linux_tools", dst=""): self.path("client-readme.txt","README-linux.txt") @@ -535,6 +535,29 @@ class LinuxManifest(ViewerManifest): self.path("register_secondlifeprotocol.sh") self.end_prefix("linux_tools") + # Top level directory (imprudence) + if self.prefix("../../..", dst=""): + self.path("README.txt", "README-Imprudence.txt") + self.path("MANIFESTO.txt") + self.path("CONTRIBUTE.txt") + self.path("ChangeLog.txt") + self.end_prefix("../../..") + + # linden directory + if self.prefix("../..", dst="doc"): + self.path("LICENSE-source.txt") + self.path("LICENSE-logos.txt","LICENSE-artwork.txt") + self.path("LICENSE-libraries-linux.txt") + self.end_prefix("../..") + + # linden/doc directory + if self.prefix("../../doc", dst="doc"): + self.path("contributions.txt") + self.path("GPL-license.txt", "GPL.txt") + self.path("FLOSS-exception.txt") + self.end_prefix("../../doc") + + # Create an appropriate gridargs.dat for this package, denoting required grid. self.put_in_file(self.flags_list(), 'gridargs.dat') -- cgit v1.1 From 54a503c06a00939c38dc72321cdbe4b78c80cf89 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 1 Dec 2008 00:45:11 -0700 Subject: Added 'Select Only Copyable' option in the Tools menu --- linden/indra/newview/app_settings/settings.xml | 11 +++++++++++ linden/indra/newview/llselectmgr.cpp | 3 ++- linden/indra/newview/llviewermenu.cpp | 13 +++++++++++++ .../indra/newview/skins/default/xui/en-us/menu_viewer.xml | 6 ++++++ 4 files changed, 32 insertions(+), 1 deletion(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 1d2da46..953d588 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -6676,6 +6676,17 @@ Value 0 + SelectCopyableOnly + + Comment + Select only objects you can copy + Persist + 1 + Type + Boolean + Value + 0 + SelectOwnedOnly Comment diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp index 2e4983c..90b1bd3 100644 --- a/linden/indra/newview/llselectmgr.cpp +++ b/linden/indra/newview/llselectmgr.cpp @@ -5745,7 +5745,8 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object) } if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) || - (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove())) + (gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()) || + (gSavedSettings.getBOOL("SelectCopyableOnly") && !object->permCopy())) { // only select my own objects return FALSE; diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 5e67712..c794b6a 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -6714,6 +6714,18 @@ class LLToolsSelectOnlyMovableObjects : public view_listener_t } }; +class LLToolsSelectOnlyCopyableObjects : public view_listener_t +{ + bool handleEvent(LLPointer event, const LLSD& userdata) + { + BOOL cur_val = gSavedSettings.getBOOL("SelectCopyableOnly"); + + gSavedSettings.setBOOL("SelectCopyableOnly", ! cur_val ); + + return true; + } +}; + class LLToolsSelectBySurrounding : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) @@ -9829,6 +9841,7 @@ void initialize_menus() addMenu(new LLToolsSelectTool(), "Tools.SelectTool"); addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects"); addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects"); + addMenu(new LLToolsSelectOnlyCopyableObjects(), "Tools.SelectOnlyCopyableObjects"); addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding"); addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection"); addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius"); diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 71044a0..aeef31a 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -608,6 +608,12 @@ userdata="movable" /> + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1 From 237b2c2d7e9c4844d4ca7c8f97b3a8b53eb9dec4 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 5 Dec 2008 05:00:17 -0700 Subject: Fixed blank url_history.xml creation. (VWR-5808) --- linden/indra/newview/llurlhistory.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp index ac3fa93..0dadbd0 100644 --- a/linden/indra/newview/llurlhistory.cpp +++ b/linden/indra/newview/llurlhistory.cpp @@ -72,9 +72,16 @@ bool LLURLHistory::loadFile(const std::string& filename) // static bool LLURLHistory::saveFile(const std::string& filename) -{ - std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter(); - llofstream out((temp_str + filename)); +{ + std::string temp_str = gDirUtilp->getLindenUserDir(); + if( temp_str.empty() ) + { + llwarns << "Can't save. No user directory set." << llendl; + return false; + } + + temp_str += gDirUtilp->getDirDelimiter() + filename; + llofstream out(temp_str); if (!out.good()) { llwarns << "Unable to open " << filename << " for output." << llendl; -- cgit v1.1 From 0febd03d39e36d2955c1869abeb2074fabc5c0fc Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 10 Dec 2008 21:56:24 -0600 Subject: Fixed bad string comparison (grid code name). [#22] Reported by Balp Allen. --- linden/indra/newview/llviewernetwork.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp index c8cffcf..2b5cc0c 100644 --- a/linden/indra/newview/llviewernetwork.cpp +++ b/linden/indra/newview/llviewernetwork.cpp @@ -163,7 +163,8 @@ std::string LLViewerLogin::getGridLabel() const std::string LLViewerLogin::getGridCodeName() const { - if( gGridInfo[mGridChoice].mCodeName == "" ) + // Fall back to grid label if code name is empty. + if( strcmp(gGridInfo[mGridChoice].mCodeName, "") == 0 ) { return getGridLabel(); } -- cgit v1.1 From a18b29075eabef8fb4caa02ba929407091ae4e35 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 10 Dec 2008 22:28:49 -0600 Subject: Better warning when url_history.xml save fails. --- linden/indra/newview/llurlhistory.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp index 0dadbd0..c10add4 100644 --- a/linden/indra/newview/llurlhistory.cpp +++ b/linden/indra/newview/llurlhistory.cpp @@ -76,7 +76,8 @@ bool LLURLHistory::saveFile(const std::string& filename) std::string temp_str = gDirUtilp->getLindenUserDir(); if( temp_str.empty() ) { - llwarns << "Can't save. No user directory set." << llendl; + llwarns << "Can't save " << filename + << ": No user directory set." << llendl; return false; } -- cgit v1.1 From eb6c9309a9d0c76da6153b8290d33d50f56b9786 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 10 Dec 2008 23:35:38 -0600 Subject: Fix grid selector having a duplicate entry. [#24] Patch by Balp Allen. --- linden/indra/newview/llpanellogin.cpp | 8 ++++++++ linden/indra/newview/llpanellogin.h | 1 + linden/indra/newview/llstartup.cpp | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp index 40a3a7f..a495516 100644 --- a/linden/indra/newview/llpanellogin.cpp +++ b/linden/indra/newview/llpanellogin.cpp @@ -712,6 +712,14 @@ void LLPanelLogin::addServer(const std::string& server, S32 domain_name) combo->setCurrentByIndex(0); } + +// static +void LLPanelLogin::setServer(S32 domain_name) +{ + LLComboBox* combo = sInstance->getChild("server_combo"); + combo->setCurrentByIndex(domain_name); +} + // static void LLPanelLogin::getFields(std::string &firstname, std::string &lastname, std::string &password, BOOL &remember) diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h index 539997b..78b0a22 100644 --- a/linden/indra/newview/llpanellogin.h +++ b/linden/indra/newview/llpanellogin.h @@ -87,6 +87,7 @@ public: const std::string& password, BOOL remember); static void addServer(const std::string& server, S32 domain_name); + static void setServer(S32 domain_name); static void refreshLocation( bool force_visible ); static void getFields(std::string& firstname, std::string& lastname, diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 625b1d8..6371f2b 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp @@ -2458,14 +2458,14 @@ void login_show() // UI textures have been previously loaded in doPreloadImages() LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL; - - LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice()); + LL_INFOS("AppInit") << "getGridChoice is " << LLViewerLogin::getInstance()->getGridChoice() << LL_ENDL; LLViewerLogin* vl = LLViewerLogin::getInstance(); for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index) { LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index); } + LLPanelLogin::setServer(LLViewerLogin::getInstance()->getGridChoice()-1); } // Callback for when login screen is closed. Option 0 = connect, option 1 = quit. -- cgit v1.1 From a7a5691d03624f7c70b99203d9d6ee00d2ffaf91 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 11 Dec 2008 14:28:45 -0600 Subject: Fixed bad string comparison (rel notes url) [#28] Reported by Balp Allen. --- linden/indra/newview/llfloaterabout.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index 59e3100..f6e7792 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp @@ -268,7 +268,7 @@ static std::string get_viewer_release_notes_url() std::ostringstream test_version; - if(IMP_VERSION_TEST != "") + if( strcmp(IMP_VERSION_TEST, "") != 0 ) test_version << "#" << "Imprudence_" << version.str() << "_" << IMP_VERSION_TEST; std::ostringstream url; -- cgit v1.1 From e99716b74d442e2aeb88e2dbd480f2e99a6797b3 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 11 Dec 2008 14:32:04 -0600 Subject: Simplified release notes URL scheme. Now uses e.g. "wiki/Release Notes/1.0.0-RC2", which is set up as a wiki redirect. --- linden/indra/newview/llfloaterabout.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index f6e7792..af436c5 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp @@ -263,16 +263,15 @@ static std::string get_viewer_release_notes_url() { std::ostringstream version; version << IMP_VERSION_MAJOR << "." - << IMP_VERSION_MINOR << "." - << IMP_VERSION_PATCH; - - std::ostringstream test_version; + << IMP_VERSION_MINOR << "." + << IMP_VERSION_PATCH; + // Append the test version if it's not empty if( strcmp(IMP_VERSION_TEST, "") != 0 ) - test_version << "#" << "Imprudence_" << version.str() << "_" << IMP_VERSION_TEST; + version << "-" << IMP_VERSION_TEST; std::ostringstream url; - url << RELEASE_NOTES_BASE_URL << version.str() << test_version.str(); + url << RELEASE_NOTES_BASE_URL << version.str(); return url.str(); } -- cgit v1.1 From 8186bd3db550d2a5cafd840679e8b13ff10a82b5 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 11 Dec 2008 16:29:43 -0600 Subject: Indentation cleanup. (llviewernetwork.cpp) --- linden/indra/newview/llviewernetwork.cpp | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp index 2b5cc0c..9019b88 100644 --- a/linden/indra/newview/llviewernetwork.cpp +++ b/linden/indra/newview/llviewernetwork.cpp @@ -110,34 +110,34 @@ void LLViewerLogin::setGridChoice(const std::string& grid_name) // The string can be: // - a grid label from the gGridInfo table // - an ip address - if(!grid_name.empty()) - { - // find the grid choice from the user setting. - int grid_index = GRID_INFO_NONE; - for(;grid_index < GRID_INFO_OTHER; ++grid_index) - { - if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name)) - { + if(!grid_name.empty()) + { + // find the grid choice from the user setting. + int grid_index = GRID_INFO_NONE; + for(;grid_index < GRID_INFO_OTHER; ++grid_index) + { + if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name)) + { // Founding a matching label in the list... setGridChoice((EGridInfo)grid_index); break; - } - } + } + } - if(GRID_INFO_OTHER == grid_index) - { - // *FIX:MEP Can and should we validate that this is an IP address? - mGridChoice = GRID_INFO_OTHER; - mGridName = grid_name; + if(GRID_INFO_OTHER == grid_index) + { + // *FIX:MEP Can and should we validate that this is an IP address? + mGridChoice = GRID_INFO_OTHER; + mGridName = grid_name; gSavedSettings.setS32("ServerChoice", mGridChoice); gSavedSettings.setString("CustomServer", mGridName); - } - } + } + } } void LLViewerLogin::resetURIs() { - // Clear URIs when picking a new server + // Clear URIs when picking a new server gSavedSettings.setValue("CmdLineLoginURI", LLSD::emptyArray()); gSavedSettings.setString("CmdLineHelperURI", ""); } -- cgit v1.1 From c42d9f8c6fe91b890b7cb4a0001a585f09f932ca Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 12 Dec 2008 17:12:22 -0600 Subject: README.txt will stay that name; README-linux.txt removed. --- linden/indra/newview/viewer_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 749cced..b0777f4 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -108,7 +108,7 @@ class ViewerManifest(LLManifest): def gather_documents(self): # From the top level directory (imprudence) if self.prefix("../../..", dst=""): - self.path("README.txt", "README-Imprudence.txt") + self.path("README.txt") self.path("MANIFESTO.txt") self.path("CONTRIBUTE.txt") self.path("ChangeLog.txt") @@ -569,7 +569,7 @@ class LinuxManifest(ViewerManifest): self.path("res/imprudence_icon.png","imprudence_icon.png") if self.prefix("linux_tools", dst=""): - self.path("client-readme.txt","README-linux.txt") + #self.path("client-readme.txt","README-linux.txt") #self.path("client-readme-voice.txt","README-linux-voice.txt") self.path("wrapper.sh","imprudence") self.path("handle_secondlifeprotocol.sh") -- cgit v1.1 From c9a8667dd778d9503ef25a48491c76784e88b41d Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 12 Dec 2008 22:35:58 -0600 Subject: Blanked the test version string. Not RC anymore. --- linden/indra/llcommon/llversionviewer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden/indra') diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index cddc654..ab7e415 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h @@ -45,6 +45,6 @@ const char * const IMP_VIEWER_NAME = "Imprudence"; const S32 IMP_VERSION_MAJOR = 1; const S32 IMP_VERSION_MINOR = 0; const S32 IMP_VERSION_PATCH = 0; -const char * const IMP_VERSION_TEST = "RC2"; +const char * const IMP_VERSION_TEST = ""; #endif -- cgit v1.1 From 76e573fa54157ea89c0fbce8d45cfe64fea149e0 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 12 Dec 2008 23:11:23 -0600 Subject: Added release notes. --- linden/indra/newview/viewer_manifest.py | 1 + 1 file changed, 1 insertion(+) (limited to 'linden/indra') diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index b0777f4..62c9537 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -111,6 +111,7 @@ class ViewerManifest(LLManifest): self.path("README.txt") self.path("MANIFESTO.txt") self.path("CONTRIBUTE.txt") + self.path("RELEASE_NOTES.txt") self.path("ChangeLog.txt") self.end_prefix("../../..") -- cgit v1.1 From 105fa110771594135c9b07088099b9487a8b7a45 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 23 Nov 2008 22:16:16 -0700 Subject: Added full comments to colors_base.xml files. --- linden/indra/newview/skins/default/colors_base.xml | 325 +++++++++--------- linden/indra/newview/skins/silver/colors_base.xml | 374 ++++++++++----------- 2 files changed, 347 insertions(+), 352 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml index 3b85efa..00007c4 100644 --- a/linden/indra/newview/skins/default/colors_base.xml +++ b/linden/indra/newview/skins/default/colors_base.xml @@ -1,189 +1,186 @@ - + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - - + + - - + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml index 19b6013..77c8f1f 100644 --- a/linden/indra/newview/skins/silver/colors_base.xml +++ b/linden/indra/newview/skins/silver/colors_base.xml @@ -1,188 +1,186 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1 From 6c98edcb1acf61601857d222658042857e3883a0 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 24 Nov 2008 10:07:22 -0700 Subject: Switched Invite and Leave buttons in group panel. --- linden/indra/newview/skins/default/xui/en-us/panel_groups.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml index 6fa099e..c47985b 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml @@ -25,15 +25,15 @@ label="IM/Call" left_delta="0" name="IM" tool_tip="Open Instant Message session" width="80" />