Commit Graph

20306 Commits (606a809f2f4dd66ce9f21eb7fe1d44429905e97b)

Author SHA1 Message Date
Kitty Barnett 606a809f2f - added : 'save_tearoff_state' for floaters to track the torn off state of LLMultiFloater hosted floaters across viewer sessions
--HG--
branch : Chat-NearbyChat
2011-09-30 18:11:13 +02:00
Kitty Barnett d48c4ccee1 - changed : 'NearbyChatFloaterWindow' can be toggled at run-time
--HG--
branch : Chat-NearbyChat
2011-09-30 10:38:53 +02:00
Kitty Barnett 187f1e9d82 - added : optionally embed the nearby chat floater in the tabbed conversations floater
-> controlled by 'NearbyChatFloaterWindow' (currently requires a restart)

--HG--
branch : Chat-NearbyChat
2011-09-30 01:16:31 +02:00
Kitty Barnett 7768379ffb Merged with Chat-NearbyChat head from SL-2.8
--HG--
branch : Chat-NearbyChat
2011-09-29 00:32:58 +02:00
Kitty Barnett bb08bc9254 - changed : multi-line chat bar is now user-resizable
--HG--
branch : Chat-NearbyChat
2011-09-29 00:02:16 +02:00
Kitty Barnett 055f951fa1 - changed : changes to the 'NearbyChatFloaterBarType' setting take effect in real-time (rather than requiring a relog)
--HG--
branch : Chat-NearbyChat
2011-09-25 00:19:43 +02:00
Kitty Barnett 81a3238c96 Merged with Viewer-Build tip
--HG--
branch : Chat-NearbyChat
2011-09-22 11:12:07 +02:00
Kitty Barnett dc6156d4e9 merge of Viewer-Build
--HG--
branch : UI-Base
2011-09-22 11:11:43 +02:00
Kitty Barnett a200a71ea8 - internal : reviewed for SL-3.0
--HG--
branch : Chat-NearbyChat
2011-09-19 23:53:06 +02:00
Kitty Barnett 5a43038080 Merged with default tip (Revision a6a9f8b72b7e)
--HG--
branch : Chat-NearbyChat
2011-09-19 22:57:32 +02:00
Kitty Barnett 4a87f6c907 - internal : reviewed for SL-3.0
--HG--
branch : UI-Base
2011-09-19 22:56:33 +02:00
Kitty Barnett 9f76504c36 Merged with default tip (Revision a6a9f8b72b7e)
--HG--
branch : UI-Base
2011-09-19 22:03:42 +02:00
Kitty Barnett c4195f03bd - fixed : viewer crashes or refuses to start when TeamViewer is installed or running
-> see http://jira.phoenixviewer.com/browse/FIRE-3062

