Age | Commit message (Collapse) | Author |
|
|
|
|
|
headless mesa
|
|
request from similator and display a notification
Reviewed by Simon
|
|
|
|
Privacy" changes. Many naming changes for the featureto be "See avatars"
instead of "hidden avatars". Also removed the "anyone can edit terrain"
checkbox and slammed the value to FALSE.
|
|
change to "hidden avatars"
|
|
|
|
Reviewed by Kelly.
|
|
|
|
llRegionSayTo(), which is new
|
|
adjustment
|
|
(highlight in red) as an internal function in the script editor
|
|
|
|
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
|
|
|
|
Checker: REVERSE_INULL
Function: LLScriptEventHandler::recurse(_iobuf *, int, int, e_lscript_compile_pass, e_lscript_prune_type, int &, LLScriptScope *, e_lscript_types &, e_lscript_types, unsigned long long &, LLScriptByteCodeChunk *, LLScriptByteCodeChunk *, int, LLScriptScopeEntry *, int, LLScriptLibData **)
|
|
Checker: UNINIT_CTOR
Function: LLScriptState::LLScriptState(int, int, e_lscript_state_type, LLScriptIdentifier *, LLScriptEventHandler *)
File: /indra/lscript/lscript_compile/lscript_tree.h
|
|
Checker: UNINIT_CTOR
Function: LLScriptStateChange::LLScriptStateChange(int, int, LLScriptIdentifier *)
File: /indra/lscript/lscript_compile/lscript_tree.h
|
|
Checker: UNINIT_CTOR
Function: LLScriptScript::LLScriptScript(LLScritpGlobalStorage *, LLScriptState *)
File: /indra/lscript/lscript_compile/lscript_tree.cpp
|
|
--HG--
branch : product-engine
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
will be available in our next public release. The server part of the
fix missed 1.30, but should (hopefully) get into 1.32.
Original fix was reviewed by soft and kelly.
|
|
|
|
|
|
|
|
viewer-2.0.0-3
Includes:
* DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips
* DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor
* Some cleanup to llerror so that it doesn't depend on llfixedbuffer
* A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
|
|
merge (r131929).
Some minor post-merge cleanups still required.
|
|
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
|
|
Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
QAR-1691
|
|
QAR-1654 merge completed.
|
|
ignore-dead-branch
|
|
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.
reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
|
|
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Merge server 1.25 back to trunk
Conflicts:
C indra/llcommon/llversionserver.h : svn reverted
C indra/tools/bill/MoneyMachine.pm : one conflict, only difference
was a blank line.
C indra/newsim/lllslmanager.cpp : kept merge-right, in consultation
C indra/newsim/lllslmanager.h : with babbage
C indra/newsim/llagentinfo.cpp : (runNested, not runSpecial)
C indra/test/test_entity_query.py : Kept merge-right
C indra/test/test_agent_linden_dollar.py : Kept merge-right
--> Kartic fixed these testes in server-1.25
C indra/test/template/httpd.tmpl : Kept merge-right
(the IfModule version)
|
|
svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel-stats-merge
|
|
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
|
|
|