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

23 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Paul ProductEngine 890c583289 MAINT-119 FIXED (PUBLIC]no-transfer textures not searchable via texture picker) 
- Implemented Richard's and Leo's spec
- Also fixed an issue when applying no-transfer texture for an object using texture picker, creates redundant copies of the texture in the object's content
 2012-05-22 20:01:22 +03:00
Oz Linden 7bdf37f00c storm-1037: remove the "hide url" checkboxes in parcel management 2011-03-03 14:22:37 -05: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
Tofu Linden 332cf3d32a merge from viewer-release 2010-08-03 13:33:55 +01:00
Vadim Savchuk b12201bf01 EXT-6542 Localized the "none/none" in the About land floater. 
This is an additional fix to the one made in rev. 6788ff579917.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/828/

--HG--
branch : product-engine
 2010-08-02 19:04:32 +03:00
Richard Nelson 566e3969f9 deprecated LLPanel::child*() methods 2010-07-30 10:02:30 -07:00
Dmitry Zaporozhan 1ce1e7f9a1 Fixed EXT-6542(normal) - [HARD CODED] - Land-Info, Medien: none/none needs to be localized 
Added "DefaultMimeType" string to strings.xml to make "none/none" mime type localizable.
Replaced all occurrences of "none/none" string with call to static method.

Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/265/

--HG--
branch : product-engine
 2010-04-20 11:11:33 +03:00
Monroe Williams cf9239cabc svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
 2009-10-01 02:35:53 +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 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 cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
 2009-05-04 17:43:26 +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
Jon Wolk ae464867e6 svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601 2008-07-15 00:41:08 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 
dataserver-is-deprecated
 2008-06-26 00:39:00 +00:00
Steven Bennetts b5936a4b1d 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
 2008-04-03 19:21:14 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release 
QAR-424
 2008-04-01 17:45:04 +00:00
Callum Prentice 34527df740 Updated header comments with our public license statement that reflects their public nature. DEV-10766 
Not reviewed (no code changes - only comments)
 2008-02-21 21:25:17 +00:00
Steven Bennetts 2e32d44e71 merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 
QAR-290 = QAR-271 + QAR-191
 2008-02-19 21:42:32 +00:00
Josh Bell 98fd90ddd6 svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release 
QAR-275 Parcel Media

Sam made me do it.
 2008-02-14 01:45:59 +00:00