aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Fix sensor cone for sensing avatarsMelanie Thielker2010-05-031-1/+12
| | | | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-306-146/+87
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-305-145/+85
| |\ \ \ \
| | * | | | * XInventory fairly tested, including for HG. Almost ready to switch.Diva Canto2010-04-305-145/+85
| | | | | | | | | | | | | | | | | | | | | | | | * Removed a few buglets and added better exception handling.
| * | | | | Fix a null ref from trying to access a dictionary that was never initialized.Melanie2010-04-301-1/+2
| |/ / / /
| * | | | Fix some symbol errorsMelanie2010-04-301-2/+2
| | | | |
* | | | | Fix linking issue introduced in my earlier commitMelanie Thielker2010-04-301-1/+19
| | | | |
* | | | | Fix some symbol errorsMelanie2010-04-301-2/+2
| | | | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-304-281/+284
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-302-279/+282
| |\ \ \ \
| | * | | | Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.Diva Canto2010-04-292-279/+282
| | | | | |
| * | | | | Fix link security issueMelanie2010-04-306-42/+69
| |/ / / /
* | | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-306-40/+67
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-306-40/+67
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Fix link security issueMelanie2010-04-306-40/+67
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-298-10/+661
|\ \ \ \ | | |_|/ | |/| |
| * | | Started redoing HGInventoryBroker for XInventory and with multi-protocol in ↵Diva Canto2010-04-293-0/+645
| | | | | | | | | | | | | | | | mind. Unfinished.
| * | | Merge branch 'minor-stuff'Melanie2010-04-284-10/+13
| |\ \ \
| | * | | Compiler.cs contained method GetCompilerOutput which, apparently,unknown2010-04-281-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was not used, but exactly the same path was calculated inline. This patch does some minor refactoring by replacing inline path calculation with GetCompilerOutput. This doesn't actually affect anything, just minor prettifying of the code
| | * | | Spelling in FriendsModule.cs: "filed to load" -> "failed to load"unknown2010-04-281-1/+1
| | | | |
| | * | | Minor spelling corrections in MiniModule: "RetreiveAsset" changed tounknown2010-04-282-5/+5
| | | | | | | | | | | | | | | | | | | | "RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
| * | | | XInventory connector/handler showing signs of life. Tested, but needs more ↵Diva Canto2010-04-272-0/+3
| |/ / / | | | | | | | | | | | | testing.
* | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-292-43/+45
|\ \ \ \ | | |/ / | |/| |
| * | | Fix Av jump motion S/WKitto Flora2010-04-291-2/+2
| | | |
| * | | Fix vertical attractorKitto Flora2010-04-291-41/+43
| | | |
* | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-272-11/+21
|\ \ \ \ | |/ / /
| * | | Adding some more SNMP events and some refactoringsacha2010-04-232-8/+14
| | | | | | | | | | | | | | | | Signed : The Masqued Foxi
| * | | Adding LinkUp/LinkDown when a region is started or stoped.sacha2010-04-232-3/+7
| | | | | | | | | | | | | | | | Those two events could be used to compute the region availibility
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-271-0/+324
|\ \ \ \ | | |/ / | |/| |
| * | | RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵Diva Canto2010-04-261-0/+324
| | | | | | | | | | | | | | | | default configs yet.
| * | | Fix build break.Melanie2010-04-271-17/+17
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-272-6/+3
|\ \ \ \ | |/ / /
| * | | Add a parameter to prim inventory update to prevent event firingMelanie2010-04-272-18/+26
| | | |
| * | | * Commenting SQLiteNG out of prebuild.xml, because it's making compile fail ↵Diva Canto2010-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from! * IRegionModule.cs wants to be committed too -- EOF.
| * | | minor: eliminate configuration section handling deprecation of ↵Justin Clark-Casey (justincc)2010-04-231-6/+0
| | | | | | | | | | | | | | | | OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
| * | | add a comment about deprecating IRegionModuledahlia2010-04-231-0/+3
| | | |
* | | | Add a parameter to prim inventory update to prevent event firingMelanie Thielker2010-04-272-1/+8
| | | |
* | | | Make scripted attachment states work. Finally. Also replace two monitor locksMelanie Thielker2010-04-253-14/+35
| | | | | | | | | | | | | | | | with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
* | | | Use the saved script statesMelanie Thielker2010-04-242-2/+36
| | | |
* | | | Plumb a data path to initialize an attachment from an alternate sourceMelanie Thielker2010-04-244-4/+26
| | | |
* | | | Add an additional serialization call do the detach procedure. This call isMelanie Thielker2010-04-231-0/+3
| | | | | | | | | | | | | | | | | | | | executed only for it's side effects, which are to block until attach(NULL_KEY) completes, before commencing detachment.
* | | | Remove debug output, the culprit has been identifiedMelanie Thielker2010-04-233-8/+0
| | | |
* | | | Fix a nullref in attachment handling. Add some debug to find the attachmentMelanie Thielker2010-04-234-1/+10
| | | | | | | | | | | | | | | | state issue
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-215-28/+113
|\ \ \ \ | |/ / /
| * | | Make the detection cone in attachments face in the direction of the avatar,Melanie2010-04-211-0/+9
| | | | | | | | | | | | | | | | not the relative rotation of the attachment towards the avatar.
| * | | minor: change a comment and replace some magic numbers with the AssetType enumJustin Clark-Casey (justincc)2010-04-191-3/+3
| | | |
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-1914-31/+113
| |\ \ \
| | * | | Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-192-2/+2
| | | | |
| * | | | Make the "notecard saved" text appear in the saver rather than the notecard ↵Justin Clark-Casey (justincc)2010-04-193-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owner, if the notecard is saved by a permitted group member This means moving the alert up to a place where the IClientAPI is available. One can also argue that such client messages shouldn't be sent directly from the scene data model
| * | | | If a transfer request is received for a task inventory item asset, then ↵Justin Clark-Casey (justincc)2010-04-192-50/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | route the permissions request through the existing CanEditScript() and CanEditNotecard() methods. This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions. Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts. For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts