Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
fbb5dced974667d8981118ec691b2f62d21b624d
SingularityViewer/indra/llmessage
History
Aleric Inglewood fbb5dced97 Merge remote-tracking branch 'singu/master' into curlthreading2 
Conflicts:
	indra/llcommon/CMakeLists.txt
	indra/llmessage/llcurl.cpp
	indra/llmessage/llcurl.h
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llpumpio.cpp
	indra/llmessage/llpumpio.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp
	indra/newview/llspatialpartition.cpp
	indra/newview/llviewermedia.cpp
	indra/newview/llxmlrpctransaction.cpp

Conflicts resolved by choosing curlthreading2
for any llmessage file regardless (which looks
correct upon investigation); the rest also
turned out to need to use curlthreading2, except
in one line where I added a semi-colon after
an assert(), and the assert was changed in
singu/master.
2012-08-13 17:07:25 +02:00
..
tests
Few more GCC 4.7 fixes.
2012-04-29 00:25:40 -04:00
aicurl.cpp
Compile fix for DEBUG_CURLIO
2012-08-12 17:42:30 +02:00
aicurl.h
Suppress "Expect:" header for POST and PUT. No longer use CURLOPT_COPYPOSTFIELDS.
2012-08-12 16:34:20 +02:00
aicurlprivate.h
Suppress "Expect:" header for POST and PUT. No longer use CURLOPT_COPYPOSTFIELDS.
2012-08-12 16:34:20 +02:00
aicurlthread.cpp
Removed superfluous debug output
2012-08-09 07:02:42 +02:00
aicurlthread.h
Move PollSet out of the header file
2012-07-19 17:26:02 +02:00
CMakeLists.txt
Final compile/link bug fixes for debug_libcurl code.
2012-08-07 20:57:39 +02:00
debug_libcurl.cpp
Missing header
2012-08-12 17:10:44 +02:00
debug_libcurl.h
Compiler warning fixes. Take into account that debug_libcurl.cpp is no longer linked dynamically.
2012-08-08 01:58:49 +02:00
llares.cpp
Merge remote-tracking branch 'singu/master' into curlthreading2
2012-08-13 17:07:25 +02:00
llares.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llareslistener.cpp
And of course i forgot to add some files
2012-03-06 09:11:36 +01:00
llareslistener.h
And of course i forgot to add some files
2012-03-06 09:11:36 +01:00
llassetstorage.cpp
Turn llassert[_always] into a (single) statement and print line nr in decimal.
2012-06-30 21:14:18 +02:00
llassetstorage.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llavatarnamecache.cpp
RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.
2012-04-12 10:29:45 -05:00
llavatarnamecache.h
RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.
2012-04-12 10:29:45 -05:00
llblowfishcipher.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llblowfishcipher.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llbuffer.cpp
Further header cleanup and a few updates
2012-07-21 03:01:42 -04:00
llbuffer.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llbufferstream.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llbufferstream.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llcachename.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llcachename.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llchainio.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llchainio.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llcipher.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llcircuit.cpp
Pulled llpacketring.h and llhttpclient.h out of the precompiled header.
2012-08-09 22:50:05 -05:00
llcircuit.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llclassifiedflags.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llclassifiedflags.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llcurl.cpp
Fixed GCC47 issues and fmodex copying
2012-08-09 10:56:29 -04:00
llcurl.h
Fixed GCC47 issues and fmodex copying
2012-08-09 10:56:29 -04:00
lldatapacker.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lldatapacker.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lldbstrings.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lldispatcher.cpp
Further header cleanup and a few updates
2012-07-21 03:01:42 -04:00
lldispatcher.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lleventflags.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llfiltersd2xmlrpc.cpp
Further header cleanup and a few updates
2012-07-21 03:01:42 -04:00
llfiltersd2xmlrpc.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llfollowcamparams.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llhost.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llhost.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llhttpclient.cpp
Suppress "Expect:" header for POST and PUT. No longer use CURLOPT_COPYPOSTFIELDS.
2012-08-12 16:34:20 +02:00
llhttpclient.h
Merge branch 'shycurl' of github.com:singularity-viewer/SingularityViewer
2012-08-09 00:02:50 +02:00
llhttpclientadapter.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llhttpclientadapter.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llhttpclientinterface.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llhttpnode.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llhttpnode.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llhttpnodeadapter.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llhttpsender.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llhttpsender.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llinstantmessage.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llinstantmessage.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llinvite.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lliobuffer.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lliobuffer.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lliohttpserver.cpp
Further header cleanup and a few updates
2012-07-21 03:01:42 -04:00
lliohttpserver.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lliopipe.cpp
Fixed and adjusted remainders of isValid() code.
2012-07-15 22:46:38 +02:00
lliopipe.h
LLCurlRequest time out fixes.
2012-07-16 22:35:04 +02:00
lliosocket.cpp
Further header cleanup and a few updates
2012-07-21 03:01:42 -04:00
lliosocket.h
Random stab in the dark coming right up!
2012-07-22 11:26:36 +02:00
llioutil.cpp
Random stab in the dark coming right up!
2012-07-22 11:26:36 +02:00
llioutil.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llloginflags.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmail.cpp
Random stab in the dark coming right up!
2012-07-22 11:26:36 +02:00
llmail.h
Random stab in the dark coming right up!
2012-07-22 11:26:36 +02:00
llmessagebuilder.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessagebuilder.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessageconfig.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessageconfig.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessagereader.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessagereader.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessagesenderinterface.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessagetemplate.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessagetemplate.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessagetemplateparser.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessagetemplateparser.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessagethrottle.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmessagethrottle.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmime.cpp
Random stab in the dark coming right up!
2012-07-22 11:26:36 +02:00
llmime.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llmsgvariabletype.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llnamevalue.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llnamevalue.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llnullcipher.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llnullcipher.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llpacketack.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llpacketack.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llpacketbuffer.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llpacketbuffer.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llpacketring.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llpacketring.h
Pulled llpacketring.h and llhttpclient.h out of the precompiled header.
2012-08-09 22:50:05 -05:00
llpartdata.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llpartdata.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llproxy.cpp
Print all libcurl calls if -DDEBUG_CURLIO. Don't create static lib for cwdebug.
2012-08-05 18:51:21 +02:00
llproxy.h
Spelling fixes and stuff like that to AICurl* and llproxy.* documentations
2012-06-28 04:08:25 -04:00
llpumpio.cpp
Random stab in the dark coming right up!
2012-07-22 11:26:36 +02:00
llpumpio.h
Random stab in the dark coming right up!
2012-07-22 11:26:36 +02:00
llqueryflags.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llregionflags.h
LLViewerRegion WIP: Sync indra/llmessage/llregionflags.h with V3
2012-02-18 02:22:49 +01:00
llregionhandle.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llregionpresenceverifier.cpp
Fixed compile errors for gcc4.7 (also reported by clang)
2012-04-28 21:29:52 -04:00
llregionpresenceverifier.h
Fixed compile errors for gcc4.7 (also reported by clang)
2012-04-28 21:29:52 -04:00
llsdappservices.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llsdappservices.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llsdhttpserver.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llsdhttpserver.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llsdmessage.cpp
Merge remote-tracking branch 'singu/master' into curlthreading2
2012-08-13 17:07:25 +02:00
llsdmessage.h
LLViewerRegion WIP: Added all headers that are dragged in.
2012-02-18 02:22:49 +01:00
llsdmessagebuilder.cpp
Random stab in the dark coming right up!
2012-07-22 11:26:36 +02:00
llsdmessagebuilder.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llsdmessagereader.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llsdmessagereader.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llservice.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llservice.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llservicebuilder.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llservicebuilder.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llstoredmessage.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llstoredmessage.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltaskname.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llteleportflags.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltemplatemessagebuilder.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltemplatemessagebuilder.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltemplatemessagedispatcher.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltemplatemessagedispatcher.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltemplatemessagereader.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltemplatemessagereader.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llthrottle.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llthrottle.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltransfermanager.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltransfermanager.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltransfersourceasset.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltransfersourceasset.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltransfersourcefile.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltransfersourcefile.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltransfertargetfile.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltransfertargetfile.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltransfertargetvfile.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltransfertargetvfile.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltrustedmessageservice.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lltrustedmessageservice.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llurlrequest.cpp
Suppress "Expect:" header for POST and PUT. No longer use CURLOPT_COPYPOSTFIELDS.
2012-08-12 16:34:20 +02:00
llurlrequest.h
Merge branch 'shycurl' of github.com:singularity-viewer/SingularityViewer
2012-08-09 00:02:50 +02:00
lluseroperation.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
lluseroperation.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llvehicleparams.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llxfer_file.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llxfer_file.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llxfer_mem.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llxfer_mem.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llxfer_vfile.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llxfer_vfile.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llxfer.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llxfer.h
Clean up and updates
2012-07-20 08:13:07 -04:00
llxfermanager.cpp
Initial support for the Clang compiler and numerous warning fixes
2012-07-02 19:45:41 +00:00
llxfermanager.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llxorcipher.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
llxorcipher.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
machine.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
machine.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
mean_collision_data.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
message_prehash.cpp
Cleanup. Removal of dead code. Added/renamed object flag accessors.
2012-08-04 18:18:22 -05:00
message_prehash.h
Cleanup. Removal of dead code. Added/renamed object flag accessors.
2012-08-04 18:18:22 -05:00
message_string_table.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
message.cpp
Merge remote-tracking branch 'singu/master' into curlthreading2
2012-08-13 17:07:25 +02:00
message.h
Pulled llpacketring.h and llhttpclient.h out of the precompiled header.
2012-08-09 22:50:05 -05:00
net.cpp
Fixed compile errors for gcc4.7 (also reported by clang)
2012-04-28 21:29:52 -04:00
net.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
partsyspacket.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
partsyspacket.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
patch_code.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
patch_code.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
patch_dct.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
patch_dct.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
patch_idct.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
sound_ids.cpp
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00
sound_ids.h
Wholesale update of llmessage to V3.2
2012-03-06 07:31:15 +01:00