aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Workaround for mono bug #312968"Melanie Thielker2010-09-061-1/+0
| | | | | | This reverts commit f2e343d53081dbd6956d39b1e172e171101a4900. Doesn't compile with our version of Mono. Patched Mono instead.
* Workaround for mono bug #312968Melanie Thielker2010-09-061-0/+1
|
* 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
| | | | | | | | on IDwellModule
| * 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 ↵Justin Clark-Casey (justincc)2010-09-031-5/+10
| | | | | | | | | | | | rather than an older XML one This is a patch from http://opensimulator.org/mantis/view.php?id=4973. Thanks randomhuman
* | Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-053-74/+54
| | | | | | | | on IDwellModule
* | 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
| | | | | | | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com>
| * Prevent an object disposed exception that made forms comms unreliable. AfterMelanie Thielker2010-08-251-2/+7
| | | | | | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief.
| * Change some e.Message to e.ToString. Don't use e.Message, it doesn't carryMelanie Thielker2010-08-251-2/+2
| | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless.
* | Prevent an object disposed exception that made forms comms unreliable. AfterMelanie Thielker2010-08-251-2/+7
| | | | | | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief.
* | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carryMelanie Thielker2010-08-251-2/+2
| | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless.
* | 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
| | | | | | | | to read or write this file.
* | 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
| |/ | | | | | | | | | | Make region name an optional command parameter. Avoid question for region name if it has already been specified. Extend help text.
| * Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on ↵Diva Canto2010-08-191-82/+0
| | | | | | | | myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
| * Partial rewrite of client IP verification. Not completely finished yet, and ↵Diva Canto2010-08-191-1/+3
| | | | | | | | untested. Committing to move to my other computer.
| * Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."Diva Canto2010-08-191-40/+28
| | | | | | | | | | | | Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way. This reverts commit e47608fc62647a28be91dd9caf6e446826fdb54c.
| * One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943.Diva Canto2010-08-181-28/+40
| | | | | | | | (Files .xml and .txt also want to be committed)
* | 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
| | | | | | | | affected.
| * Work on TeleportStart: renamed method from TeleportLocationStart to ↵Diva Canto2010-08-161-1/+1
| | | | | | | | TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
| * * 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 ↵meta72010-08-101-0/+14
| | | | | | | | my RWlocks. Whilst recursive locks are safe, coupled with other issues we're experiencing with the TaskInventoryDictionary it implies that somewhere the lock is not being freed possibly due to a merge error somewhere, and thus it needs to be looked into.
* | 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
| | | | | | | | | | | | | | | | | | | | | Recent libomv update broke the json serialization for XStats. This uses String.Format to convert all data to strings with fixed decimal (2 places ), or integer formats as appropriate.
| | * HACK ALERT! There's some underlying bug in the HTTP server that makes ↵Diva Canto2010-08-061-0/+7
| | | | | | | | | | | | requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in.
| * | Correct display of landmark about info. Also correct region maturity ratingMelanie Thielker2010-08-071-1/+11
| |/ | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity.
* | Correct display of landmark about info. Also correct region maturity ratingMelanie Thielker2010-08-071-1/+11
| | | | | | | | | | in LM info. Maturity is NOT the parcel's setting, that is only for the image and text. Parcel maturity is governed by region maturity.
* | Merge branch 'careminster-presence-refactor' of ↵Tom2010-08-063-5/+141
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ 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 ↵Justin Clark-Casey (justincc)2010-08-031-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | consistency THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database. This commit also improves locking for manipulation of media entries.
| | | * get rid of PrimitiveBaseShape.MediaRaw staging postJustin Clark-Casey (justincc)2010-08-031-6/+0
| | | | | | | | | | | | | | | | | | | | using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
| | | * remove duplicated serialization codeJustin Clark-Casey (justincc)2010-08-031-12/+26
| | | |
| | | * serialize media textures to inventory with a largely osd representation ↵Justin Clark-Casey (justincc)2010-08-031-3/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than .net auto-serialization THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases. This makes media textures serialized in the same way, which is probably better in the long term.
| | | * comment out further debug line in BaseHttpServerJustin Clark-Casey (justincc)2010-07-271-1/+1
| | | |
generated by cgit v1.1 at 2024-11-16 05:03:46 +0000