aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-231-198/+0
|\
| * Finally putting estate_settings.xml to rest. There will be no more attemptsMelanie2010-08-211-198/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-215-87/+7
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-202-3/+3
| |\
| | * Unit test breakage fix.Diva Canto2010-08-202-3/+3
| * | Some code cleanup for console command "create region".Marck2010-08-201-1/+1
| |/
| * Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.c...Diva Canto2010-08-191-82/+0
| * Partial rewrite of client IP verification. Not completely finished yet, and u...Diva Canto2010-08-191-1/+3
| * Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."Diva Canto2010-08-191-40/+28
| * One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943.Diva Canto2010-08-181-28/+40
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-182-13/+30
|\ \ | |/
| * Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files ...Diva Canto2010-08-161-0/+2
| * Work on TeleportStart: renamed method from TeleportLocationStart to TeleportS...Diva Canto2010-08-161-1/+1
| * * Cleaned up the magic UUID definitions in AvatarWearable.csJohn Hurliman2010-08-131-12/+27
* | Note to self: don't break the buildmeta72010-08-101-1/+1
* | Add a stack trace to the error output on the recursive read lock warning on m...meta72010-08-101-0/+14
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-072-30/+42
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-072-30/+42
| |\
| | * Fix XStats formatting:BlueWall (James Hughes)2010-08-061-30/+35
| | * HACK ALERT! There's some underlying bug in the HTTP server that makes request...Diva Canto2010-08-061-0/+7
| * | Correct display of landmark about info. Also correct region maturity ratingMelanie Thielker2010-08-071-1/+11
| |/
* | Correct display of landmark about info. Also correct region maturity ratingMelanie Thielker2010-08-071-1/+11
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Tom2010-08-063-5/+141
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-063-5/+141
| |\ \ | | |/
| | * Merge branch 'moap'Justin Clark-Casey (justincc)2010-08-062-3/+114
| | |\
| | | * Simplify serialized version string. Change element capitalization for consis...Justin Clark-Casey (justincc)2010-08-031-5/+10
| | | * get rid of PrimitiveBaseShape.MediaRaw staging postJustin Clark-Casey (justincc)2010-08-031-6/+0
| | | * remove duplicated serialization codeJustin Clark-Casey (justincc)2010-08-031-12/+26
| | | * serialize media textures to inventory with a largely osd representation rathe...Justin Clark-Casey (justincc)2010-08-031-3/+87
| | | * comment out further debug line in BaseHttpServerJustin Clark-Casey (justincc)2010-07-271-1/+1
| | | * relocate serialization code from SQLiteRegionData to MoapModule using load an...Justin Clark-Casey (justincc)2010-07-261-0/+6
| | | * implement llSetPrimMediaParams()Justin Clark-Casey (justincc)2010-07-261-0/+1
| | | * start storing incoming MediaEntry on a new Media field on PrimitiveBaseShapeJustin Clark-Casey (justincc)2010-07-261-0/+7
| | | * do a whole load of crappy hacking to get cubes to display google.comJustin Clark-Casey (justincc)2010-07-261-1/+1
| | * | Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-041-2/+27
| | |\ \
| | | * | Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-301-2/+27
* | | | | Implement CreateNewOutfitAttachments. This addresses mantis #199.Tom2010-08-061-0/+4
|/ / / /
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-043-0/+323
|\ \ \ \ | |/ / /
| * | | Revert "remove long unused OpenSim/Framework/Configuration/* projects"Melanie2010-08-043-0/+323
* | | | don't mask current time reads (since we don't mask the corresponding subtract)Mike Rieker2010-08-031-3/+3
* | | | Drop the RestClient timeout from 15 minutes to 30 seconds. This does not addr...Tom2010-08-031-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-3115-1512/+88
|\ \ \ \ | |/ / /
| * | | Slight improvement on previous commit.Diva Canto2010-07-301-1/+13
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-07-3013-1509/+0
| |\ \ \
| | * | | remove long unused OpenSim/Framework/Configuration/* projectsJustin Clark-Casey (justincc)2010-07-303-323/+0
| | * | | Remove unused ILoginServiceToRegionsConnectorJustin Clark-Casey (justincc)2010-07-301-41/+0
| | * | | Remove unused LLFileTransferJustin Clark-Casey (justincc)2010-07-301-40/+0
| | * | | remove long superseded HGNetworkServersInfoJustin Clark-Casey (justincc)2010-07-301-107/+0
| | * | | remove unused FriendRegionInfoJustin Clark-Casey (justincc)2010-07-301-38/+0
| | * | | remove now unused GridConfig, MessageServerConfig, UserConfigJustin Clark-Casey (justincc)2010-07-304-583/+0