--HG--
branch : Viewer-Build
2011-09-14 18:31:23 +02:00
Kitty Barnett 7daf7c503c Merged with default tip (Revision a6a9f8b72b7e)
--HG--
branch : Viewer-Build
2011-09-06 12:44:36 +02:00
Kitty Barnett 229d26dccd - internal : updated patch description for Viewer-Build
--HG--
branch : Viewer-Build
2011-09-06 12:32:55 +02:00
Kitty Barnett dc15a97ec8 - fixed : Ctrl+Enter'ing or Shift+Enter'ing chat in the multiline chat bar won't save the chat in the line history
--HG--
branch : Chat-NearbyChat
2011-09-06 00:56:07 +02:00
Kitty Barnett 2b74491d38 - added : Shift+Enter to whisper from the chatbar(s)
--HG--
branch : Chat-NearbyChat
2011-09-05 23:42:51 +02:00
Kitty Barnett 121978b125 - fixed : "Click here to chat" hint text doesn't dissapear when focus is given to the multiline chatbar (thankies Mistress)
--HG--
branch : Chat-NearbyChat
2011-09-05 23:42:25 +02:00
Kitty Barnett 4f62758ef4 Merged with default tip (Revision 18bc647c70e4)
--HG--
branch : Viewer-Build
2011-09-02 16:30:24 +02:00
Debi King (Dessie) deddcfb8c5 Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aa 2011-09-02 10:13:04 -04:00
Debi King (Dessie) 5a39c44b56 merged .hgtags 2011-08-29 12:23:28 -04:00
Debi King (Dessie) f5a890453b Added tag DRTVWR-86_3.0.2-beta2, 3.0.2-beta2 for changeset e5c9af2d7980 2011-08-29 12:12:40 -04:00
Oz Linden 68a15f73c1 Added tag 3.0.3-start for changeset b95ddac176ac 2011-08-29 09:26:53 -04:00
Oz Linden f42f7130f5 merge changes for .v-pb 2011-08-29 09:25:31 -04:00
Oz Linden c34ab16ec1 merge tags back from viewer-beta 2011-08-29 09:23:59 -04:00
Oz Linden c4d52b813b merge tags from viewer-release 2011-08-29 09:21:47 -04:00
Debi King (Dessie) b8b596a5fe merged fix for EXP-1160 (STORM-1575) 2011-08-28 14:21:46 -04:00
Debi King (Dessie) a5e0bbab4a Added tag DRTVWR-83_3.0.2-beta1, 3.0.2-beta1 for changeset 42784bf50fa0 2011-08-28 14:17:02 -04:00
Debi King (Dessie) e840660669 merged .hgtags from viewer-release 2011-08-28 14:14:58 -04:00
Debi King (Dessie) 3d2378f102 merge from viewer-pre-release 2011-08-28 10:43:02 -04:00
Debi King (Dessie) f094d4f752 merge 2011-08-28 10:42:06 -04:00
Debi King (Dessie) ebb55355eb Added tag DRTVWR-78_3.0.0-release, 3.0.0-release for changeset 1778f26b6d0a 2011-08-28 10:41:31 -04:00
Kitty Barnett c229d447f2 Merged with UI-Base tip
--HG--
branch : Chat-NearbyChat
2011-08-26 23:20:26 +02:00
Richard Nelson 5a6f07ab64 disabled basic inventory root creation
reviewed by Stone
2011-08-26 14:01:30 -07:00
Kitty Barnett 0e1dec6665 Updated patch branch dependency
--HG--
branch : UI-Base
2011-08-26 22:13:32 +02:00
Richard Nelson 863d9bdc50 EXP-1160 FIX Cannot drag/drop items from inventory into the contents of a prim in latest Mesh build 239475
brought back some old logic for dispatching to child folder as drag and drop fallback
2011-08-26 12:57:16 -07:00
Oz Linden d45995b80d merge changes for storm-1568 2011-08-26 10:03:28 -04:00
Oz Linden 6f009080b9 merge changes for storm-1543 2011-08-26 10:02:23 -04:00
Vadim ProductEngine a4f132f1b8 STORM-1543 WIP Removed invalid IOR_BUSY response option.
Addressing review feedback.
2011-08-26 00:19:33 +03:00
Oz Linden 4057afd291 merge changes for storm-1268 2011-08-25 13:27:52 -04:00
Oz Linden 7c222dfd13 merge changes for storm-1542 2011-08-25 13:25:04 -04:00
Oz Linden f603d14339 merge changes for storm-1276 2011-08-25 13:24:48 -04:00
Oz Linden e6239b7978 merge changes for storm-1571 2011-08-25 09:27:34 -04:00
Oz Linden 66cac05cfb merge changes for storm-1570 2011-08-25 09:26:28 -04:00
Kitty Barnett 5916f8b2ed - added : ability to switch between the different nearby chat floater styles (requires restart)
--HG--
branch : Chat-NearbyChat
2011-08-24 20:44:22 +02:00
Kitty Barnett 3508d6685f - added : single-line chat bar to the nearby chat history floater
--HG--
branch : Chat-NearbyChat
2011-08-24 20:28:58 +02:00
Kitty Barnett 20ad8ac9ae - internal : readded multiline nearby chat bar option as floater_nearby_chat_multi.xml
--HG--
branch : Chat-NearbyChat
2011-08-24 18:09:52 +02:00
Kitty Barnett b81352f8fe - internal : revert floater_nearby_chat.xml back to the LL default
--HG--
branch : Chat-NearbyChat
2011-08-24 17:38:38 +02:00
Kitty Barnett 53716bb3b5 Merged with default tip (Revision 0fd2a1181a96)
--HG--
branch : UI-Base
2011-08-24 15:21:31 +02:00
Nat Goodspeed bf906ac926 Re-add 3 llinstancetracker tests disabled by changeset 1ead63777bf6.
Fix LLInstanceTracker::key_iter constructor param; accepting
InstanceMap::iterator by non-const reference relied on Microsoft extension
that accepts non-const reference to an rvalue. Given typical iterator
implementation, simply accept by value instead, which makes gcc happy too.
2011-08-24 09:08:42 -04:00