Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-03 | 8 | -949/+360 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-05-03 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-05-02 | 1 | -0/+2 | |
| | |\ \ \ \ | ||||||
| | * | | | | | * Untested Suggestion from lkalif to change | Teravus Ovares (Dan Olivares) | 2010-05-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remoteClient.SendMapBlock(blocks, 0); to remoteClient.SendMapBlock(blocks, 2); in OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||||
| * | | | | | | Make in-place sale send CHANGED_OWNER again | Melanie | 2010-05-03 | 1 | -0/+3 | |
| | | | | | | | ||||||
| * | | | | | | Defer sending of CHANGED_OWNER to make it work on rezzed objects and | Melanie | 2010-05-03 | 1 | -3/+4 | |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | attachments in addition to objects sold in place | |||||
| * | | | | | Add URL_REQUEST_* script constants | Melanie | 2010-05-03 | 1 | -0/+2 | |
| |/ / / / | ||||||
| * | | | | Renamed HGInventoryBroker2 to HGInventoryBroker. | Diva Canto | 2010-05-02 | 2 | -3/+2 | |
| | | | | | ||||||
| * | | | | Deleted HGInventoryBroker, so that the new one can take its name. | Diva Canto | 2010-05-02 | 1 | -540/+0 | |
| | | | | | ||||||
| * | | | | Switched everything to XInventory by default. The old Inventory is still ↵ | Diva Canto | 2010-05-02 | 1 | -83/+28 | |
| | | | | | | | | | | | | | | | | | | | | there for now, in case bugs pop up with XInventory. | |||||
| * | | | | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 | |
| | | | | | ||||||
* | | | | | Fix sensor cone for sensing avatars | Melanie Thielker | 2010-05-03 | 1 | -1/+12 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-30 | 6 | -146/+87 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-04-30 | 5 | -145/+85 | |
| |\ \ \ \ | ||||||
| | * | | | | * XInventory fairly tested, including for HG. Almost ready to switch. | Diva Canto | 2010-04-30 | 5 | -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. | Melanie | 2010-04-30 | 1 | -1/+2 | |
| |/ / / / | ||||||
| * | | | | Fix some symbol errors | Melanie | 2010-04-30 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 | |
| | | | | | ||||||
* | | | | | Fix some symbol errors | Melanie | 2010-04-30 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-30 | 4 | -281/+284 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-04-30 | 2 | -279/+282 | |
| |\ \ \ \ | ||||||
| | * | | | | Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot. | Diva Canto | 2010-04-29 | 2 | -279/+282 | |
| | | | | | | ||||||
| * | | | | | Fix link security issue | Melanie | 2010-04-30 | 6 | -42/+69 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-30 | 6 | -40/+67 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-30 | 6 | -40/+67 | |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | ||||||
| | * | | Fix link security issue | Melanie | 2010-04-30 | 6 | -40/+67 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-29 | 8 | -10/+661 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Started redoing HGInventoryBroker for XInventory and with multi-protocol in ↵ | Diva Canto | 2010-04-29 | 3 | -0/+645 | |
| | | | | | | | | | | | | | | | | mind. Unfinished. | |||||
| * | | | Merge branch 'minor-stuff' | Melanie | 2010-04-28 | 4 | -10/+13 | |
| |\ \ \ | ||||||
| | * | | | Compiler.cs contained method GetCompilerOutput which, apparently, | unknown | 2010-04-28 | 1 | -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" | unknown | 2010-04-28 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Minor spelling corrections in MiniModule: "RetreiveAsset" changed to | unknown | 2010-04-28 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | "RetrieveAsset" and 'm_rootSceene' to m_rootScene'. | |||||
| * | | | | XInventory connector/handler showing signs of life. Tested, but needs more ↵ | Diva Canto | 2010-04-27 | 2 | -0/+3 | |
| |/ / / | | | | | | | | | | | | | testing. | |||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-29 | 2 | -43/+45 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Fix Av jump motion S/W | Kitto Flora | 2010-04-29 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Fix vertical attractor | Kitto Flora | 2010-04-29 | 1 | -41/+43 | |
| | | | | ||||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-27 | 2 | -11/+21 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Adding some more SNMP events and some refactoring | sacha | 2010-04-23 | 2 | -8/+14 | |
| | | | | | | | | | | | | | | | | Signed : The Masqued Foxi | |||||
| * | | | Adding LinkUp/LinkDown when a region is started or stoped. | sacha | 2010-04-23 | 2 | -3/+7 | |
| | | | | | | | | | | | | | | | | Those two events could be used to compute the region availibility | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 1 | -0/+324 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵ | Diva Canto | 2010-04-26 | 1 | -0/+324 | |
| | | | | | | | | | | | | | | | | default configs yet. | |||||
| * | | | Fix build break. | Melanie | 2010-04-27 | 1 | -17/+17 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 2 | -6/+3 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Add a parameter to prim inventory update to prevent event firing | Melanie | 2010-04-27 | 2 | -18/+26 | |
| | | | | ||||||
| * | | | * Commenting SQLiteNG out of prebuild.xml, because it's making compile fail ↵ | Diva Canto | 2010-04-26 | 1 | -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-23 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time | |||||
| * | | | add a comment about deprecating IRegionModule | dahlia | 2010-04-23 | 1 | -0/+3 | |
| | | | | ||||||
* | | | | Add a parameter to prim inventory update to prevent event firing | Melanie Thielker | 2010-04-27 | 2 | -1/+8 | |
| | | | | ||||||
* | | | | Make scripted attachment states work. Finally. Also replace two monitor locks | Melanie Thielker | 2010-04-25 | 3 | -14/+35 | |
| | | | | | | | | | | | | | | | | with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway | |||||
* | | | | Use the saved script states | Melanie Thielker | 2010-04-24 | 2 | -2/+36 | |
| | | | |