From b2b670d787eaa1789b87a62178c970dfb20c02d2 Mon Sep 17 00:00:00 2001 From: Thickbrick Sleaford Date: Sat, 21 Aug 2010 01:41:27 +0300 Subject: VWR-20752 (SNOW-586) Align planar-mapped textures across different faces. Port of svn changset 3458 from Snowglobe, with minor tweaks. --- doc/contributions.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 9df072e937..f451c5732e 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -212,6 +212,8 @@ Dzonatas Sol VWR-1705 VWR-1729 VWR-1812 +Eddi Decosta + SNOW-586 Eddy Stryker VWR-15 VWR-23 @@ -632,6 +634,7 @@ Tharax Ferraris VWR-605 Thickbrick Sleaford SNOW-207 + SNOW-586 SNOW-743 VWR-7109 VWR-9287 -- cgit v1.3 From 5361e6826f186783c95e01804cec97be37910bec Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 25 Aug 2010 10:58:49 -0700 Subject: VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patch --- doc/contributions.txt | 3 +++ indra/newview/llagent.cpp | 5 +++++ indra/newview/llagent.h | 2 ++ indra/newview/llviewermenu.cpp | 23 ++++++++++++++++++---- .../skins/default/xui/en/menu_attachment_self.xml | 13 +++++++++++- .../skins/default/xui/en/menu_avatar_self.xml | 12 ++++++++++- .../default/xui/en/menu_inspect_self_gear.xml | 10 ++++++++++ 7 files changed, 62 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 9df072e937..7bdd287fb1 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -127,6 +127,8 @@ Asuka Neely VWR-8179 Balp Allen VWR-4157 +Be Holder + SNOW-397 Benja Kepler VWR-746 Biancaluce Robbiani @@ -153,6 +155,7 @@ Boroondas Gupte SNOW-503 SNOW-510 SNOW-527 + SNOW-610 SNOW-624 VWR-233 WEB-262 diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 42b78a84af..b78ebc6969 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -827,6 +827,11 @@ LLVector3d LLAgent::getPosGlobalFromAgent(const LLVector3 &pos_agent) const return pos_agent_d + mAgentOriginGlobal; } +void LLAgent::sitDown() +{ + setControlFlags(AGENT_CONTROL_SIT_ON_GROUND); +} + //----------------------------------------------------------------------------- // resetAxes() diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 0d95683a98..c643cef78f 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -345,6 +345,8 @@ private: //-------------------------------------------------------------------- public: void standUp(); + /// @brief ground-sit at agent's current position + void sitDown(); //-------------------------------------------------------------------- // Busy diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 476e761c28..d02e1fdc8f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -3381,8 +3381,21 @@ class LLSelfStandUp : public view_listener_t bool enable_standup_self() { - bool new_value = isAgentAvatarValid() && gAgentAvatarp->isSitting(); - return new_value; + return isAgentAvatarValid() && gAgentAvatarp->isSitting(); +} + +class LLSelfSitDown : public view_listener_t + { + bool handleEvent(const LLSD& userdata) + { + gAgent.sitDown(); + return true; + } + }; + +bool enable_sitdown_self() +{ + return isAgentAvatarValid() && !gAgentAvatarp->isSitting() && !gAgent.getFlying(); } // Used from the login screen to aid in UI work on side tray @@ -8037,11 +8050,13 @@ void initialize_menus() // Admin top level view_listener_t::addMenu(new LLAdminOnSaveState(), "Admin.OnSaveState"); - // Self pie menu + // Self context menu view_listener_t::addMenu(new LLSelfStandUp(), "Self.StandUp"); + enable.add("Self.EnableStandUp", boost::bind(&enable_standup_self)); + view_listener_t::addMenu(new LLSelfSitDown(), "Self.SitDown"); + enable.add("Self.EnableSitDown", boost::bind(&enable_sitdown_self)); view_listener_t::addMenu(new LLSelfRemoveAllAttachments(), "Self.RemoveAllAttachments"); - enable.add("Self.EnableStandUp", boost::bind(&enable_standup_self)); view_listener_t::addMenu(new LLSelfEnableRemoveAllAttachments(), "Self.EnableRemoveAllAttachments"); // we don't use boost::bind directly to delay side tray construction diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index e2348375d5..84e81397be 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -23,7 +23,7 @@ - + + + + + - + + + + diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml index ea18e02ca1..30c2cde552 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml @@ -5,6 +5,16 @@ mouse_opaque="false" visible="false" name="Gear Menu"> + + + + Date: Fri, 27 Aug 2010 17:32:41 +0200 Subject: SNOW-766: Add a 'printbuilddirs' command to develop.py --- doc/contributions.txt | 1 + indra/develop.py | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index f451c5732e..f4619bff5c 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -64,6 +64,7 @@ Aleric Inglewood VWR-12691 VWR-13996 VWR-14426 + SNOW-766 Ales Beaumont VWR-9352 Alissa Sabre diff --git a/indra/develop.py b/indra/develop.py index 3c88bb8a01..36c947327a 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -742,9 +742,10 @@ Options: -p | --project=NAME set the root project name. (Doesn't effect makefiles) Commands: - build configure and build default target - clean delete all build directories, does not affect sources - configure configure project by running cmake (default command if none given) + build configure and build default target + clean delete all build directories, does not affect sources + configure configure project by running cmake (default if none given) + printbuilddirs print the build directory that will be used Command-options for "configure": We use cmake variables to change the build configuration. @@ -762,15 +763,6 @@ Examples: ''' def main(arguments): - if os.getenv('DISTCC_DIR') is None: - distcc_dir = os.path.join(getcwd(), '.distcc') - if not os.path.exists(distcc_dir): - os.mkdir(distcc_dir) - print "setting DISTCC_DIR to %s" % distcc_dir - os.environ['DISTCC_DIR'] = distcc_dir - else: - print "DISTCC_DIR is set to %s" % os.getenv('DISTCC_DIR') - setup = setup_platform[sys.platform]() try: opts, args = getopt.getopt( @@ -832,6 +824,14 @@ For example: develop.py configure -DSERVER:BOOL=OFF""" if cmd in ('cmake', 'configure'): setup.run_cmake(args) elif cmd == 'build': + if os.getenv('DISTCC_DIR') is None: + distcc_dir = os.path.join(getcwd(), '.distcc') + if not os.path.exists(distcc_dir): + os.mkdir(distcc_dir) + print "setting DISTCC_DIR to %s" % distcc_dir + os.environ['DISTCC_DIR'] = distcc_dir + else: + print "DISTCC_DIR is set to %s" % os.getenv('DISTCC_DIR') for d in setup.build_dirs(): if not os.path.exists(d): raise CommandError('run "develop.py cmake" first') @@ -842,6 +842,9 @@ For example: develop.py configure -DSERVER:BOOL=OFF""" if args: raise CommandError('clean takes no arguments') setup.cleanup() + elif cmd == 'printbuilddirs': + for d in setup.build_dirs(): + print >> sys.stdout, d else: print >> sys.stderr, 'Error: unknown subcommand', repr(cmd) print >> sys.stderr, "(run 'develop.py --help' for help)" -- cgit v1.3