livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,578 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

6578 Commits (b90d1d0b6f60684ba2e97959c6a9d2df0ff8ec79)

Author SHA1 Message Date
Tofu Linden b90d1d0b6f merge. 2010-02-02 18:32:33 +00:00
Tofu Linden 7ba025b625 merge. 2010-02-02 18:19:36 +00:00
Denis Serdjuk 1da3feec8b merge 
--HG--
branch : product-engine
 2010-02-02 20:11:57 +02:00
Chuck Linden b817a9333c Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-02 12:33:54 -05:00
Chuck Linden 8920a18aff Updated filter text. 
http://jira.secondlife.com/browse/EXT-4844
 2010-02-02 12:32:38 -05:00
Tofu Linden cb57f65f68 merge. 2010-02-02 17:28:55 +00:00
Tofu Linden b6bc7d94f2 trivial comment fix while I was there! 2010-02-02 17:22:47 +00:00
Lynx Linden f937153a01 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-02 17:20:01 +00:00
Lynx Linden e563a07659 DEV-32540: Lots of object IM and SLurl improvements 
- Don't let object names that are URLs override links to display the
  remote object inspector

- Don't hyperlink the object name in the remote object inspector

- Made the <nolink>...</nolink> regex more robust and made it support
  non-URLs between the tags, so that we don't get random <nolink> tags
  when trying to disable URLs in user-typed text.

- Improved the llurlentry unit test and added some more test cases.

- Hooked up another LLViewerMessage code path to objectim SLapps to
  pass down the owner and slurl information.

- Made a few LLUrlEntryBase methods be const methods, because they are

- Fixed a bug in the remote object inspector where it would never show
  the teleport URL.
 2010-02-02 17:19:14 +00:00
Tofu Linden d51b7c4b34 merge. 2010-02-02 17:16:51 +00:00
Tofu Linden 3a428ed63a PE merge. 2010-02-02 17:06:14 +00:00
Chuck Linden b01854ed46 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-02 12:05:03 -05:00
Chuck Linden 353ed64274 Created new graphics for build tools "selected" states. 
http://jira.secondlife.com/browse/EXT-4357
 2010-02-02 12:04:42 -05:00
Sergei Litovchuk e367c41298 Working on (EXT-4347) Moving object contents to inventory opens files, changes menu. 
- Removing LLPanelPlaces dependency from open_inventory_offer handler.
- Added landmark offer handling to Places panel.

--HG--
branch : product-engine
 2010-02-02 18:48:40 +02:00
Vadim Savchuk 5fc508bbc2 Fixed major bug EXT-4811 ([BSI] Attempt to pay an object shows wrong Resident name in Pay Resident floater). 
Removed hardcoded payee name.

--HG--
branch : product-engine
 2010-02-02 18:19:39 +02:00
Tofu Linden 210fed642b PE merge. 2010-02-02 16:14:53 +00:00
Igor Borovkov 0a41542f23 reverted accidental change to floater_im_session.xml 
--HG--
branch : product-engine
 2010-02-02 18:00:45 +02:00
Igor Borovkov 250680a078 fixed EXT-4755 Own context menu in voice chat participants list has 'Add Friend' and 'Pay' enabled 
--HG--
branch : product-engine
 2010-02-02 17:58:29 +02:00
gabriel lee 9a4d079b92 merged new changes 2010-02-02 15:18:06 +00:00
Dmitry Zaporozhan 85cb82fdda Fixed normal bug EXT-4696 - Teleport offer window is not alligned to the center of game area 
--HG--
branch : product-engine
 2010-02-02 17:04:31 +02:00
gabriel lee 7c7bea0344 acted on code review advise, check some return pointers for nullness etc 2010-02-02 14:28:47 +00:00
Aimee Linden 6ea944b38f Supplementary fix EXT-4770 : Voice muting not working properly due to a change in the Vivox API 
The master voice mute in preferences wasn't working either, due to the minimum scaled volume now being 30 instead of 0.

Reviewed by Lynx.
 2010-02-02 14:10:38 +00:00
Denis Serdjuk 47162acede no ticket. Removing the hack from llfloater.This code is dangerous. It involved losing of topctrl in focusmgr and can cause strange bugs and problems. 
--HG--
branch : product-engine
 2010-02-02 14:49:58 +02:00
Igor Borovkov 5faa8b44d5 merge 
--HG--
branch : product-engine
 2010-02-02 14:39:28 +02:00
Igor Borovkov 0763fac765 added saving of nearby chat history - EXT-4777 Implement saving and loading chat history for Nearby Chat (both plain text and widgeted chat) 
--HG--
branch : product-engine
 2010-02-02 14:37:31 +02:00
