aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy ↵UbitUmarov2012-03-131-1/+1
| | | | with it disabled...
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-131-2/+2
|\
| * Ensure child prims of a phantom prim are marked as phantomMelanie2012-03-131-2/+2
| |
* | initial suport for ExtraPhysical parts parameters. Reading from llclientView ↵UbitUmarov2012-03-137-22/+281
|/ | | | to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
* Refactor, move OjectChangeData into it's own file and renameMelanie2012-03-136-165/+133
| | | | | ObjectChnageWhat what into ObjectChangeType change. What is no name for a variable or type!
* Restore duplication of the SL bug where linking phantom to solid lets theMelanie2012-03-121-3/+2
| | | | child prim remain phantom
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-03-124-16/+68
|\
| * allocate UndoRedoStore only on demandUbitUmarov2012-03-121-10/+17
| |
| * ubitode prim select was not doing phantom caseUbitUmarov2012-03-121-6/+17
| |
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-121-0/+33
| |\
| | * Allow RLV to redirect received folders to #RLV folderMelanie2012-03-111-0/+33
| | |
| * | missing file in ubitODEUbitUmarov2012-03-121-0/+1
| | |
* | | Add AVATAR_MALE flag to return values of llGetAgentInfoMelanie2012-03-122-0/+6
|/ /
* | ubitOde also knows a bit more about physical phantomUbitUmarov2012-03-111-29/+142
| |
* | Physical phantoms testable with chOde. Volume detection was changed and ↵UbitUmarov2012-03-111-138/+145
| | | | | | | | also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED ***
* | bug fix (??) in sog copy()UbitUmarov2012-03-111-10/+19
| |
* | more phantom physics ( chODE and a fix in manager physicsactorUbitUmarov2012-03-112-62/+121
| |
* | initial steps to support physical phantomsUbitUmarov2012-03-116-13/+73
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-1110-147/+275
|\ \ | |/
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-03-1110-147/+275
| |\
| | * Merge branch 'master' into careminsterMelanie2012-03-1110-147/+275
| | |\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-109-111/+236
| | | |\
| | | | * Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate ↵Justin Clark-Casey (justincc)2012-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread. This was previous behaviour anyway.
| | | | * minor: In IAR save, log when we start adding the control file rather than ↵Justin Clark-Casey (justincc)2012-03-101-2/+3
| | | | | | | | | | | | | | | | | | | | saying afterwards that we added it.
| | | | * minor: rearrange some save oar messages so they say what they're about to do ↵Justin Clark-Casey (justincc)2012-03-101-8/+7
| | | | | | | | | | | | | | | | | | | | rather than what they've just done.
| | | | * On OAR saving, try fetch assets serially rather than firing all the requests ↵Justin Clark-Casey (justincc)2012-03-102-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at the asset service at once. This may (or may not) improve reliability for http://opensimulator.org/mantis/view.php?id=5898 Quick tests show that save time is the same.
| | | | * Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-101-64/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is configured in the new [Estates] section of OpenSim.ini. If a default estate is configured then all new regions are automatically joined to it instead of asking the user. If the default estate does not already exist then it is created. Current default behaviour remains the same - the user is asked for estate details when necessary. Thanks to Frenando Oliveira for the patch which I adapated further.
| | | | * Factor out common default animations code into SLUtil. LLClientView now ↵Justin Clark-Casey (justincc)2012-03-094-62/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy. As per opensim-users mailing list discussion.
| | | * | Serialize all web requests to a particular host:port pair; only applied to ↵Mic Bowman2012-03-091-0/+41
| | | | | | | | | | | | | | | | | | | | the PostToService variants.
| * | | | Merge branch 'ubitwork'Melanie2012-03-1111-234/+706
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | cleanup + commentsUbitUmarov2012-03-111-277/+0
| | | | |
* | | | | cleanup + commentsUbitUmarov2012-03-111-167/+52
| | | | |
* | | | | coments change..UbitUmarov2012-03-111-3/+3
| | | | |
* | | | | minor changes on updates control on doChangeObject(..)UbitUmarov2012-03-111-10/+48
| | | | |
* | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-115-7/+121
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Merge branch 'master' into careminsterMelanie2012-03-095-7/+121
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-094-6/+85
| | |\ \ | | | |/
| | | * More on inventory transfer hold ups:Diva Canto2012-03-093-5/+84
| | | | | | | | | | | | | | | | | | | | | | | | - Added an inventory cache for caching root and system folders - Synchronized the remote inventory connector, so that all the remote inventory calls are serialized This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
| | | * More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-092-2/+2
| | | |
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-084-88/+36
| | | |\
| | | * | More on the freeze on HG inventory transfers: spawn a threadlet on the ↵Diva Canto2012-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | functional asset posts so that the client threads doesn't freeze (but the network posts are serialized).
| | * | | fix for NPC not playing internal animationssatguru srivastava2012-03-091-1/+36
| | | |/ | | |/|
* | | | Changed undo redo internals. moved exec code to UndoState.cs from sop that ↵UbitUmarov2012-03-112-136/+195
| | | | | | | | | | | | | | | | now only sees a unified UndoRedoStore class, added size limit on buffers so only last 5 undo/redo are kept. (5 is hardcode like it was ) ***UNTESTED***
* | | | BIG MESS. changed Iclient interface so only one event is used to inform ↵UbitUmarov2012-03-1010-139/+543
| | | | | | | | | | | | | | | | scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
* | | | ubitOde bugUbitUmarov2012-03-091-2/+4
| | | |
* | | | on linking update linked parts physical flags acording to new parent ones ( ↵UbitUmarov2012-03-091-1/+8
|/ / / | | | | | | | | | untested )
* | | let chode and ubitode find ode.dll on windowsUbitUmarov2012-03-092-0/+7
| | |
* | | Merge branch 'ubitwork'Melanie2012-03-094-112/+194
|\ \ \
| * | | more changes on undo/redo group scaling seems to work betterUbitUmarov2012-03-092-14/+9
| | | |
| * | | more changes in undo/redo. Basicly moved control to llclientview.cs. later ↵UbitUmarov2012-03-093-100/+187
| | | | | | | | | | | | | | | | we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken