aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-082-1/+30
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-072-1/+30
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-071-1/+1
| | |\
| | | * minor: Comment out debug logging (at warn level) about number of objects ↵Justin Clark-Casey (justincc)2013-06-071-1/+1
| | | | | | | | | | | | | | | | force selected and turn down to debug level
| | * | Put the configuration back in FetchInventoryDesc2 cap.Diva Canto2013-06-071-0/+29
| | |/
| * | Supply proper type information for the various types of requestsMelanie2013-06-071-0/+1
| | |
| * | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-072-4/+4
| |/
| * Port Avination's inventory send throttlingMelanie2013-06-051-52/+213
| |
* | Merge branch 'avination-current' into careminsterMelanie2013-06-064-7/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | Fix multi-wear of alpha and tattoo layers.Melanie2013-05-311-4/+4
| | |
| * | Update the money framework to allow sending the new style linden "serverside ↵Melanie2013-05-251-16/+14
| | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored!
| * | Let the event queue do lees work - expire every 40s as per Teravus instead ↵Melanie2013-05-221-1/+1
| | | | | | | | | | | | of every seconds - whoever put that in....
| * | Explicitly zero avatar velocity on sitMelanie2013-05-131-0/+4
| | |
| * | Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-301-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case.
| * | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵Melanie2013-04-2816-202/+309
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into avination-current Conflicts: bin/Regions/Regions.ini.example
| | * | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵Melanie2013-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI.
| | * | Send 503 when throttling texturesMelanie2013-04-251-1/+33
| | | |
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-263-41/+58
| |\ \ \
| * \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-162-22/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-161-1/+4
| |\ \ \ \ \
| | * | | | | fix STATE udp queue data rate since it is in use again, after beingUbitUmarov2013-01-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | removed by intel folks (?)( should it be used or removed ??)
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-161-2/+12
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-131-2/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-091-0/+19
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-082-20/+295
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2013-01-021-27/+60
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-182-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-131-1/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-131-7/+22
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-111-2/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-071-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-12-0323-304/+1733
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-11-023-14/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-263-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-262-11/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-262-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-253-67/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-242-68/+128
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-244-22/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-232-41/+210
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-222-29/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-221-42/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-223-12/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-211-103/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-192-16/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-192-217/+310
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-181-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-183-63/+169
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-15/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-171-22/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-24 00:39:23 +0000