Ychebotarev ProductEngine 0e9bf5e3e5 merge 
--HG--
branch : product-engine
 2010-02-02 14:36:17 +02:00
Ychebotarev ProductEngine 371885c373 fix for normal EXT-4810 Block hot-keys in mouse-look mode 
--HG--
branch : product-engine
 2010-02-02 14:35:37 +02:00
Paul Guslisty 81487c2a4c Fxed normal bug EXT - 4106 (Tabbed IM floater isn't highlighting labels when new IMs are received) 
--HG--
branch : product-engine
 2010-02-02 14:33:38 +02:00
Dmitry Zaporozhan 38315a063d Fixed normal bug EXT-4740 - Object inspector hides however context menu present 
--HG--
branch : product-engine
 2010-02-02 14:25:31 +02:00
Igor Borovkov f69510e20c added loading/parsing of Nearby Chat history - EXT-4777 Implement saving and loading chat history for Nearby Chat (both plain text and widgeted chat) 
--HG--
branch : product-engine
 2010-02-02 14:19:15 +02:00
Sergei Litovchuk 61609d93bb Fixed major bug (EXT-2316) Insert the option "pay" in the profile. 
- Restored fix made in viewer-2-0/product-engine changeset 4880:ff1363072741.

--HG--
branch : product-engine
 2010-02-02 14:01:54 +02:00
Ychebotarev ProductEngine fb174d1de3 merge 
--HG--
branch : product-engine
 2010-02-02 13:20:00 +02:00
Ychebotarev ProductEngine e6538ddbe9 fix for low EXT-4780 Nearby chat windows doesn't pop up when clicking on object chat toast 
--HG--
branch : product-engine
 2010-02-02 13:18:23 +02:00
gabriel lee 95d0df4ab0 merged back my last changes 2010-02-02 10:58:47 +00:00
Vadim Savchuk 9b0518dd8e Merge from default branch 
--HG--
branch : product-engine
 2010-02-02 12:17:29 +02:00
Ychebotarev ProductEngine 7f83000ea1 merge 
--HG--
branch : product-engine
 2010-02-02 11:15:56 +02:00
Ychebotarev ProductEngine ff4b80f271 sidefix for EXT-4808 Unfocused Snapshot floater covers aother floaters 
fix preview position

--HG--
branch : product-engine
 2010-02-02 11:13:43 +02:00
Monroe Linden 4ad357ec70 Fixes for EXT-4689 (Long-word chat spam cripples fps and/or disconnects client) 
Removed some unnecessary string copies in LLTextBase and LLNormalTextSegment by changing getWText() to return const LLWString& (instead of LLWString), and storing the result in a const LLWString& instead of an LLWString in places where the string doesn't need to be modified.

Made LLTextViewModel::getDisplay() also return const LLWString& instead of LLWString.

Removed a couple of unused local string variables in LLTextBase (the compiler flagged these after converting the local copies to const LLWString&).
 2010-02-01 17:51:30 -08:00
Rick Pasetto aeaaf90fd7 Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum 2010-02-01 16:30:39 -08:00
Rick Pasetto 9430b8de65 dos2unix these files 2010-02-01 16:29:52 -08:00
Rick Pasetto 83eda0d847 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-01 16:04:45 -08:00
Eric M. Tulla (BigPapi) 75b382a97c Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-01 18:44:36 -05:00
Chuck Linden 3989d67f4e Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-01 18:43:37 -05:00
Eric M. Tulla (BigPapi) e76dd651d4 EXT-4613: No longer get to throttle for quite folders (COF, trash, outfits, etc) 
-Reviewed by nyx
 2010-02-01 18:43:26 -05:00
Chuck Linden 62e41595a4 Disabled magnifying glass icon from filter editors. 
https://jira.secondlife.com/browse/EXT-4839
 2010-02-01 18:43:26 -05:00
Lis Linden 010b97ee25 Automated merge with ssh://lis@hg.lindenlab.com/viewer/viewer-2-0 2010-02-01 18:24:20 -05:00
Lis Linden 142b744062 ext-4435 Preferences: "Busy mode response" is brighter than other labels 2010-02-01 18:23:55 -05:00
Chuck Linden fdc32a367f Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-02-01 18:23:22 -05:00
Chuck Linden f119b1652d Added "Favorites Bar" label and tooltip. 
http://jira.secondlife.com/browse/EXT-4834
 2010-02-01 18:23:10 -05:00
Lis Linden 2fea74af06 Automated merge with ssh://lis@hg.lindenlab.com/viewer/viewer-2-0 2010-02-01 18:20:15 -05:00