aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2009-12-291-2/+3
|\
| * Change teleports so the TeleportFlags are sent to the destination sim. ItMelanie2009-12-291-2/+3
| | | | | | | | | | can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation
* | Merge branch 'master' into careminsterMelanie2009-12-261-0/+2
|\ \ | |/
| * Add AvatarInterestsReplyMelanie2009-12-261-0/+2
| |
* | Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THISMelanie2009-12-251-1/+1
| | | | | | | | in the repo. This is the Caremninster repo and the number follows CORE. Always.
* | Restore version suffix.Melanie2009-12-251-1/+1
| |
* | Recover out-of-region objects during db load.Kitto Flora2009-12-241-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2009-12-232-8/+27
|\ \ | |/
| * Change in how the Library returns its descendant folders, so that it ↵Diva Canto2009-12-231-1/+20
| | | | | | | | includes folders added after the initial load off the file system, by other mechanisms.
| * - commented out unused method ConvertIHttpClientContextToOSHttpdr scofield (aka dirk husemann)2009-12-231-7/+7
| |
| * Add missing fileMelanie2009-12-221-0/+54
| |
| * Add a data path for error messagesroot2009-12-221-8/+13
| | | | | | | | | | | | Committed from my other box where git is not configured properly Signed-off-by: Melanie <melanie@t-data.com>
* | Add missing fileMelanie2009-12-221-0/+54
| |
* | Add a data path for error messagesroot2009-12-221-8/+13
| |
* | Merge branch 'master' into careminsterMelanie2009-12-211-0/+2
|\ \ | |/
| * Bug fix: in standalone, HGInventoryBroker needs to get the local inventory ↵Diva Canto2009-12-211-0/+2
| | | | | | | | server URL from NetworkServersInfo.
* | Merge branch 'master' into careminsterMelanie2009-12-211-0/+1
|\ \ | |/
| * Making the library read the item's flag, so that clothing items can have the ↵Diva Canto2009-12-211-0/+1
| | | | | | | | proper icons.
* | Merge branch 'master' into careminsterMelanie2009-12-201-71/+77
|\ \ | |/
| * Make sure that we catch and display any exceptions that get right to the top ↵Justin Clark-Casey (justincc)2009-12-151-46/+52
| | | | | | | | of our incoming http request handling stack
| * minor: make logging messages consistent in BaseHttpServerJustin Clark-Casey (justincc)2009-12-151-25/+25
| |
* | Merge branch 'tests'Kitto Flora2009-12-191-1/+1
|\ \
| * | Fix mantis #10 & #14Kitto Flora2009-12-191-1/+1
| | |
* | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.CasperW2009-12-171-8/+13
| | |
* | | Merge branch 'master' into careminsterMelanie2009-12-151-2/+2
|\ \ \ | |/ / |/| / | |/
| * Change default grid and inventory service ports in ConfigSettings to the ↵Justin Clark-Casey (justincc)2009-12-151-2/+2
| | | | | | | | ROBUST default of 8003
* | Merge branch 'master' into careminsterMelanie2009-12-141-0/+20
|\ \ | |/
| * * Implements OSSL function: osGetSimulatorMemory - returns the current ↵Adam Frisby2009-12-131-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 reverseMelanie2009-12-121-1/+1
| |
* | Another whitespace test commitMelanie2009-12-121-1/+1
| |
* | Reverse test commit (again)Melanie2009-12-121-1/+1
| |
* | Another testMelanie2009-12-121-1/+1
| |
* | Reverse text commit whitespace changeMelanie2009-12-121-1/+0
| |
* | test commitMelanie2009-12-121-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2009-12-122-234/+149
|\ \ | |/
| * Getting rid of SimpleRegionInfo and SerializableRegionInfo per MelKunnis2009-12-122-465/+147
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2009-12-1214-1337/+16
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-122-2/+16
| |\
| | * A couple of more sanity guards, but this won't fix things when user profile ↵Diva Canto2009-12-111-1/+1
| | | | | | | | | | | | fetching is borked.
| | * Fix to make [bad] tests happy.Diva Canto2009-12-111-4/+4
| | |
| | * Attempt at fixing mantis #4411.Diva Canto2009-12-111-1/+15
| | |
| * | Getting rid of a bunch of old classes, that are likely left over from the ↵Kunnis2009-12-1212-1335/+0
| |/ | | | | | | | | | | ROBUST change. Signed-off-by: Melanie <melanie@t-data.com>
* | Fix version numberMelanie2009-12-101-4/+3
| |
* | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵Melanie2009-12-101-4/+4
|\ \ | | | | | | | | | careminster
| * | Secnond revision of Sit and Stand for unscripted prims; Comment outKittoFlora2009-12-051-4/+4
| | | | | | | | | | | | spammy debug messages in Interregion....
* | | Merge branch 'careminster' into windlightunknown2009-12-077-42/+51
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2009-12-073-13/+0
| |\ \ \ | | | |/ | | |/|
| | * | Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's ↵Kunnis2009-12-063-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | not even stored in mysql. Signed-off-by: Melanie <melanie@t-data.com>
| * | | Fix to existing ReaderWriterLockSlim implementationsCasperW2009-12-061-2/+8
| | | |
| * | | Merge branch 'master' into careminsterMelanie2009-12-052-3/+19
| |\ \ \ | | |/ /