Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into httptests | UbitUmarov | 2017-06-02 | 2 | -4/+4 |
|\ | |||||
| * | change child agents close control; disablesimulator is not a caps event message | UbitUmarov | 2017-05-31 | 2 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-31 | 1 | -153/+2 |
|\ \ | |/ | |||||
| * | remove the option to store baked textures on assets service, thats suicide ↵ | UbitUmarov | 2017-05-31 | 1 | -153/+2 |
| | | | | | | | | use xbakes | ||||
| * | mono is a total crap | UbitUmarov | 2017-05-29 | 1 | -5/+0 |
| | | |||||
| * | cleanup util.cs get dns | UbitUmarov | 2017-05-29 | 1 | -1/+1 |
| | | |||||
| * | add temporary debug msgs | UbitUmarov | 2017-05-29 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-27 | 3 | -6/+5 |
|\ \ | |/ | |||||
| * | make BlockingQueue.Dequeue timeouts more coerent (just less than watchdog ↵ | UbitUmarov | 2017-05-26 | 3 | -6/+5 |
| | | | | | | | | timeout) | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-25 | 3 | -12/+18 |
|\ \ | |/ | |||||
| * | minor changes | UbitUmarov | 2017-05-25 | 2 | -4/+10 |
| | | |||||
| * | make a few more threads background ones | UbitUmarov | 2017-05-25 | 1 | -1/+1 |
| | | |||||
| * | make some threads background ones | UbitUmarov | 2017-05-25 | 2 | -2/+2 |
| | | |||||
| * | remove use of libomv BlockingQueue | UbitUmarov | 2017-05-25 | 2 | -5/+5 |
| | | |||||
* | | merge master | UbitUmarov | 2017-05-23 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | fix IClientIPEndpoint broken by justin long ago.. but stop using it | UbitUmarov | 2017-05-22 | 1 | -1/+1 |
| | | | | | | | | | | except on SceneBanner, later it my be also removed from there and everywhere | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-14 | 1 | -5/+1 |
|\ \ | |/ | |||||
| * | fix remote requests for dwell, so dwell module still called | UbitUmarov | 2017-05-14 | 1 | -5/+1 |
| | | |||||
| * | fix some issue on parcels loading and make parcels dwell show something. ↵ | UbitUmarov | 2017-05-14 | 1 | -1/+1 |
| | | | | | | | | Resolution is 2.5min aprox. | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-05-12 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | avoid a null ref | UbitUmarov | 2017-05-11 | 1 | -2/+2 |
| | | |||||
* | | fix merge | UbitUmarov | 2017-05-07 | 1 | -2/+3 |
|\ \ | |/ | |||||
| * | let StreamReader be in using statements | UbitUmarov | 2017-05-07 | 1 | -2/+3 |
| | | |||||
* | | merge fix | UbitUmarov | 2017-05-04 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | do the same in the cases we are just moving parts around and not changing ↵ | UbitUmarov | 2017-05-04 | 1 | -1/+1 |
| | | | | | | | | their caches (ie their taskInventory) | ||||
* | | fix merge | UbitUmarov | 2017-04-25 | 4 | -140/+164 |
|\ \ | |/ | |||||
| * | move mesh pbs creation code out of mesh upload code into to ↵ | UbitUmarov | 2017-04-25 | 1 | -71/+14 |
| | | | | | | | | PrimitiveBaseShape.cs | ||||
| * | cosmetics on mesh upload encoding of number of faces on pbs shape. Use ↵ | UbitUmarov | 2017-04-25 | 1 | -23/+36 |
| | | | | | | | | opensim shape enums in place of libovm for coerence, add a few coments. | ||||
| * | finish encoding number of mesh faces in pbs shape on new meshs upload, and ↵ | UbitUmarov | 2017-04-25 | 2 | -23/+27 |
| | | | | | | | | *HACK* flag it setting hollow shape to triangle. (some limited encoding as added some months ago, but only for viewers LOD). Use this hack flag to fix sop number of faces. old meshs will still report 8 faces, information to fix this seems lost unless the mesh asset is decoded | ||||
| * | several changes for osTeleportObject | UbitUmarov | 2017-04-15 | 1 | -2/+12 |
| | | |||||
| * | add functions to send entity updates imediatly, except for avatars (or now) ↵ | UbitUmarov | 2017-04-14 | 1 | -8/+56 |
| | | | | | | | | they should be use to bypass normal delayed updates, for debug | ||||
| * | fix the meaning of objectDuplicate[OnRay]() flags parameter but still not ↵ | UbitUmarov | 2017-01-19 | 1 | -3/+3 |
| | | | | | | | | using it | ||||
| * | Permissions module: GenerateClientFlags() no need to keep looking for the ↵ | UbitUmarov | 2017-01-17 | 1 | -55/+55 |
| | | | | | | | | same part several times; fix locked mask in GetObjectPermissions() | ||||
| * | add more calls to effective permissions aggregation, some paths may still be ↵ | UbitUmarov | 2017-01-17 | 2 | -5/+6 |
| | | | | | | | | missing on objects changes, but remove the aggregation on check paths, so all can be tested. | ||||
| * | change GenerateClientFlags(...) to work with a scenepresence; make use of ↵ | UbitUmarov | 2017-01-11 | 1 | -9/+14 |
| | | | | | | | | the new IsGod to check its God rights; remove the non standard estate manager right to move other ppl prims i added on last commits; coment out a test method i added sometime ago | ||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-01-07 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Correct casing on isGod and isViewerUIGod | Melanie Thielker | 2017-01-07 | 1 | -1/+1 |
| | | |||||
| * | replace godlevel compares by the new faster bool isViewerUIGod | UbitUmarov | 2017-01-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-01-07 | 1 | -1/+7 |
|\ \ | |/ | |||||
| * | Remove a red ink error on shutdown. Harmless message since shutting down anyway | Melanie Thielker | 2017-01-07 | 1 | -1/+7 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2017-01-06 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | Restructure god level and permissions | Melanie Thielker | 2017-01-06 | 2 | -2/+2 |
| | | | | | | | | | | Create a class GodController which controls all aspects of god level, viewer modes and user levels at ScenePresence level. | ||||
* | | fix merge | UbitUmarov | 2017-01-05 | 35 | -495/+499 |
|\ \ | |/ | |||||
| * | Massive tab and trailing space cleanup | Melanie Thielker | 2017-01-05 | 35 | -477/+477 |
| | | |||||
| * | a few changes to Gods ( ie administrators) control | UbitUmarov | 2017-01-05 | 1 | -22/+26 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-30 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | forgot one gc.collect wait for finalizers | UbitUmarov | 2016-12-29 | 1 | -1/+5 |
| | | |||||
* | | some cleanup | UbitUmarov | 2016-12-27 | 1 | -6/+1 |
| | | |||||
* | | Merge branch 'master' into httptests | UbitUmarov | 2016-12-23 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | Remove obsolete config option "EventQueue". It's been always on for ages! | Melanie Thielker | 2016-12-20 | 1 | -2/+1 |
| | |