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

73 Commits (05935d09124db6834ed7262b94de7558b6738590)

Author SHA1 Message Date
WoLf 65185139cc First sweep of changes for settings (and a few functions) from Phoenix prefix to FS. 2011-10-10 06:10:45 +02:00
Arrehn 8de8a5f1cf Merge with RLVa 2.8, part 1 
Known issues:
- RLV Debug method commented out
- RLV Windlight options not implemented
 2011-08-27 01:21:37 -04:00
Arrehn fa58cafc14 Merge from Kitty Barnett's RLVa 1.4 2011-08-06 13:59:08 -07:00
Arrehn 61cb88c510 Mini-merge up to FS-tip. Note: Reverted OSX Lion build sdk changes, due to failure to produce a viable build on snowleopard. 2011-08-05 11:35:59 -04:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Kadah_Coba 01225e468c STORM-1453 - Allow setting object price without needing to commit the object for sale at the default 10L first 2011-07-21 18:00:11 -07:00
Kadah_Coba d7455460e5 Fix for VWR-21522 Prevent unintended 10L sale 
Fixed being unable to mark for sale if the object is activly changing via scripts or by other action
Code clean up
 2011-06-29 17:08:42 -07:00
Kadah e90716bf87 Merge with some changes make to white space and comments for STORM-1453 2011-06-28 14:58:09 -07:00
Kadah 9e2f60ea8c Build Improvements: Don't clear pending sale info changes on idle refresh 2011-06-26 12:10:07 -07:00
Kadah 808f402437 Build Improvements: ALways show last owner and some minor layout adjustments 2011-06-24 14:38:22 -07:00
Kadah cb70c66c24 Build Improvements: Require confirm before setting object for sale (PhoenixCommitForSaleOnChange enables old behavior) 2011-06-23 16:43:21 -07:00
Kadah a05f466969 Build Improvements: Clickable group name on build floater 2011-06-19 11:46:56 -07:00
Kitty Barnett a713ffa247 Merged with default tip (Revision ddfc2ed6aee1) 
--HG--
branch : RLVa
 2011-05-25 13:37:12 +02:00
Arrehn 6f0c3bebec FIRE-777, Change name/description of several selected prims at the same time (experimental), by Satomi Ahn 2011-04-24 08:24:02 -04:00
Kitty Barnett c8ce7ff76f - merge : anonymize names on the build floater when @shownames=n restricted 
--HG--
branch : RLVa
 2010-11-02 18:30:52 +01:00
Kitty Barnett 9caae12457 - review : fixed spelling of "anonymize*" (blame Arrehn) 
--HG--
branch : RLVa
 2010-11-01 02:11:31 +01:00
Kitty Barnett 1c2ef4090a Merged with default tip (Revision f20bf424bd86) 
--HG--
branch : RLVa
 2010-10-30 17:28:00 +02:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Kitty Barnett 33997d0695 - internal : moved several rlvXXX helper and RlvHandler member functions into an RlvUtil helper class 
--HG--
branch : RLVa
 2010-08-29 04:00:55 +02:00
Kitty Barnett e6e551cb41 Merged with default tip (Revision 7a739cbdce56) 
--HG--
branch : RLVa
 2010-08-28 02:06:00 +02:00
Kitty Barnett 5a834cabd1 - fixed : object owner name isn't anonimized when @shownames=n restricted 
-> fixed on the Edit floater
    -> fixed on the "Object Profile" sidebar panel
    -> fixed on the object inspector
- changed : anonimize object creator name when @shownames=n restricted if object owner matches object creator, or if the creator is a nearby agent
    -> we're not obscuring the profile thumbnail so leaving the name untouched means the anonym could be matched to the actual avie name

--HG--
branch : RLVa
 2010-08-25 04:54:50 +02:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b 
back-out the back-out for this branch.  yay.
 2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21 
Backing out this merge that I pushed (prematurely) to the wrong place.
 2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Richard Nelson 566e3969f9 deprecated LLPanel::child*() methods 2010-07-30 10:02:30 -07:00
James Cook 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -07:00
Yuri Chebotarev 5e0de9609d fix for EXT-3868 Edit Window: Group name shown when no object is selected 
--HG--
branch : product-engine
 2010-03-22 15:37:22 +02:00
James Cook 9dd7924b19 Merge 2010-02-11 10:09:23 -08:00
richard ddfc6efbee EXT-5025 - Tooltips block mouse clicks 
EXT-4547	[BSI] it is possible to highlight multiple layers of chat
EXT-3844 	Mouse wheel camera zoom is not reflected on View popup slider
EXT-3103 	Add an option to restrict entering non-ascii symbols in text editor.

reviewed by Leyla
 2010-02-05 11:32:33 -08:00
James Cook 146e9d5e4d Support returning full_name (and SLID) for LLCacheName::get() calls 
Changed callback signature to full_name instead of first_name,last_name
Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
Change Pay dialog names to SLURL links
Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit
Consolidate name first + " " + last concatenation in LLCacheName::buildFullName()
Reviewed with Kelly
 2010-02-01 17:06:18 -08:00
Loren Shih ef35d12ec0 Incorporated code formatting cleanup from llsidepaneltaskinfo into llpanelpermissions. 
No functionality changes.

--HG--
branch : avatar-pipeline
 2009-12-08 13:25:03 -05:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it 
Cuts number of includes of llnotifications.h from 300+ to 40.
 2009-11-25 01:15:50 -08:00
James Cook 458430be91 Removed include llnotifications.h from llfloater.h trying to speed builds 
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
 2009-11-24 22:13:10 -08:00
angela b6ad65c04e EXT-2094 Add click-to-zoom as a one-click settable option for objects 2009-11-19 15:02:05 +08:00
James Cook 15cbc0abd8 EXT-2403 Object name, description now forced to be ASCII characters only 
Also fixes EXT-172, EXT-2399.  Semantics now are:
Object name, object desc, parcel name, region name, inventory item name
all are ASCII only.
Parcel desc allows arbitrary Unicode chars.
Group names force ASCII only.
Reviewed with Leyla
 2009-11-17 16:07:48 -08:00
James Cook 0daf4297d4 EXT-2484 Auto Set Touch to Buy when a user checks the For Sale option 
Reviewed with Richard.
 2009-11-13 16:16:12 -08:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. 
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
 2009-10-03 23:40:28 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
 2009-08-27 19:00:18 +00:00
Steven Bennetts 0bf4b5f222 merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0 
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
 2009-08-12 01:12:27 +00:00
Richard Nelson eb853f55c0 svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-08-04 01:12:59 +00:00
James Cook ca51e8f33d Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes. 
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
 2009-07-27 16:50:01 +00:00
Steven Bennetts 73a97010e6 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-07-21 00:57:23 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 
ignore-dead-branch
 2009-06-21 08:04:56 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337 
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
 2009-04-16 23:45:35 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Kent Quirk 667ca55bad svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
Melinda Green e1d8dac25a svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 
Resolving QAR-1051 Merge featurettes batch #4
 2008-12-15 21:21:19 +00:00
Adam Moss fd46865a50 QAR-1040 maint-viewer-11 + OpenAL combo mergeme 
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
 2008-12-02 20:35:40 +00:00