Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2009-12-29 | 1 | -2/+3 |
|\ | |||||
| * | Change teleports so the TeleportFlags are sent to the destination sim. It | Melanie | 2009-12-29 | 1 | -2/+3 |
| | | | | | | | | | | can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-26 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Add AvatarInterestsReply | Melanie | 2009-12-26 | 1 | -0/+2 |
| | | |||||
* | | Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS | Melanie | 2009-12-25 | 1 | -1/+1 |
| | | | | | | | | in the repo. This is the Caremninster repo and the number follows CORE. Always. | ||||
* | | Restore version suffix. | Melanie | 2009-12-25 | 1 | -1/+1 |
| | | |||||
* | | Recover out-of-region objects during db load. | Kitto Flora | 2009-12-24 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-23 | 2 | -8/+27 |
|\ \ | |/ | |||||
| * | Change in how the Library returns its descendant folders, so that it ↵ | Diva Canto | 2009-12-23 | 1 | -1/+20 |
| | | | | | | | | includes folders added after the initial load off the file system, by other mechanisms. | ||||
| * | - commented out unused method ConvertIHttpClientContextToOSHttp | dr scofield (aka dirk husemann) | 2009-12-23 | 1 | -7/+7 |
| | | |||||
| * | Add missing file | Melanie | 2009-12-22 | 1 | -0/+54 |
| | | |||||
| * | Add a data path for error messages | root | 2009-12-22 | 1 | -8/+13 |
| | | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Add missing file | Melanie | 2009-12-22 | 1 | -0/+54 |
| | | |||||
* | | Add a data path for error messages | root | 2009-12-22 | 1 | -8/+13 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Bug fix: in standalone, HGInventoryBroker needs to get the local inventory ↵ | Diva Canto | 2009-12-21 | 1 | -0/+2 |
| | | | | | | | | server URL from NetworkServersInfo. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Making the library read the item's flag, so that clothing items can have the ↵ | Diva Canto | 2009-12-21 | 1 | -0/+1 |
| | | | | | | | | proper icons. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-20 | 1 | -71/+77 |
|\ \ | |/ | |||||
| * | Make sure that we catch and display any exceptions that get right to the top ↵ | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -46/+52 |
| | | | | | | | | of our incoming http request handling stack | ||||
| * | minor: make logging messages consistent in BaseHttpServer | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -25/+25 |
| | | |||||
* | | Merge branch 'tests' | Kitto Flora | 2009-12-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix mantis #10 & #14 | Kitto Flora | 2009-12-19 | 1 | -1/+1 |
| | | | |||||
* | | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use. | CasperW | 2009-12-17 | 1 | -8/+13 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-12-15 | 1 | -2/+2 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Change default grid and inventory service ports in ConfigSettings to the ↵ | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -2/+2 |
| | | | | | | | | ROBUST default of 8003 | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-14 | 1 | -0/+20 |
|\ \ | |/ | |||||
| * | * Implements OSSL function: osGetSimulatorMemory - returns the current ↵ | Adam Frisby | 2009-12-13 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | amount of memory allocated to the simulator process (Moderate Threat Level). * Cleans redundant information out of the Simulator Version. Versions now look like: "OpenSimulator 0.6.9(dev) Unix/Mono" * [Minor] additional log info for MySQLInventoryData | ||||
* | | And reverse | Melanie | 2009-12-12 | 1 | -1/+1 |
| | | |||||
* | | Another whitespace test commit | Melanie | 2009-12-12 | 1 | -1/+1 |
| | | |||||
* | | Reverse test commit (again) | Melanie | 2009-12-12 | 1 | -1/+1 |
| | | |||||
* | | Another test | Melanie | 2009-12-12 | 1 | -1/+1 |
| | | |||||
* | | Reverse text commit whitespace change | Melanie | 2009-12-12 | 1 | -1/+0 |
| | | |||||
* | | test commit | Melanie | 2009-12-12 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 2 | -234/+149 |
|\ \ | |/ | |||||
| * | Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel | Kunnis | 2009-12-12 | 2 | -465/+147 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 14 | -1337/+16 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-12 | 2 | -2/+16 |
| |\ | |||||
| | * | A couple of more sanity guards, but this won't fix things when user profile ↵ | Diva Canto | 2009-12-11 | 1 | -1/+1 |
| | | | | | | | | | | | | fetching is borked. | ||||
| | * | Fix to make [bad] tests happy. | Diva Canto | 2009-12-11 | 1 | -4/+4 |
| | | | |||||
| | * | Attempt at fixing mantis #4411. | Diva Canto | 2009-12-11 | 1 | -1/+15 |
| | | | |||||
| * | | Getting rid of a bunch of old classes, that are likely left over from the ↵ | Kunnis | 2009-12-12 | 12 | -1335/+0 |
| |/ | | | | | | | | | | | ROBUST change. Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Fix version number | Melanie | 2009-12-10 | 1 | -4/+3 |
| | | |||||
* | | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵ | Melanie | 2009-12-10 | 1 | -4/+4 |
|\ \ | | | | | | | | | | careminster | ||||
| * | | Secnond revision of Sit and Stand for unscripted prims; Comment out | KittoFlora | 2009-12-05 | 1 | -4/+4 |
| | | | | | | | | | | | | spammy debug messages in Interregion.... | ||||
* | | | Merge branch 'careminster' into windlight | unknown | 2009-12-07 | 7 | -42/+51 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2009-12-07 | 3 | -13/+0 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's ↵ | Kunnis | 2009-12-06 | 3 | -13/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | not even stored in mysql. Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | | Fix to existing ReaderWriterLockSlim implementations | CasperW | 2009-12-06 | 1 | -2/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2009-12-05 | 2 | -3/+19 |
| |\ \ \ | | |/ / |