aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-053-5/+56
|\
| * Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-053-73/+57
| * Make User Agent Service and Login Service separable.Diva Canto2010-09-041-1/+17
| * Added XFF header processing. Untested, for lack of proxy.Diva Canto2010-09-032-0/+30
| * In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod ra...Justin Clark-Casey (justincc)2010-09-031-5/+10
* | Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-053-74/+54
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-031-2/+8
|\ \ | |/
| * Implement UploadBakedTexture capMelanie Thielker2010-09-021-0/+105
| * minor: Add some method doc to BaseHttpServer.HandleRequest()Justin Clark-Casey (justincc)2010-08-301-2/+8
* | Implement UploadBakedTexture capMelanie Thielker2010-09-021-0/+105
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-302-14/+97
|\ \ | |/
| * Implements parcel media setting persistence and packet / CAPS handlingJonathan Freedman2010-08-302-14/+97
| * Prevent an object disposed exception that made forms comms unreliable. AfterMelanie Thielker2010-08-251-2/+7
| * Change some e.Message to e.ToString. Don't use e.Message, it doesn't carryMelanie Thielker2010-08-251-2/+2
* | Prevent an object disposed exception that made forms comms unreliable. AfterMelanie Thielker2010-08-251-2/+7
* | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carryMelanie Thielker2010-08-251-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-241-1/+2
|\ \ | |/
| * Plumb the region type through to the ProductName field in estate messagesMelanie2010-08-241-1/+2
* | 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