aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* merge conflitsUbitUmarov2016-11-1921-267/+618
|\
| * REST console v2. This is an incompatible protocol change. It degrades gracefu...Melanie Thielker2016-11-191-56/+265
| * Fix the previous commitMelanie Thielker2016-11-191-2/+51
| * search accout by id not volatil user name (HG)UbitUmarov2016-11-181-1/+2
| * add expire time for aliensUbitUmarov2016-11-182-7/+28
| * avoid a null ref. (needs better way)UbitUmarov2016-11-181-0/+6
| * restore higher resolution clock on udpserver and lower uaeraccouts caching timeUbitUmarov2016-11-182-15/+9
| * revert to lower resolution clock on udpserver for testingUbitUmarov2016-11-181-5/+7
| * put back skip of first drip callUbitUmarov2016-11-181-1/+1
| * a few more changes on potencial mem issuesUbitUmarov2016-11-184-2/+19
| * counting issus safeguardUbitUmarov2016-11-171-2/+4
| * explicitly remove some references, and other useless changesUbitUmarov2016-11-175-97/+126
| * add a missing disposeUbitUmarov2016-11-171-0/+7
| * minor changes to ubMeshmerizer memory useUbitUmarov2016-11-172-68/+67
| * restore large useracconts expire time for testingUbitUmarov2016-11-171-2/+4
| * fix a debug messageUbitUmarov2016-11-171-2/+2
| * minor: dont let rcvd agentupdates time jump backUbitUmarov2016-11-163-12/+34
* | Merge branch 'master' into httptestsUbitUmarov2016-11-1642-7945/+786
|\ \ | |/
| * fix parsing of a vector4 and storing on a lsl quaternion needed for lightSha...UbitUmarov2016-11-162-5/+30
| * minor change to getdisplaynames cap urlUbitUmarov2016-11-162-46/+5
| * change camera collision check rulesUbitUmarov2016-11-141-23/+34
| * fix a vector range parsingUbitUmarov2016-11-141-1/+1
| * fix unack bytes stats reportUbitUmarov2016-11-141-1/+3
| * reduce calls to physics world cast rays for camera collision checkUbitUmarov2016-11-143-51/+55
| * Merge branch 'master' of opensimulator.org:/var/git/opensimUbitUmarov2016-11-134-51/+47
| |\
| | * BulletSim: update avatar velocity setting to the new TargetVelocity pattern.Robert Adams2016-11-134-51/+47
| * | prevent self call to llSetScriptState(ownname,FALSE) from blocking entire engineUbitUmarov2016-11-134-6/+14
| |/
| * mantis 8055: fix default value of npc optionsUbitUmarov2016-11-122-12/+12
| * ubOde fix a multhreading timming issueUbitUmarov2016-11-121-2/+2
| * Update gitignore to include VS user config folder and remove old FxCop file w...AliciaRaven2016-11-112-7242/+1
| * reduce diferencs btw OpenSimDefaults.ini and OpenSim.ini.exampleUbitUmarov2016-11-112-25/+54
| * reduce useraccouts cache timeUbitUmarov2016-11-112-54/+5
| * GetUserAccounts cannot cache null accountsUbitUmarov2016-11-103-5/+13
| * ubOde: add a needed lockUbitUmarov2016-11-101-5/+11
| * also cache not found useraccounts when search by ID. Change the expire time t...UbitUmarov2016-11-103-13/+11
| * on Select use again the priority queues to send ObjectProperties, including p...UbitUmarov2016-11-102-41/+34
| * fix some invalid string.format argumentsUbitUmarov2016-11-097-9/+108
| * stop warning about integer division cast to floatUbitUmarov2016-11-092-5/+4
| * move UserAccountCache access locking to its methods and not callers.UbitUmarov2016-11-093-55/+54
| * minor cleanupUbitUmarov2016-11-091-6/+9
| * also log estimated average Util.GetTimeStampMS() resolutionUbitUmarov2016-11-091-3/+15
| * change the clock source on udp outgoing, remove some dead codeUbitUmarov2016-11-093-153/+10
| * change the clock source on tokenBucketUbitUmarov2016-11-081-13/+11
| * change display and log of normal script errorsUbitUmarov2016-11-081-20/+47
| * add some configuration options missing in OpenSimDeafults.ini but present in...UbitUmarov2016-11-081-1/+33
| * partially revert commit f29d5ad662387b97d9e881f28df584dc19fa8c07: if mesh ass...UbitUmarov2016-11-071-135/+141
| * a few more changes on the avatars Velocity/TargetVelocity/SetMomentum. Need t...UbitUmarov2016-11-071-1/+29
| * start removing old hack of using SetMomentum to just set instant velocity, no...UbitUmarov2016-11-073-7/+39
* | Merge branch 'master' into httptestsUbitUmarov2016-11-0711-118/+209
|\ \ | |/
| * add a few more lsl constants for attachmentsUbitUmarov2016-11-071-0/+15