aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| | | * relocate serialization code from SQLiteRegionData to MoapModule using load ↵Justin Clark-Casey (justincc)2010-07-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and save events. This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future. Remaining non-modularity: PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer. The database also needs to know about MediaRaw though not about Media. IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
| | | * implement llSetPrimMediaParams()Justin Clark-Casey (justincc)2010-07-261-0/+1
| | | | | | | | | | | | | | | | Untested
| | | * start storing incoming MediaEntry on a new Media field on PrimitiveBaseShapeJustin Clark-Casey (justincc)2010-07-261-0/+7
| | | | | | | | | | | | | | | | | | | | This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
| | | * do a whole load of crappy hacking to get cubes to display google.comJustin Clark-Casey (justincc)2010-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | currently, for smoe reason the page only appears when you click a face. also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason you can still change the url and normal navigation will work again
| | * | Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-041-2/+27
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
| | | * | Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-301-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour
* | | | | 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
| | | | | | | | | | | | | | | | This reverts commit cdd3f17b2bee58def470635cfc06e26b0d0145b2.
* | | | don't mask current time reads (since we don't mask the corresponding subtract)Mike Rieker2010-08-031-3/+3
| | | | | | | | | | | | | | | | | | | | if you mask the reads you have to mask the subtract as well. simplest is just don't mask any of it.
* | | | Drop the RestClient timeout from 15 minutes to 30 seconds. This does not ↵Tom2010-08-031-1/+1
| | | | | | | | | | | | | | | | address the problem, but it will allow the regions to recover in the event that the remote server goes away.
* | | | 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
| | | | |
| | * | | remove unused ACL classJustin Clark-Casey (justincc)2010-07-302-377/+0
| | | | |
| * | | | Changed the way HG client verification is done: now transforming local and ↵Diva Canto2010-07-301-0/+72
| |/ / / | | | | | | | | | | | | LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
| * | | * Tweaked WebUtil.PostToService() to help debug an object disposed exceptionJohn Hurliman2010-07-291-3/+4
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-291-1/+1
|\ \ \ | |/ /
| * | Added ': ' to password prompt. Mantis #4851Diva Canto2010-07-221-1/+1
| | |
| * | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie2010-07-141-1/+0
| | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
| * | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-141-1/+1
| | |
| * | Add scripted controllers into agent intersim messagingMelanie Thielker2010-07-111-0/+65
| | |
* | | Replace the screenful of code i deleted.Melanie Thielker2010-07-171-0/+19
| | |
* | | Make webloading more robust by addign retriesMelanie Thielker2010-07-171-26/+22
| | |
* | | Major attachments cleanup. Remove unused AttachObject ClientView methodMelanie Thielker2010-07-141-1/+0
| | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters
* | | Remove useless quaternion parameter from AttachObject sigMelanie Thielker2010-07-141-1/+1
| | |
* | | Add scripted controllers into agent intersim messagingMelanie Thielker2010-07-111-0/+65
| | |
* | | Fix the synchronousrestformsrequester so it will successfully handle a ↵Tom Grimshaw2010-07-101-1/+1
| | | | | | | | | | | | response from a server which does not provide a valid content length header
generated by cgit v1.1 at 2024-10-26 10:22:01 +0000